more cleanups and a new menuconfig generator

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3685 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 22 insertions, 19 deletions

diff --git a/package/Config.in b/package/Config.in
deleted file mode 100644
index a0961bf66..000000000
--- a/package/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-
-menu "OpenWrt Package Selection"
-
-comment "Package categories"
-
-menu "Base system"
-endmenu
-
-endmenu
-
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index a5830764e..5ccbe2251 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -18,6 +18,7 @@ define Package/busybox
 CONFIGFILE:=config/Config.in
 SECTION:=base
 CATEGORY:=Base system
+DEFAULT:=y
 TITLE:=Core utilities for embedded Linux
 DESCRIPTION:=The Swiss Army Knife of embedded Linux.  It slices, it dices, it\\\
 makes Julian Fries.
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 56ab59417..cc7c84a0d 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -28,6 +28,8 @@ endif
 define Package/iptables
 SECTION:=net
 CATEGORY:=Base system
+MENU:=1
+DEFAULT:=y
 TITLE:=IPv4 firewall administration tool
 URL:=http://netfilter.org/
 endef
@@ -186,10 +188,6 @@ define Package/ip6tables/install
 	$(RSTRIP) $(1)
 endef
 
-$(eval $(call BuildPackage,iptables))
-$(eval $(call BuildPackage,iptables-utils))
-$(eval $(call BuildPackage,ip6tables))
-
 define BuildPlugin
 define Package/$(1)/install
 	install -m0755 -d $$(1)/usr/lib/iptables
@@ -206,6 +204,8 @@ endef
 L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \
 	$(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
 
+$(eval $(call BuildPackage,iptables))
+$(eval $(call BuildPackage,iptables-utils))
 $(eval $(call BuildPlugin,iptables-mod-conntrack,$(IPT_CONNTRACK-m)))
 $(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m)))
 $(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m),$(L7_INSTALL)))
@@ -214,6 +214,7 @@ $(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m)))
 $(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))
 $(eval $(call BuildPlugin,iptables-mod-nat,$(IPT_NAT-m)))
 $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
+$(eval $(call BuildPackage,ip6tables))
 
 
 $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built
diff --git a/package/rules.mk b/package/rules.mk
index ac9b98d74..2ff710ac8 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -46,6 +46,8 @@ SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
 VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
 PKGARCH:=$(ARCH)
 PRIORITY:=optional
+DEFAULT:=
+MENU:=
 TITLE:=
 DESCRIPTION:=
 endef
@@ -96,11 +98,21 @@ endif
 IDEPEND_$(1):=$$(strip $$(DEPENDS))
 
 DUMPINFO += \
-	echo "Package: $(1)"; \
+	echo "Package: $(1)"; 
+ifneq ($(MENU),)
+DUMPINFO += \
+	echo "Menu: $(MENU)";
+endif
+ifneq ($(DEFAULT),)
+DUMPINFO += \
+	echo "Default: $(DEFAULT)";
+endif
+DUMPINFO += \
 	echo "Version: $(VERSION)"; \
-	echo "Depends: $(IDEPEND_$(1))"; \
+	echo "Depends: $$(IDEPEND_$(1))"; \
+	echo "Category: $(CATEGORY)"; \
 	echo "Title: $(TITLE)"; \
-	echo "$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
+	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
 	echo; \
 	echo "$(URL)"; \
 	echo "@@";
@@ -110,7 +122,7 @@ $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
 	mkdir -p $$(IDIR_$(1))/CONTROL
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "Depends: $(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control