From 70f40bc06028f02218e7fba73c366dd9e122fcc1 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 12 May 2005 19:06:51 +0000
Subject: convert bridge to new packaging style

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@843 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 openwrt/package/bridge/Makefile            | 45 ++++++++----------------------
 openwrt/package/bridge/bridge.control      |  6 ----
 openwrt/package/bridge/ipkg/bridge.control |  6 ++++
 3 files changed, 17 insertions(+), 40 deletions(-)
 delete mode 100644 openwrt/package/bridge/bridge.control
 create mode 100644 openwrt/package/bridge/ipkg/bridge.control

(limited to 'openwrt')

diff --git a/openwrt/package/bridge/Makefile b/openwrt/package/bridge/Makefile
index c8a860e16..44b22cd72 100644
--- a/openwrt/package/bridge/Makefile
+++ b/openwrt/package/bridge/Makefile
@@ -11,21 +11,11 @@ PKG_SOURCE_URL:=@SF/bridge
 PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(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
+$(eval $(call PKG_template,BRIDGE,bridge,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(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
-
-$(PKG_BUILD_DIR)/.patched: $(PKG_BUILD_DIR)/.unpacked
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	touch $(PKG_BUILD_DIR)/.patched
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -46,27 +36,14 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
 		$(DISABLE_NLS) \
 		--with-linux-headers=$(LINUX_DIR) \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
-$(PKG_BUILD_DIR)/brctl/brctl: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR)
+	touch $@
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/brctl/brctl
-	$(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)/brctl/brctl $(PKG_IPK_DIR)/usr/sbin/
-	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/brctl
-	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/bridge.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/bridge.list
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
+$(IPKG_BRIDGE): 
+	mkdir -p $(IDIR_BRIDGE)/usr/sbin
+	cp $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/
+	$(STRIP) $(IDIR_BRIDGE)/usr/sbin/brctl
+	$(IPKG_BUILD) $(IDIR_BRIDGE) $(PACKAGE_DIR)
diff --git a/openwrt/package/bridge/bridge.control b/openwrt/package/bridge/bridge.control
deleted file mode 100644
index 74df25dd5..000000000
--- a/openwrt/package/bridge/bridge.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: bridge
-Priority: essential
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Ethernet bridging tools
diff --git a/openwrt/package/bridge/ipkg/bridge.control b/openwrt/package/bridge/ipkg/bridge.control
new file mode 100644
index 000000000..74df25dd5
--- /dev/null
+++ b/openwrt/package/bridge/ipkg/bridge.control
@@ -0,0 +1,6 @@
+Package: bridge
+Priority: essential
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Ethernet bridging tools
-- 
cgit v1.2.3