From 926f7e5299faf192603d247fa19fdaf0c45ff9be Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 12 May 2005 19:41:18 +0000 Subject: [PATCH] convert dnsmasq to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk@851 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/dnsmasq/Makefile | 37 +++++-------------- .../dnsmasq/{ => ipkg}/dnsmasq.control | 0 2 files changed, 9 insertions(+), 28 deletions(-) rename openwrt/package/dnsmasq/{ => ipkg}/dnsmasq.control (100%) diff --git a/openwrt/package/dnsmasq/Makefile b/openwrt/package/dnsmasq/Makefile index 973215a80..210b15690 100644 --- a/openwrt/package/dnsmasq/Makefile +++ b/openwrt/package/dnsmasq/Makefile @@ -11,37 +11,18 @@ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 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) +include $(TOPDIR)/package/rules.mk -$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(PATCH) $(PKG_BUILD_DIR) ./patches - touch $(PKG_BUILD_DIR)/.patched +$(eval $(call PKG_template,DNSMASQ,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/src/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched +$(PKG_BUILD_DIR)/.built: $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \ BINDIR=/usr/sbin MANDIR=/usr/man -C $(PKG_BUILD_DIR) -$(PKG_IPK): $(PKG_BUILD_DIR)/src/$(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 - cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_IPK_DIR)/usr/sbin/ - $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/dnsmasq.list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.patched -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/dnsmasq.list - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) +$(IPKG_DNSMASQ): + mkdir -p $(IDIR_DNSMASQ)/usr/sbin + cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/ + $(STRIP) $(IDIR_DNSMASQ)/usr/sbin/* + $(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR) + diff --git a/openwrt/package/dnsmasq/dnsmasq.control b/openwrt/package/dnsmasq/ipkg/dnsmasq.control similarity index 100% rename from openwrt/package/dnsmasq/dnsmasq.control rename to openwrt/package/dnsmasq/ipkg/dnsmasq.control -- 2.20.1