From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 12 May 2005 19:14:25 +0000 (+0000)
Subject: convert bwm to new packaging style
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ac6ef000360b9f45c29dfa3258e91cb121b51d7e;p=openwrt%2Fstaging%2Fadrian.git

convert bwm to new packaging style

SVN-Revision: 845
---

diff --git a/openwrt/package/bwm/Makefile b/openwrt/package/bwm/Makefile
index cf9c51e91c..74f25c289c 100644
--- a/openwrt/package/bwm/Makefile
+++ b/openwrt/package/bwm/Makefile
@@ -9,35 +9,18 @@ PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/b/bwm
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 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)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(PKG_BUILD_DIR)/.unpacked
+$(eval $(call PKG_template,BWM,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.unpacked
+$(PKG_BUILD_DIR)/.built:
 	$(TARGET_CC) $(TARGET_CFLAGS) $(PKG_BUILD_DIR)/bwm.c -o $(PKG_BUILD_DIR)/bwm
+	touch $@
 
-$(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/bin
-	install -m 755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_IPK_DIR)/usr/bin/
-	$(STRIP) $(PKG_IPK_DIR)/usr/bin/*
-	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+$(IPKG_BWM):
+	mkdir -p $(IDIR_BWM)/usr/bin
+	install -m 755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_BWM)/usr/bin/
+	$(STRIP) $(IDIR_BWM)/usr/bin/*
+	$(IPKG_BUILD) $(IDIR_BWM) $(PACKAGE_DIR)
 
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
-
-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/openwrt/package/bwm/bwm.control b/openwrt/package/bwm/bwm.control
deleted file mode 100644
index 41fe4ee844..0000000000
--- a/openwrt/package/bwm/bwm.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: bwm
-Priority: optional
-Section: net
-Maintainer: Sebastien NOEL <me@twolife.org>
-Source: http://ftp.debian.org/debian/pool/main/b/bwm/
-Description: A very tiny bandwidth monitor
diff --git a/openwrt/package/bwm/ipkg/bwm.control b/openwrt/package/bwm/ipkg/bwm.control
new file mode 100644
index 0000000000..41fe4ee844
--- /dev/null
+++ b/openwrt/package/bwm/ipkg/bwm.control
@@ -0,0 +1,6 @@
+Package: bwm
+Priority: optional
+Section: net
+Maintainer: Sebastien NOEL <me@twolife.org>
+Source: http://ftp.debian.org/debian/pool/main/b/bwm/
+Description: A very tiny bandwidth monitor