From 93ce9f48ec0d7098c86d38f7f8304ce564f3b26d Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 18 May 2005 13:30:05 +0000 Subject: [PATCH] Convert ntpclient to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@933 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ntpclient/Makefile | 41 ++++++------------- .../files/{S41ntpclient => ntpclient.init} | 0 .../ntpclient/{ => ipkg}/ntpclient.control | 0 3 files changed, 13 insertions(+), 28 deletions(-) rename package/ntpclient/files/{S41ntpclient => ntpclient.init} (100%) mode change 100755 => 100644 rename package/ntpclient/{ => ipkg}/ntpclient.control (100%) diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile index 23abdaaa7..02c063776 100644 --- a/package/ntpclient/Makefile +++ b/package/ntpclient/Makefile @@ -7,38 +7,23 @@ PKG_MD5SUM:=94e84d5c6023c5e1f3890b28d0a08c92 PKG_SOURCE_URL:=http://doolittle.faludi.com/ntpclient PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_CAT:=zcat -PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.unpacked +include $(TOPDIR)/package/rules.mk -$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.unpacked - $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) +$(eval $(call PKG_template,NTPCLIENT,ntpclient,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(PKG_IPK_DIR)/usr/sbin $(PKG_IPK_DIR)/etc/init.d - install -m 755 $(PKG_BUILD_DIR)/ntpclient $(PKG_IPK_DIR)/usr/sbin/ - install -m 755 ./files/S41ntpclient $(PKG_IPK_DIR)/etc/init.d/ - $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +$(PKG_BUILD_DIR)/.built: + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) +$(IPKG_NTPCLIENT): + install -d -m0755 $(IDIR_NTPCLIENT)/etc/init.d + install -m0755 ./files/ntpclient.init $(IDIR_NTPCLIENT)/etc/init.d/S41ntpclient + install -d -m0755 $(IDIR_NTPCLIENT)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/ntpclient $(IDIR_NTPCLIENT)/usr/sbin/ + $(RSTRIP) $(IDIR_NTPCLIENT) + $(IPKG_BUILD) $(IDIR_NTPCLIENT) $(PACKAGE_DIR) -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.unpacked -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) diff --git a/package/ntpclient/files/S41ntpclient b/package/ntpclient/files/ntpclient.init old mode 100755 new mode 100644 similarity index 100% rename from package/ntpclient/files/S41ntpclient rename to package/ntpclient/files/ntpclient.init diff --git a/package/ntpclient/ntpclient.control b/package/ntpclient/ipkg/ntpclient.control similarity index 100% rename from package/ntpclient/ntpclient.control rename to package/ntpclient/ipkg/ntpclient.control