nbd's makefile/menuconfig rewrite

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@307 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 55 insertions, 44 deletions

diff --git a/openwrt/package/ebtables/Config.in b/openwrt/package/ebtables/Config.in
index 22c32abedf..2e6b8257cc 100644
--- a/openwrt/package/ebtables/Config.in
+++ b/openwrt/package/ebtables/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_EBTABLES
-	bool "ebtables"
-	default n
+	tristate "Ethernet Bridge Firewalling"
+	default m
 	help
-		ethernet bridging firewalling
+		Ethernet Bridge Firewalling (ebtables)
 		http://ebtables.sourceforge.net/
diff --git a/openwrt/package/ebtables/Makefile b/openwrt/package/ebtables/Makefile
new file mode 100644
index 0000000000..384576db9d
--- /dev/null
+++ b/openwrt/package/ebtables/Makefile
@@ -0,0 +1,43 @@
+#############################################################
+#
+# ebtables
+#
+#############################################################
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ebtables
+PKG_VERSION:=2.0.6
+PKG_RELEASE:=1
+PKG_SOURCE_URL:=http://umn.dl.sourceforge.net/sourceforge/ebtables/
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(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):
+	 $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE)
+
+$(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)/ebtables: $(PKG_BUILD_DIR)/.unpacked
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
+		CFLAGS="$(TARGET_CFLAGS) -Wall"
+
+$(PKG_IPK): $(PKG_BUILD_DIR)/ebtables
+	$(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)/ebtables $(PKG_IPK_DIR)/usr/sbin/
+	mkdir -p $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.unpacked
+compile: $(PKG_IPK)
+install:
+	$(IPKG) install $(PKG_IPK)
+clean:
+	rm -rf $(PKG_BUILD_DIR)
diff --git a/openwrt/package/ebtables/ebtables.control b/openwrt/package/ebtables/ebtables.control
new file mode 100644
index 0000000000..550e5d6e06
--- /dev/null
+++ b/openwrt/package/ebtables/ebtables.control
@@ -0,0 +1,9 @@
+Package: ebtables
+Priority: optional
+Section: net
+Version: 1.2.11-1
+Architecture: mipsel
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Ethernet bridge firewalling software
+Depends: kmod-ebtables
diff --git a/openwrt/package/ebtables/ebtables.mk b/openwrt/package/ebtables/ebtables.mk
deleted file mode 100644
index e7982ca1f4..0000000000
--- a/openwrt/package/ebtables/ebtables.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#############################################################
-#
-# ebtables
-#
-#############################################################
-
-EBTABLES_SOURCE_URL=http://umn.dl.sourceforge.net/sourceforge/ebtables/
-EBTABLES_SOURCE=ebtables-v2.0.6.tar.gz
-EBTABLES_BUILD_DIR=$(BUILD_DIR)/ebtables-v2.0.6
-EBTABLES_TARGET_BINARY:=usr/sbin/ebtables
-
-$(DL_DIR)/$(EBTABLES_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(EBTABLES_SOURCE_URL)/$(EBTABLES_SOURCE)
-
-$(EBTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(EBTABLES_SOURCE)
-	zcat $(DL_DIR)/$(EBTABLES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(EBTABLES_BUILD_DIR)/.unpacked
-
-$(EBTABLES_BUILD_DIR)/ebtables: $(EBTABLES_BUILD_DIR)/.unpacked
-	$(MAKE) -C $(EBTABLES_BUILD_DIR) \
-		CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
-		CFLAGS="$(TARGET_CFLAGS) -Wall"
-
-$(TARGET_DIR)/$(EBTABLES_TARGET_BINARY): $(EBTABLES_BUILD_DIR)/ebtables
-	cp -af $(EBTABLES_BUILD_DIR)/ebtables $(TARGET_DIR)/$(EBTABLES_TARGET_BINARY)
-	$(STRIP) $(TARGET_DIR)/$(EBTABLES_TARGET_BINARY)
-
-ebtables: $(TARGET_DIR)/$(EBTABLES_TARGET_BINARY)
-
-ebtables-source: $(DL_DIR)/$(EBTABLES_SOURCE)
-
-ebtables-clean:
-	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(EBTABLES_BUILD_DIR) uninstall
-	-$(MAKE) -C $(EBTABLES_BUILD_DIR) clean
-
-ebtables-dirclean:
-	rm -rf $(EBTABLES_BUILD_DIR)
-
-ifeq ($(strip $(BR2_PACKAGE_EBTABLES)),y)
-TARGETS+=ebtables
-endif