From 8c052636aab5aa9ecffd7e9535871aa89220e783 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 12 May 2005 19:18:06 +0000 Subject: [PATCH] convert chillispot to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk@846 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/chillispot/Makefile | 43 ++++++----------------------- 1 file changed, 8 insertions(+), 35 deletions(-) diff --git a/openwrt/package/chillispot/Makefile b/openwrt/package/chillispot/Makefile index 4b4b8471c..e2be170e8 100644 --- a/openwrt/package/chillispot/Makefile +++ b/openwrt/package/chillispot/Makefile @@ -7,28 +7,17 @@ PKG_VERSION:=1.0RC3 PKG_RELEASE:=1 PKG_MD5SUM:=9ad5f4181ae2e9e2d5ccb165c37dfdde -PKG_SOURCE_URL:= \ - http://www.chillispot.org/download/ \ - http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ +PKG_SOURCE_URL:=http://www.chillispot.org/download PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -IPKG_CHILLISPOT:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -IDIR_CHILLISPOT:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) -INFO_CHILLISPOT:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list +include $(TOPDIR)/package/rules.mk +$(eval $(call PKG_template,CHILLISPOT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) - -$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) - rm -rf $(PKG_BUILD_DIR) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.prepared - -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared +$(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -58,22 +47,18 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(DISABLE_LARGEFILE) \ $(DISABLE_NLS) \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) - touch $(PKG_BUILD_DIR)/.built - -$(PKG_INSTALL_DIR)/usr/sbin/chilli: $(PKG_BUILD_DIR)/.built mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ install - -$(IPKG_CHILLISPOT): $(PKG_INSTALL_DIR)/usr/sbin/chilli - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_CHILLISPOT) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - install -m0644 ./ipkg/$(PKG_NAME).conffiles $(IDIR_CHILLISPOT)/CONTROL/conffiles + touch $(PKG_BUILD_DIR)/.built + +$(IPKG_CHILLISPOT): install -m0755 -d $(IDIR_CHILLISPOT)/etc/init.d install -m0755 ./ipkg/$(PKG_NAME).init $(IDIR_CHILLISPOT)/etc/init.d/chilli install -m0755 -d $(IDIR_CHILLISPOT)/etc @@ -82,15 +67,3 @@ $(IPKG_CHILLISPOT): $(PKG_INSTALL_DIR)/usr/sbin/chilli cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/chilli $(IDIR_CHILLISPOT)/usr/sbin/ $(RSTRIP) $(IDIR_CHILLISPOT) $(IPKG_BUILD) $(IDIR_CHILLISPOT) $(PACKAGE_DIR) - -$(INFO_CHILLISPOT): $(IPKG_CHILLISPOT) - $(IPKG) install $(IPKG_CHILLISPOT) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared -compile: $(IPKG_CHILLISPOT) -install: $(INFO_CHILLISPOT) - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -rf $(IPKG_CHILLISPOT) -- 2.20.1