new (last?) attempt at standardizing Makefiles

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4855 3c298f89-4303-0410-b956-a3cf2f4a3e73
author: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2006-09-24 20:49:31 +0000
committer: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2006-09-24 20:49:31 +0000
commit: 8afb23270d23db6a033ba8fb77e1cf1a1d925a7c (patch)
tree: b7ed2e950b1b35de067464525dccaf95f2876cfd
parent: 1d072248383ae47bd68032d69bd86cc060796ef4 (diff)
51 files changed, 760 insertions, 643 deletions
diff --git a/package/alsa/Makefile b/package/alsa/Makefile
index ebfb6f872..d82d87ada 100644
--- a/package/alsa/Makefile
+++ b/package/alsa/Makefile
@@ -13,12 +13,13 @@ PKG_NAME:=alsa-driver
 PKG_VERSION:=1.0.11
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/
 PKG_MD5SUM:=57534e4297cd683371402220e3753885
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-alsa
diff --git a/package/arptables/Makefile b/package/arptables/Makefile
index c0c898bae..0518e8ea3 100644
--- a/package/arptables/Makefile
+++ b/package/arptables/Makefile
@@ -11,12 +11,13 @@ PKG_NAME:=arptables
 PKG_VERSION:=0.0.3
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables
 PKG_MD5SUM:=1672244603c8979577aa4738be35a759
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/arptables
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index d6e62b5ae..1e234c65a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,22 +11,23 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/base-files
+
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
-REV:=0
+  REV:=0
 endif
 
 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
-TARGET:=-$(BOARD)-$(KERNEL)
-UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
-LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
+  TARGET:=-$(BOARD)-$(KERNEL)
+  UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
+  LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
 else
-UCLIBC_VERSION:=<UCLIBC_VERSION>
-LIBGCC_VERSION:=<LIBGCC_VERSION>
+  UCLIBC_VERSION:=<UCLIBC_VERSION>
+  LIBGCC_VERSION:=<LIBGCC_VERSION>
 endif
 
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
@@ -35,8 +36,10 @@ define Package/base-files$(TARGET)
   SECTION:=base
   CATEGORY:=Base system
   DEFAULT:=y
-  TITLE:=OpenWrt system scripts
-  DESCRIPTION:=Base filesystem for OpenWrt
+  TITLE:=Base filesystem for OpenWrt
+  DESCRIPTION:=\
+	This package contains a base filesystem and system scripts for OpenWrt.
+  URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)-$(REV)
 endef
 
@@ -68,7 +71,6 @@ define -xscale-2.6/conffiles
 /etc/config/network
 endef
 
-
 define Package/base-files$(TARGET)/conffiles
 /etc/banner
 /etc/hosts
@@ -84,37 +86,37 @@ endef
 
 define Package/libgcc
   SECTION:=libs
-  CATEGORY:=Libraries
+  CATEGORY:=Base system
   DEFAULT:=y
   DEPENDS:=@!NATIVE_TOOLCHAIN
   TITLE:=GCC support library
+  URL:=http://gcc.gnu.org/
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
-  DESCRIPTION:=$(TITLE)
 endef
 
 define Package/libpthread
-  $(call Package/base-files$(TARGET))
-  DEFAULT:=n
+  SECTION:=libs
+  CATEGORY:=Libraries
   DEPENDS:=@!NATIVE_TOOLCHAIN
-  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=POSIX thread library
-  DESCRIPTION:=POSIX thread library
+  URL:=http://uclibc.org/
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
 endef
 
-
 define Package/uclibc
-  $(call Package/base-files$(TARGET))
-  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+  SECTION:=libs
+  CATEGORY:=Base system
+  DEFAULT:=y
   DEPENDS:=@!NATIVE_TOOLCHAIN
-  TITLE:=C library
-  DESCRIPTION:=C library for embedded systems
+  TITLE:=C library embedded systems
+  URL:=http://uclibc.org/
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
 endef
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
 
-
 define Build/Compile/ar7
 	$(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c
 endef
@@ -132,6 +134,7 @@ define Package/base-files$(TARGET)/install-ar7
 	mkdir -p $(1)/sbin
 	$(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin
 endef
+
 define Package/base-files$(TARGET)/install-brcm
 	rm -f $(1)/etc/config/network
 	mkdir -p $(1)/sbin
diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index 6c08dc24d..c186c8e70 100644
--- a/package/bridge/Makefile
+++ b/package/bridge/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=bridge
 PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
 PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/bridge
 PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bridge
diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index ce447a4ac..3ef4bcf08 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -14,68 +14,83 @@ PKG_VERSION:=4.80.17.0
 PKG_RELEASE:=1
 WLC_VERSION:=0.1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_MD5SUM:=3183ddb60e3e882b41df1776c89b614c
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
-define Package/kmod-brcm-wl
-  SECTION:=drivers
-  CATEGORY:=Drivers
-  DEPENDS:=@LINUX_2_4_BRCM
-  DEFAULT:=y
+define Package/broadcom-wl/Default
+  SECTION:=net
+  CATEGORY:=Kernel drivers
+  DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo
   SUBMENU:=Proprietary BCM43xx WiFi driver
   SUBMENUDEP:=@LINUX_2_4_BRCM
-  TITLE:=Kernel driver (normal version)
-  DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset
+endef
+
+define Package/kmod-brcm-wl/Default
+  $(call Package/broadcom-wl/Default)
+  SECTION:=kernel
+  DEPENDS:=@LINUX_2_4_BRCM
+  TITLE:=Kernel driver for BCM43xx chipsets
+  DESCRIPTION:=\
+	This package contains the proprietary wireless driver for the Broadcom \\\
+	BCM43xx chipset
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
 endef
 
+define Package/kmod-brcm-wl
+  $(call Package/kmod-brcm-wl/Default)
+  DEFAULT:=y
+  TITLE+= (normal version)
+  DESCRIPTION+= (normal version).
+endef
+
 define Package/kmod-brcm-wl-mimo
-  $(call Package/kmod-brcm-wl)
-  DEFAULT:=m if ALL
-  TITLE:=Kernel driver (MIMO version)
-  DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset (MIMO version)
+  $(call Package/kmod-brcm-wl/Default)
+  TITLE+= (MIMO version)
+  DESCRIPTION+= (MIMO version).
 endef
 
 define Package/wlc
-  $(call Package/kmod-brcm-wl-mimo)
+  $(call Package/broadcom-wl/Default)
   DEFAULT:=y
-  DEPENDS:=kmod-brcm-wl
-  TITLE:=Setup utility
-  DESCRIPTION:=Utility for initializing the Broadcom wl driver
-  VERSION:=$(WLC_VERSION)-$(PKG_RELEASE)
+  TITLE:=Proprietary Broadcom wl driver setup utility
+  DESCRIPTION:=\
+	This package contains an utility for initializing the proprietary Broadcom \\\
+	wl driver.
 endef
 
 define Package/wl
-  $(call Package/wlc)
-  TITLE:=Utility for changing the driver's parameters
-  DESCRIPTION:=Utility for changing the Broadcom wl driver's parameters
-  VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+  $(call Package/broadcom-wl/Default)
+  TITLE:=Proprietary Broadcom wl driver config utility
+  DESCRIPTION:=\
+	This package contains the proprietary utility (wl) for configuring the \\\
+	proprietary Broadcom wl driver.
 endef
 
 define Package/nas
-  $(call Package/wl)
-  DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +nvram
-  DEFAULT:=m
-  TITLE:=Proprietary WPA/WPA2 authenticator
-  DESCRIPTION:=Proprietary WPA/WPA2 authenticator for the Broadcom wl driver
-endef
-
-define Build/Prepare
-  $(call Build/Prepare/Default)
-	$(CP) src/* $(PKG_BUILD_DIR)/
+  $(call Package/broadcom-wl/Default)
+  DEPENDS+= +nvram
+  TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
+  DESCRIPTION:=\
+	This package contains the proprietary WPA/WPA2 authenticator (nas) for the \\\
+	proprietary Broadcom wl driver.
 endef
 
-MAKEFLAGS_KMOD = -C "$(LINUX_DIR)" \
+MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
 		PATH="$(TARGET_PATH)" \
 		SUBDIRS="$(PKG_BUILD_DIR)/kmod"
 
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) src/* $(PKG_BUILD_DIR)/
+endef
 
 define Build/Compile
 	# Compile the kernel part
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 6e9cf4194..9e30492e9 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -12,24 +12,26 @@ PKG_NAME:=busybox
 PKG_VERSION:=1.2.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads
 PKG_MD5SUM:=362b3dc0f2023ddfda901dc1f1a74391
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/busybox
-SECTION:=base
-CATEGORY:=Base system
-MENU:=1
-DEFAULT:=y
-TITLE:=Core utilities for embedded Linux
-DESCRIPTION:=The Swiss Army Knife of embedded Linux. \\\
-It slices, it dices, it makes Julian Fries.
-URL:=http://busybox.net/
-CONFIG:=\\\
+  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.
+  URL:=http://busybox.net/
+  MENU:=1
+  CONFIG:=\\\
 	menu "Configuration" \\\
 		depends on PACKAGE_busybox \\\
 		source "$(SOURCE)/config/Config.in" \\\
@@ -38,13 +40,19 @@ endef
 
 define Build/Configure
 	$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
-	yes '' | $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
-	-C $(PKG_BUILD_DIR) oldconfig
+	yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CROSS="$(TARGET_CROSS)" \
+		oldconfig
 endef
 
 define Package/busybox/install
-	$(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
-	PREFIX="$(1)" EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CROSS="$(TARGET_CROSS)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		PREFIX="$(1)" \
+		install
 	-rm -rf $(1)/lib64
 endef
 
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 3dc22a3a0..6283fdc89 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=dnsmasq
 PKG_VERSION:=2.33
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 PKG_MD5SUM:=45696461b6e6bc929273b1191ca50447
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dnsmasq
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 73cc10ef8..b28b44ef9 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=dropbear
 PKG_VERSION:=0.48.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
 PKG_MD5SUM:=ca8e53a766faec831882831364568421
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dropbear/Default
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 4d5c99ff8..a0e53a48d 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=ebtables
 PKG_VERSION:=2.0.8-rc2
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables
 PKG_MD5SUM:=f07111fcc1966be669278433c35dcc28
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ebtables
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 422499d77..8c6b2ce56 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -13,12 +13,12 @@ PKG_NAME:=fuse
 PKG_VERSION:=2.5.3
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -123,8 +123,7 @@ define Build/InstallDev
 endef
 	
 define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/fuse{,.h} \
+	rm -rf	$(STAGING_DIR)/usr/include/fuse{,.h} \
 		$(STAGING_DIR)/usr/lib/libfuse.{a,so*} \
 		$(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
 endef
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index cc13af354..43afab3c7 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=gmp
 PKG_VERSION:=4.1.4
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNU/gmp
 PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -51,8 +51,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/gmp* \
+	rm -rf	$(STAGING_DIR)/usr/include/gmp* \
 		$(STAGING_DIR)/usr/lib/libgmp.{a,so*}
 endef
 
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index eeba09b67..83a7d848f 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=haserl
 PKG_VERSION:=0.8.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/haserl
 PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/haserl
diff --git a/package/hostap-utils/Makefile b/package/hostap-utils/Makefile
index b794ad0d1..ad142f33d 100644
--- a/package/hostap-utils/Makefile
+++ b/package/hostap-utils/Makefile
@@ -11,12 +11,13 @@ PKG_NAME:=hostap-utils
 PKG_VERSION:=0.4.7
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=afe041581b8f01666e353bec20917c85
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/hostap-utils
diff --git a/package/hostap/Makefile b/package/hostap/Makefile
index 90281fe6b..82e7475a0 100644
--- a/package/hostap/Makefile
+++ b/package/hostap/Makefile
@@ -12,30 +12,24 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=hostap-driver
 PKG_VERSION:=0.4.9
 PKG_RELEASE:=1
-PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/kmod-hostap
-  SECTION:=drivers
-  CATEGORY:=Drivers
-  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT
-  TITLE:=Host AP support for Prism2/2.5/3 IEEE 802.11b
-  DESCRIPTION:=Host AP support for Prism2/2.5/3 IEEE 802.11b \\\
-    A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3 \\\
-    chipset. This driver supports so called Host AP mode that allows the card \\\
-    to act as an IEEE 802.11 access point. \\\
-    \\\
-    This option includes the base Host AP driver code that is shared by \\\
-    different hardware models. You will also need to enable support for \\\
-    PLX/PCI/CS version of the driver to actually use the driver. \\\
+define Package/kmod-hostap/Default
+  SECTION:=kernel
+  CATEGORY:=Kernel drivers
+  DESCRIPTION:=\
+	Host AP is a driver for 802.11b wireless cards based on Intersil \\\
+	Prism2/2.5/3 chipset. It supports so called Host AP mode that allows the \\\
+	card to act as an IEEE 802.11 access point.
   URL:=http://hostap.epitest.fi/
   ifeq ($(KERNEL),2.6)
     VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
@@ -44,18 +38,34 @@ define Package/kmod-hostap
   endif
 endef
 
+define Package/kmod-hostap
+  $(call Package/kmod-hostap/Default)
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT
+  TITLE:=Host AP support for Prism2/2.5/3
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the base Host AP driver code that is shared by \\\
+	different hardware models. You will also need to enable support for \\\
+	PLX/PCI/CS version of the driver to actually use the driver.
+endef
+
 define Package/kmod-hostap-pci
-$(call Package/kmod-hostap)
-DEPENDS:=kmod-hostap
-TITLE:=Host AP driver for Prism2.5 PCI adaptors
-DESCRIPTION:=Host AP driver for Prism2.5 PCI adaptors
+  $(call Package/kmod-hostap/Default)
+  DEPENDS:=kmod-hostap
+  TITLE:=Host AP driver for PCI adaptors
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the Host AP driver for Prism2.5 PCI adaptors.
 endef
 
 define Package/kmod-hostap-plx
-$(call Package/kmod-hostap)
-DEPENDS:=kmod-hostap
-TITLE:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors
-DESCRIPTION:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors
+  $(call Package/kmod-hostap/Default)
+  DEPENDS:=kmod-hostap
+  TITLE:=Host AP driver for PLX9052 based PCI adaptors
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the Host AP driver for Prism2/2.5/3 in PLX9052 \\\
+	based PCI adaptors.
 endef
 
 ifeq ($(KERNEL),2.4)
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index a1161e11f..ba16193da 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -11,24 +11,32 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=hostapd
 PKG_VERSION:=0.5.3
 PKG_RELEASE:=1
-PKG_MD5SUM:=4e3134e8b0d86e831230f8c620fd81bb
-PKG_BUILDDEP:=madwifi
 
-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_MD5SUM:=4e3134e8b0d86e831230f8c620fd81bb
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_BUILDDEP:=madwifi
+
 include $(INCLUDE_DIR)/package.mk
 
+define Package/hostapd/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=IEEE 802.1x Authenticator
+  URL:=http://hostap.epitest.fi/
+endef
+
 define Package/hostapd
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=+libopenssl
-TITLE:=IEEE 802.1x Authenticator
-DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator
-URL:=http://hostap.epitest.fi/
+  $(call Package/hostapd/Default)
+  DEPENDS:=+libopenssl
+  TITLE+= (full)
+  DESCRIPTION:=\
+	This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\
+	Authenticator.
 endef
 
 define Package/hostapd/conffiles
@@ -36,10 +44,11 @@ define Package/hostapd/conffiles
 endef
 
 define Package/hostapd-mini
-$(call Package/hostapd)
-TITLE:=IEEE 802.1x Authenticator (WPA-PSK only)
-DEPENDS:=
-DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator (WPA-PSK only)
+  $(call Package/hostapd/Default)
+  TITLE+= (WPA-PSK only)
+  DESCRIPTION:=\
+	This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\
+	(WPA-PSK only).
 endef
 
 define Package/hostapd-mini/conffiles
@@ -47,10 +56,12 @@ define Package/hostapd-mini/conffiles
 endef
 
 define Package/hostapd-utils
-$(call Package/hostapd)
-DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
-TITLE:=IEEE 802.1x Authenticator (utils)
-DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator (command line utils)
+  $(call Package/hostapd/Default)
+  DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
+  TITLE+= (utils)
+  DESCRIPTION:=\
+	This package contains a command line utility to control the \\\
+	IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
 endef
 
 define Build/ConfigureTarget
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 5e51b9607..01097c88b 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=iproute2
 PKG_VERSION:=2.6.15-060110
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
 PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iproute2/Default
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index d45a40e04..2ae6b27eb 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=ipsec-tools
 PKG_VERSION:=0.6.4
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ipsec-tools
 PKG_MD5SUM:=d0242a943c82c0cbf28005966ff35e21
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 30fafb8e5..f78ab77a0 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=ipset
 PKG_VERSION:=2.2.3
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
 PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ipset
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 8d77fb43f..d198a9271 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -13,7 +13,6 @@ PKG_NAME:=iptables
 PKG_VERSION:=1.3.5
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
 	ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
@@ -22,23 +21,26 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
 PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-PKG_MENU:=IPv4 / IPv6 firewall administration
-
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
--include $(LINUX_DIR)/.config
-include $(INCLUDE_DIR)/netfilter.mk
+  -include $(LINUX_DIR)/.config
+  include $(INCLUDE_DIR)/netfilter.mk
 endif
 
+define Package/iptables/Default
+  SECTION:=net
+  CATEGORY:=Base system
+  URL:=http://netfilter.org/
+endef
+
 define Package/iptables
-SECTION:=net
-CATEGORY:=Base system
-MENU:=1
-DEFAULT:=y
-TITLE:=IPv4 firewall administration tool
-URL:=http://netfilter.org/
+  $(call Package/iptables/Default)
+  DEFAULT:=y
+  TITLE:=IPv4 firewall administration tool
+  MENU:=1
 endef
 
 define Package/iptables/conffiles
@@ -47,114 +49,120 @@ define Package/iptables/conffiles
 endef
 
 define Package/iptables-mod-conntrack
-SECTION:=net
-CATEGORY:=Base system
-DEPENDS:=iptables +kmod-ipt-conntrack
-TITLE:=connection tracking modules
-DESCRIPTION:=iptables extensions for connection tracking \\\
-Includes: \\\
-	* libipt_conntrack \\\
-	* libipt_helper \\\
-	* libipt_connmark/CONNMARK
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables +kmod-ipt-conntrack
+  TITLE:=connection tracking modules
+  DESCRIPTION:=\
+	iptables extensions for connection tracking.\\\
+	\\\
+	Includes: \\\
+	- libipt_conntrack \\\
+	- libipt_helper \\\
+	- libipt_connmark/CONNMARK
 endef
 
 define Package/iptables-mod-filter
-SECTION:=net
-CATEGORY:=Base system
-DEPENDS:=iptables +kmod-ipt-filter
-TITLE:=filter modules
-DESCRIPTION:=iptables extensions for packet content inspection\\\
-Includes: \\\
-	* libipt_ipp2p \\\
-	* libipt_layer7 
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables +kmod-ipt-filter
+  TITLE:=filter modules
+  DESCRIPTION:=\
+	iptables extensions for packet content inspection.\\\
+	\\\
+	Includes: \\\
+	- libipt_ipp2p \\\
+	- libipt_layer7 
 endef
 
 define Package/iptables-mod-imq
-SECTION:=net
-CATEGORY:=Base system
-DEPENDS:=iptables
-TITLE:=IMQ support +kmod-imq
-DESCRIPTION:=iptables extension for IMQ support\\\
-Includes: \\\
-	* libipt_IMQ
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables
+  TITLE:=IMQ support
+  DESCRIPTION:=\
+	iptables extension for IMQ support.\\\
+	\\\
+	Includes: \\\
+	- libipt_IMQ
 endef
 
 define Package/iptables-mod-ipopt
-SECTION:=net
-CATEGORY:=Base system
-DEPENDS:=iptables +kmod-ipt-ipopt
-TITLE:=IP/Packet option modules
-DESCRIPTION:=iptables extensions for matching/changing IP packet options\\\
-Includes: \\\
-	* libipt_dscp/DSCP \\\
-	* libipt_ecn/ECN \\\
-	* libipt_length \\\
-	* libipt_mac \\\
-	* libipt_tos/TOS \\\
-	* libipt_tcpmms \\\
-	* libipt_ttl/TTL \\\
-	* libipt_unclean 
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables +kmod-ipt-ipopt
+  TITLE:=IP/Packet option modules
+  DESCRIPTION:=\
+	iptables extensions for matching/changing IP packet options.\\\
+	\\\
+	Includes: \\\
+	- libipt_dscp/DSCP \\\
+	- libipt_ecn/ECN \\\
+	- libipt_length \\\
+	- libipt_mac \\\
+	- libipt_tos/TOS \\\
+	- libipt_tcpmms \\\
+	- libipt_ttl/TTL \\\
+	- libipt_unclean 
 endef
 
 define Package/iptables-mod-ipsec
-SECTION:=net
-CATEGORY:=Base system
-DEPENDS:=iptables +kmod-ipt-ipsec
-TITLE:=IPSec extensions
-DESCRIPTION:=iptables extensions for matching ipsec traffic\\\
-Includes: \\\
-	* libipt_ah \\\
-	* libipt_esp
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables +kmod-ipt-ipsec
+  TITLE:=IPSec extensions
+  DESCRIPTION:=\
+	iptables extensions for matching ipsec traffic.\\\
+	\\\
+	Includes: \\\
+	- libipt_ah \\\
+	- libipt_esp
 endef
 
 define Package/iptables-mod-nat
-SECTION:=net
-CATEGORY:=Base system
-DEPENDS:=iptables +kmod-ipt-nat
-TITLE:=extra NAT targets
-DESCRIPTION:=iptables extensions for different NAT targets\\\
-Includes: \\\
-	* libipt_REDIRECT
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables +kmod-ipt-nat
+  TITLE:=extra NAT targets
+  DESCRIPTION:=\
+	iptables extensions for different NAT targets.\\\
+	\\\
+	Includes: \\\
+	- libipt_REDIRECT
 endef
 
 define Package/iptables-mod-ulog
-SECTION:=net
-CATEGORY:=Base system
-DEPENDS:=iptables +kmod-ipt-ulog
-TITLE:=user-space packet logging
-DESCRIPTION:=iptables extensions for user-space packet logging\\\
-Includes: \\\
-	* libipt_ULOG
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables +kmod-ipt-ulog
+  TITLE:=user-space packet logging
+  DESCRIPTION:=\
+	iptables extensions for user-space packet logging.\\\
+	\\\
+	Includes: \\\
+	- libipt_ULOG
 endef
 
 define Package/iptables-mod-extra
-SECTION:=net
-CATEGORY:=Base system
-DEPENDS:=iptables +kmod-ipt-extra
-TITLE:=other extra iptables extensions
-DESCRIPTION:=other extra iptables extensions\\\
-Includes: \\\
-	* libipt_limit \\\
-	* libipt_owner \\\
-	* libipt_physdev \\\
-	* libipt_pkttype \\\
-	* libipt_recent
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables +kmod-ipt-extra
+  TITLE:=other extra iptables extensions
+  DESCRIPTION:=\
+	other extra iptables extensions.\\\
+	\\\
+	Includes: \\\
+	- libipt_limit \\\
+	- libipt_owner \\\
+	- libipt_physdev \\\
+	- libipt_pkttype \\\
+	- libipt_recent
 endef
 
 define Package/iptables-utils
-SECTION:=net
-CATEGORY:=Base system
-DEPENDS:=iptables
-TITLE:=iptables save and restore utilities
+  $(call Package/iptables/Default)
+  DEPENDS:=iptables
+  TITLE:=iptables save and restore utilities
 endef
 
 define Package/ip6tables
-SECTION:=net
-CATEGORY:=Base system
-TITLE:=IPv6 firewall administration tool
+  $(call Package/iptables/Default)
+  CATEGORY:=Network
+  TITLE:=IPv6 firewall administration tool
 endef
 
-
 define Build/Configure
 endef
 
@@ -169,7 +177,6 @@ define Build/Compile
 		all install install-devel
 endef
 
-
 define Build/InstallDev
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -184,7 +191,6 @@ define Build/UninstallDev
 	rm -rf $(STAGING_DIR)/usr/lib/libipq.a
 endef
 
-		
 define Package/iptables/install
 	install -d -m0755 $(1)/etc/config
 	install -m0644 ./files/firewall.config $(1)/etc/config/firewall
@@ -216,15 +222,15 @@ define Package/ip6tables/install
 endef
 
 define BuildPlugin
-define Package/$(1)/install
+  define Package/$(1)/install
 	install -m0755 -d $$(1)/usr/lib/iptables
 	for m in $$(patsubst xt_%,ipt_%,$(2)); do \
 		$(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so $$(1)/usr/lib/iptables/ ; \
 	done
 	$(3)
-endef
+  endef
 
-$$(eval $$(call BuildPackage,$(1)))
+  $$(eval $$(call BuildPackage,$(1)))
 endef
 
 L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \
diff --git a/package/isakmpd/Makefile b/package/isakmpd/Makefile
index 0d4a8a58d..a4e7ff7b0 100644
--- a/package/isakmpd/Makefile
+++ b/package/isakmpd/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=isakmpd
 PKG_VERSION:=20041012
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/i/isakmpd/
 PKG_MD5SUM:=e6d25a9e232fb186e1a48dc06453bd57
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index f43f4fdf6..bb9fd4f70 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -17,9 +17,9 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
--include $(LINUX_DIR)/.config
-NF_KMOD:=1
-include $(INCLUDE_DIR)/netfilter.mk
+  -include $(LINUX_DIR)/.config
+  NF_KMOD:=1
+  include $(INCLUDE_DIR)/netfilter.mk
 endif
 
 define Build/Prepare
@@ -30,9 +30,9 @@ define Build/Compile
 endef
 
 define KernelPackage/Defaults
-FILES:=
-KCONFIG:=m
-AUTOLOAD:=
+  FILES:=
+  KCONFIG:=m
+  AUTOLOAD:=
 endef
 
 define ModuleAutoLoad
@@ -72,20 +72,19 @@ define KernelPackage
   endef
 
   ifeq ($(findstring m,$(KCONFIG)),m)
-  ifneq ($(strip $(FILES)),)
-    define Package/kmod-$(1)/install
+    ifneq ($(strip $(FILES)),)
+      define Package/kmod-$(1)/install
 		mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
 		$(CP) $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
 		$(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
-    endef
-  endif
+      endef
+    endif
   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))
 endef
 
 define AutoLoad
-add_module $(1) "$(2)";
+  add_module $(1) "$(2)";
 endef
 
 include ./modules.mk
-
diff --git a/package/kernel/modules.mk b/package/kernel/modules.mk
index 947562052..ab32969e3 100644
--- a/package/kernel/modules.mk
+++ b/package/kernel/modules.mk
@@ -8,427 +8,460 @@
 
 
 define KernelPackage/crypto
-TITLE:=CryptoAPI modules
-DESCRIPTION:=CryptoAPI modules
-KCONFIG:= \
-  $(CONFIG_CRYPTO_HMAC) \
-  $(CONFIG_CRYPTO_NULL) \
-  $(CONFIG_CRYPTO_MD4) \
-  $(CONFIG_CRYPTO_MD5) \
-  $(CONFIG_CRYPTO_SHA1) \
-  $(CONFIG_CRYPTO_SHA256) \
-  $(CONFIG_CRYPTO_SHA512) \
-  $(CONFIG_CRYPTO_WP512) \
-  $(CONFIG_CRYPTO_TGR192) \
-  $(CONFIG_CRYPTO_DES) \
-  $(CONFIG_CRYPTO_BLOWFISH) \
-  $(CONFIG_CRYPTO_TWOFISH) \
-  $(CONFIG_CRYPTO_SERPENT) \
-  $(CONFIG_CRYPTO_AES) \
-  $(CONFIG_CRYPTO_CAST5) \
-  $(CONFIG_CRYPTO_CAST6) \
-  $(CONFIG_CRYPTO_TEA) \
-  $(CONFIG_CRYPTO_ARC4) \
-  $(CONFIG_CRYPTO_KHAZAD) \
-  $(CONFIG_CRYPTO_ANUBIS) \
-  $(CONFIG_CRYPTO_DEFLATE) \
-  $(CONFIG_CRYPTO_MICHAEL_MIC) \
-  $(CONFIG_CRYPTO_CRC32C)
-FILES:=$(MODULES_DIR)/kernel/crypto/*.$(LINUX_KMOD_SUFFIX)
+  TITLE:=CryptoAPI modules
+  KCONFIG:= \
+	$(CONFIG_CRYPTO_HMAC) \
+	$(CONFIG_CRYPTO_NULL) \
+	$(CONFIG_CRYPTO_MD4) \
+	$(CONFIG_CRYPTO_MD5) \
+	$(CONFIG_CRYPTO_SHA1) \
+	$(CONFIG_CRYPTO_SHA256) \
+	$(CONFIG_CRYPTO_SHA512) \
+	$(CONFIG_CRYPTO_WP512) \
+	$(CONFIG_CRYPTO_TGR192) \
+	$(CONFIG_CRYPTO_DES) \
+	$(CONFIG_CRYPTO_BLOWFISH) \
+	$(CONFIG_CRYPTO_TWOFISH) \
+	$(CONFIG_CRYPTO_SERPENT) \
+	$(CONFIG_CRYPTO_AES) \
+	$(CONFIG_CRYPTO_CAST5) \
+	$(CONFIG_CRYPTO_CAST6) \
+	$(CONFIG_CRYPTO_TEA) \
+	$(CONFIG_CRYPTO_ARC4) \
+	$(CONFIG_CRYPTO_KHAZAD) \
+	$(CONFIG_CRYPTO_ANUBIS) \
+	$(CONFIG_CRYPTO_DEFLATE) \
+	$(CONFIG_CRYPTO_MICHAEL_MIC) \
+	$(CONFIG_CRYPTO_CRC32C)
+  FILES:=$(MODULES_DIR)/kernel/crypto/*.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,crypto))
 
 define KernelPackage/ide-core
-TITLE:=Kernel support for IDE
-DESCRIPTION:=Kernel modules for IDE support\\\
-	useful for usb mass storage devices (e.g. on WL-HDD)\\\
+  TITLE:=Kernel support for IDE
+  DESCRIPTION:=\
+	Useful for usb mass storage devices (e.g. on WL-HDD)\\\
 	\\\
 	Includes: \\\
-	    - ide-core \\\
-	    - ide-detect \\\
-	    - ide-disk \\\
-	    - pdc202xx_old
-KCONFIG:=$(CONFIG_IDE)
-FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX)
-AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
+	- ide-core \\\
+	- ide-detect \\\
+	- ide-disk
+  KCONFIG:=$(CONFIG_IDE)
+  FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
 endef
 $(eval $(call KernelPackage,ide-core))
 
 define KernelPackage/ide-pdc202xx
-TITLE:=PDC202xx IDE driver
-DESCRIPTION:=PDC202xx IDE driver
-KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD)
-FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
-AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
+  TITLE:=PDC202xx IDE driver
+  KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD)
+  FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
 endef
 $(eval $(call KernelPackage,ide-pdc202xx))
 
 define KernelPackage/ieee80211softmac
-TITLE:=802.11 Networking stack
-DESCRIPTION:=802.11 Networking stack\\\
-Includes: \\\
-	* ieee80211_crypt \\\
-	* ieee80211 \\\
-	* ieee80211_crypt_wep \\\
-	* ieee80211_crypt_tkip \\\
-	* ieee80211_crytp_ccmp \\\
-	* ieee80211softmac
-KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
-FILES:=$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
-AUTOLOAD:=$(call AutoLoad,10,ieee80211_crypt \
+  TITLE:=802.11 Networking stack
+  DESCRIPTION:=\\\
+	\\\
+	Includes: \\\
+	- ieee80211_crypt \\\
+	- ieee80211 \\\
+	- ieee80211_crypt_wep \\\
+	- ieee80211_crypt_tkip \\\
+	- ieee80211_crytp_ccmp \\\
+	- ieee80211softmac
+  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
+  FILES:=$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,10, \
+	ieee80211_crypt \
 	ieee80211 \
 	ieee80211_crypt_wep \
 	ieee80211_crypt_tkip \
 	ieee80211_crypt_ccmp \
-	ieee80211softmac)
+	ieee80211softmac \
+  )
 endef
 $(eval $(call KernelPackage,ieee80211softmac))
 
+
 WIMENU:=Wireless drivers
 
 define KernelPackage/bcm43xx
-TITLE:=Broadcom BCM43xx driver
-DESCRIPTION:=Open source BCM43xx driver\\\
-Includes: \\\
-	* bcm43xx
-KCONFIG:=$(CONFIG_BCM43XX)
-SUBMENU:=$(WIMENU)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
-AUTOLOAD:=$(call Autoload,50,bcm43xx)
+  TITLE:=Broadcom BCM43xx driver
+  DESCRIPTION:=\\\
+	\\\
+	Includes: \\\
+	- bcm43xx
+  KCONFIG:=$(CONFIG_BCM43XX)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,50,bcm43xx)
+  SUBMENU:=$(WIMENU)
 endef
 $(eval $(call KernelPackage,bcm43xx))
 
 define KernelPackage/ipw2100
-TITLE:=Intel IPw2100 driver
-DESCRIPTION:=Intel IPW2100 driver\\\
-Includes: \\\
-        * ipw2100
-KCONFIG:=$(CONFIG_IPW2100)
-SUBMENU:=$(WIMENU)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
-AUTOLOAD:=$(call Autoload,50,ipw2100)
+  TITLE:=Intel IPw2100 driver
+  DESCRIPTION:=\\\
+	\\\
+	Includes: \\\
+	- ipw2100
+  KCONFIG:=$(CONFIG_IPW2100)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,50,ipw2100)
+  SUBMENU:=$(WIMENU)
 endef
 $(eval $(call KernelPackage,ipw2100))
 
 define KernelPackage/ipw2200
-TITLE:=Intel IPw2200 driver
-DESCRIPTION:=Intel IPW2200 driver\\\
-Includes: \\\
-        * ipw2200
-KCONFIG:=$(CONFIG_IPW2200)
-SUBMENU:=$(WIMENU)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
-AUTOLOAD:=$(call Autoload,50,ipw2200)
+  TITLE:=Intel IPw2200 driver
+  DESCRIPTION:=\\\
+	\\\
+	Includes: \\\
+	- ipw2200
+  KCONFIG:=$(CONFIG_IPW2200)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,50,ipw2200)
+  SUBMENU:=$(WIMENU)
 endef
 $(eval $(call KernelPackage,ipw2200))
 
+
 NFMENU:=Netfilter Extensions
 
 define KernelPackage/ipt-conntrack
-TITLE:=Modules for connection tracking
-DESCRIPTION:=Netfilter (IPv4) kernel modules for connection tracking\\\
-Includes: \\\
-	* ipt_conntrack \\\
-	* ipt_helper \\\
-	* ipt_connmark/CONNMARK
-SUBMENU:=$(NFMENU)
-FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  TITLE:=Modules for connection tracking
+  DESCRIPTION:=\
+	Netfilter (IPv4) kernel modules for connection tracking\\\
+	\\\
+	Includes: \\\
+	- ipt_conntrack \\\
+	- ipt_helper \\\
+	- ipt_connmark/CONNMARK
+  FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-conntrack))
 
-
 define KernelPackage/ipt-filter
-TITLE:=Modules for packet content inspection
-DESCRIPTION:=Netfilter (IPv4) kernel modules for packet content inspection \\\
-Includes: \\\
-	* ipt_ipp2p \\\
-	* ipt_layer7
-SUBMENU:=$(NFMENU)
-FILES:=$(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  TITLE:=Modules for packet content inspection
+  DESCRIPTION:=\
+	Netfilter (IPv4) kernel modules for packet content inspection \\\
+	\\\
+	Includes: \\\
+	- ipt_ipp2p \\\
+	- ipt_layer7
+  FILES:=$(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-filter))
 
-
 define KernelPackage/ipt-ipopt
-TITLE:=Modules for matching/changing IP packet options
-DESCRIPTION:=Netfilter (IPv4) modules for matching/changing IP packet options \\\
-Includes: \\\
-	* ipt_dscp/DSCP \\\
-	* ipt_ecn/ECN \\\
-	* ipt_length \\\
-	* ipt_mac \\\
-	* ipt_tos/TOS \\\
-	* ipt_tcpmms \\\
-	* ipt_ttl/TTL \\\
-	* ipt_unclean
-SUBMENU:=$(NFMENU)
-FILES:=$(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  TITLE:=Modules for matching/changing IP packet options
+  DESCRIPTION:=\
+	Netfilter (IPv4) modules for matching/changing IP packet options \\\
+	\\\
+	Includes: \\\
+	- ipt_dscp/DSCP \\\
+	- ipt_ecn/ECN \\\
+	- ipt_length \\\
+	- ipt_mac \\\
+	- ipt_tos/TOS \\\
+	- ipt_tcpmms \\\
+	- ipt_ttl/TTL \\\
+	- ipt_unclean
+  FILES:=$(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-ipopt))
 
-
 define KernelPackage/ipt-ipsec
-TITLE:=Modules for matching IPSec packets
-DESCRIPTION:=Netfilter (IPv4) modules for matching IPSec packets \\\
-Includes: \\\
-	* ipt_ah \\\
-	* ipt_esp
-SUBMENU:=$(NFMENU)
-FILES:=$(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  TITLE:=Modules for matching IPSec packets
+  DESCRIPTION:=\
+	Netfilter (IPv4) modules for matching IPSec packets \\\
+	\\\
+	Includes: \\\
+	- ipt_ah \\\
+	- ipt_esp
+  FILES:=$(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-ipsec))
 
-
 define KernelPackage/ipt-nat
-TITLE:=Modules for extra NAT targets
-DESCRIPTION:=Netfilter (IPv4) modules for extra NAT targets \\\
-Includes: \\\
-	* ipt_REDIRECT \\\
-	* ipt_NETMAP
-SUBMENU:=$(NFMENU)
-FILES:=$(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  TITLE:=Modules for extra NAT targets
+  DESCRIPTION:=\
+	Netfilter (IPv4) modules for extra NAT targets \\\
+	\\\
+	Includes: \\\
+	- ipt_REDIRECT \\\
+	- ipt_NETMAP
+  FILES:=$(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-nat))
 
 define KernelPackage/ipt-nathelper
-TITLE:=Extra Conntrack and NAT helpers
-DESCRIPTION:=Extra Conntrack and NAT helpers (IPv4) \\\
-Includes: \\\
-	* ip_conntrack_amanda \\\
-	* ip_conntrack_proto_gre \\\
-	* ip_nat_proto_gre \\\
-	* ip_conntrack_pptp \\\
-	* ip_nat_pptp \\\
-	* ip_conntrack_sip \\\
-	* ip_nat_sip \\\
-	* ip_nat_snmp_basic \\\
-	* ip_conntrack_tftp
-SUBMENU:=$(NFMENU)
-FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  TITLE:=Extra Conntrack and NAT helpers
+  DESCRIPTION:=\
+	Extra Netfilter (IPv4) Conntrack and NAT helpers \\\
+	\\\
+	Includes: \\\
+	- ip_conntrack_amanda \\\
+	- ip_conntrack_proto_gre \\\
+	- ip_nat_proto_gre \\\
+	- ip_conntrack_pptp \\\
+	- ip_nat_pptp \\\
+	- ip_conntrack_sip \\\
+	- ip_nat_sip \\\
+	- ip_nat_snmp_basic \\\
+	- ip_conntrack_tftp
+  FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-nathelper))
 
 define KernelPackage/ipt-imq
-TITLE:=Intermediate Queueing support
-DESCRIPTION:=Kernel support for Intermediate Queueing devices
-KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ)
-SUBMENU:=$(NFMENU)
-FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
+  TITLE:=Intermediate Queueing support
+  DESCRIPTION:=\
+	Kernel support for Intermediate Queueing devices
+  KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ)
+  FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-imq))
 
 
 define KernelPackage/ipt-queue
-TITLE:=Module for user-space packet queueing
-DESCRIPTION:=Netfilter (IPv4) module for user-space packet queueing \\\
-Includes: \\\
-	* ipt_QUEUE
-SUBMENU:=$(NFMENU)
-FILES:=$(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  TITLE:=Module for user-space packet queueing
+  DESCRIPTION:=\
+	Netfilter (IPv4) module for user-space packet queueing \\\
+	\\\
+	Includes: \\\
+	- ipt_QUEUE
+  FILES:=$(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-queue))
 
 define KernelPackage/ipt-ulog
-TITLE:=Module for user-space packet logging
-DESCRIPTION:=Netfilter (IPv4) module for user-space packet logging \\\
-Includes: \\\
-	* ipt_ULOG
-SUBMENU:=$(NFMENU)
-FILES:=$(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  TITLE:=Module for user-space packet logging
+  DESCRIPTION:=\
+	Netfilter (IPv4) module for user-space packet logging \\\
+	\\\
+	Includes: \\\
+	- ipt_ULOG
+  FILES:=$(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-ulog))
 
 define KernelPackage/ipt-extra
-TITLE:=Extra modules
-DESCRIPTION:=Other Netfilter (IPv4) kernel modules\\\
-Includes: \\\
-	* ipt_limit \\\
-	* ipt_owner \\\
-	* ipt_physdev \\\
-	* ipt_pkttype \\\
-	* ipt_recent
-SUBMENU:=$(NFMENU)
-FILES:=$(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  TITLE:=Extra modules
+  DESCRIPTION:=\
+	Other Netfilter (IPv4) kernel modules\\\
+	Includes: \\\
+	- ipt_limit \\\
+	- ipt_owner \\\
+	- ipt_physdev \\\
+	- ipt_pkttype \\\
+	- ipt_recent
+  FILES:=$(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ipt-extra))
 
 define KernelPackage/ip6tables
-TITLE:=IPv6 modules
-DESCRIPTION:=Netfilter IPv6 firewalling support
-SUBMENU:=$(NFMENU)
-KCONFIG:=$(CONFIG_IP6_NF_IPTABLES)
-FILES:=$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
+  TITLE:=IPv6 modules
+  DESCRIPTION:=\
+	Netfilter IPv6 firewalling support
+  KCONFIG:=$(CONFIG_IP6_NF_IPTABLES)
+  FILES:=$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ip6tables))
 
 
 define KernelPackage/arptables
-TITLE:=ARP firewalling modules
-DESCRIPTION:=Kernel modules for ARP firewalling
-SUBMENU:=$(NFMENU)
-FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
-KCONFIG:=$(CONFIG_IP_NF_ARPTABLES)
+  TITLE:=ARP firewalling modules
+  DESCRIPTION:=\
+	Kernel modules for ARP firewalling
+  FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_IP_NF_ARPTABLES)
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,arptables))
 
 
 define KernelPackage/ebtables
-TITLE:=Bridge firewalling modules
-DESCRIPTION:=Kernel modules for Ethernet Bridge firewalling
-SUBMENU:=$(NFMENU)
-FILES:=$(MODULES_DIR)/kernel/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
-KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES)
+  TITLE:=Bridge firewalling modules
+  DESCRIPTION:=\
+	Kernel modules for Ethernet Bridge firewalling
+  FILES:=$(MODULES_DIR)/kernel/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES)
+  SUBMENU:=$(NFMENU)
 endef
 $(eval $(call KernelPackage,ebtables))
 
+
 define KernelPackage/ipv6
-TITLE:=IPv6 support
-DESCRIPTION:=Kernel modules for IPv6 support
-KCONFIG:=$(CONFIG_IPV6)
-FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
+  TITLE:=IPv6 support
+  DESCRIPTION:=\
+	Kernel modules for IPv6 support
+  KCONFIG:=$(CONFIG_IPV6)
+  FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,ipv6))
 
+
 define KernelPackage/gre
-TITLE:=GRE support
-DESCRIPTION:=Generic Routing Encapsulation support
-KCONFIG=$(CONFIG_NET_IPGRE)
-FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
+  TITLE:=GRE support
+  DESCRIPTION:=\
+	Generic Routing Encapsulation support
+  KCONFIG=$(CONFIG_NET_IPGRE)
+  FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,gre))
 
+
 define KernelPackage/tun
-TITLE:=Universal TUN/TAP driver
-DESCRIPTION:=Kernel support for the TUN/TAP tunneling device
-KCONFIG:=$(CONFIG_TUN)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
+  TITLE:=Universal TUN/TAP driver
+  DESCRIPTION:=\
+	Kernel support for the TUN/TAP tunneling device
+  KCONFIG:=$(CONFIG_TUN)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,tun))
 
+
 define KernelPackage/ppp
-TITLE:=PPP modules
-DESCRIPTION:=Kernel modules for PPP support
-KCONFIG:=$(CONFIG_PPP)
+  TITLE:=PPP modules
+  DESCRIPTION:=\
+	Kernel modules for PPP support
+  KCONFIG:=$(CONFIG_PPP)
 endef
 
 define KernelPackage/ppp/2.6
-FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.ko $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko $(MODULES_DIR)/kernel/drivers/net/slhc.ko $(MODULES_DIR)/kernel/lib/crc-ccitt.ko
-AUTOLOAD:=$(call AutoLoad,30,crc-ccitt)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.ko $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko $(MODULES_DIR)/kernel/drivers/net/slhc.ko $(MODULES_DIR)/kernel/lib/crc-ccitt.ko
+  AUTOLOAD:=$(call AutoLoad,30,crc-ccitt)
 endef
 
 define KernelPackage/ppp/2.4
-FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o $(MODULES_DIR)/kernel/drivers/net/slhc.o
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o $(MODULES_DIR)/kernel/drivers/net/slhc.o
 endef
 $(eval $(call KernelPackage,ppp))
 
+
 define KernelPackage/pppoe
-TITLE:=PPPoE modules
-DESCRIPTION:=Kernel modules for PPP over Ethernet support
-DEPENDS:=kmod-ppp
-KCONFIG:=$(CONFIG_PPPOE)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
+  TITLE:=PPPoE support
+  DESCRIPTION:=\
+	Kernel modules for PPPoE (PPP over Ethernet) support
+  DEPENDS:=kmod-ppp
+  KCONFIG:=$(CONFIG_PPPOE)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,pppoe))
 
+
 define KernelPackage/pppoa
-TITLE:=PPPoA modules
-DESCRIPTION:=Kernel modules for PPP over ATM support
-DEPENDS:=kmod-ppp
-KCONFIG:=$(CONFIG_PPPOATM)
-FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
+  TITLE:=PPPoA support
+  DESCRIPTION:=\
+	Kernel modules for PPPoA (PPP over ATM) support
+  DEPENDS:=kmod-ppp
+  KCONFIG:=$(CONFIG_PPPOATM)
+  FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,pppoa))
 
 
 define KernelPackage/mppe
-TITLE:=Microsoft PPP compression/encryption
-DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
-DEPENDS:=kmod-ppp
-KCONFIG:=$(CONFIG_PPP_MPPE)
+  TITLE:=Microsoft PPP compression/encryption
+  DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
+  DEPENDS:=kmod-ppp
+  KCONFIG:=$(CONFIG_PPP_MPPE)
 endef
 
 define KernelPackage/mppe/2.4
-FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
 endef
 
 define KernelPackage/mppe/2.6
-FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,mppe))
 
 
-
 NDMENU:=Network Devices
 
-
 define KernelPackage/natsemi
-TITLE:=National Semiconductor DP8381x series 
-DESCRIPTION:=National Semiconductor DP8381x series PCI Ethernet kernel support
-SUBMENU:=$(NDMENU)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
-KCONFIG:=$(CONFIG_NATSEMI)
-DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  TITLE:=National Semiconductor DP8381x series 
+  DESCRIPTION:=\
+	Kernel modules for National Semiconductor DP8381x series PCI Ethernet \\\
+	adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_NATSEMI)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
 endef
 $(eval $(call KernelPackage,natsemi))
 
 define KernelPackage/sis900
-TITLE:=SiS 900 Ethernet support
-DESCRIPTION:=Sis 900 kernel ethernet support
-SUBMENU:=$(NDMENU)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
-KCONFIG:=$(CONFIG_SIS900)
-DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  TITLE:=SiS 900 Ethernet support
+  DESCRIPTION:=\
+	Kernel modules for Sis 900 Ethernet adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_SIS900)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
 endef
 $(eval $(call KernelPackage,sis900))
 
-
 define KernelPackage/via-rhine
-TITLE:=Via Rhine ethernet support
-DESCRIPTION:=Kernel modules for Via Rhine ethernet chipsets
-SUBMENU:=$(NDMENU)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
-KCONFIG:=$(CONFIG_VIA_RHINE)
-DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  TITLE:=Via Rhine ethernet support
+  DESCRIPTION:=\
+	Kernel modules for Via Rhine Ethernet chipsets.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_VIA_RHINE)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
 endef
 $(eval $(call KernelPackage,via-rhine))
 
 define KernelPackage/8139too
-TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
-DESCRIPTION:=Kernel modules for RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
-SUBMENU:=$(NDMENU)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
-KCONFIG:=$(CONFIG_8139TOO)
-DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
+  DESCRIPTION:=\
+	Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_8139TOO)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
 endef
 $(eval $(call KernelPackage,8139too))
 
 define KernelPackage/e100
-TITLE:=Intel(R) PRO/100+ cards kernel support
-DESCRIPTION:=Kernel modules for Intel(R) PRO/100+ cards kernel support
-SUBMENU:=$(NDMENU)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
-KCONFIG:=$(CONFIG_E100)
-DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  TITLE:=Intel(R) PRO/100+ cards kernel support
+  DESCRIPTION:=\
+	Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_E100)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
 endef
 $(eval $(call KernelPackage,e100))
 
 define KernelPackage/3c59x
-TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
-DESCRIPTION:= \
-	  This option enables driver support for a large number of 10mbps and \
-	  10/100mbps EISA, PCI and PCMCIA 3Com network cards: \
-	  \
-	   * "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI \
-	   * "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI	\
-	   * "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus \
-	   * "Tornado"   (3c905)                                  PCI \
-	   * "Hurricane" (3c555/3cSOHO)                           PCI 
-SUBMENU:=$(NDMENU)
-FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
-KCONFIG:=$(CONFIG_3C59X)
-DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
+  DESCRIPTION:=\
+	This option enables driver support for a large number of 10mbps and \\\
+	10/100mbps EISA, PCI and PCMCIA 3Com Ethernet adapters: \\\
+	- "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI \\\
+	- "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI \\\
+	- "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus \\\
+	- "Tornado"   (3c905)                                  PCI  \\\
+	- "Hurricane" (3c555/3cSOHO)                           PCI 
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_3C59X)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
 endef
 $(eval $(call KernelPackage,3c59x))
-
-
-
diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index c756747d7..38f1f6901 100644
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=keynote
 PKG_VERSION:=2.3
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=b569066ac2ba1356c2112b118a7d74d0
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
@@ -55,8 +56,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/keynote \
+	rm -rf	$(STAGING_DIR)/usr/include/keynote \
 		$(STAGING_DIR)/usr/lib/libkeynote.a
 endef
 
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 4fd1acae1..f8de02d55 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=libpcap
 PKG_VERSION:=0.9.4
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 291fe3573..24a914a71 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=linux-atm
 PKG_VERSION:=2.4.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
 PKG_MD5SUM:=84fef49cc39ff2605204246666f65864
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 431e0a7a4..a4180063f 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -13,12 +13,13 @@ PKG_NAME:=madwifi
 PKG_VERSION:=0.9.2
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=a75baacbe07085ddc5cb28e1fb43edbb
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-madwifi
@@ -103,7 +104,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf $(STAGING_DIR)/usr/include/madwifi
+	rm -rf	$(STAGING_DIR)/usr/include/madwifi
 endef
 
 define Package/kmod-madwifi/install
diff --git a/package/mini_fo/Makefile b/package/mini_fo/Makefile
index 198f4c94c..38ad63754 100644
--- a/package/mini_fo/Makefile
+++ b/package/mini_fo/Makefile
@@ -13,12 +13,13 @@ PKG_NAME:=mini_fo
 PKG_VERSION:=0.6.2pre1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/mini_fo-0-6-2-pre1
 PKG_SOURCE:=mini_fo-0-6-2-pre1.tar.bz2
 PKG_SOURCE_URL:=http://www.denx.de/twiki/pub/Know/MiniFOHome/
 PKG_MD5SUM:=acd12157be25d7b3c8df90914049403e
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/mini_fo-0-6-2-pre1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-mini-fo
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 4b7995af4..ea3d3192d 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -12,7 +12,6 @@ PKG_NAME:=openssl
 PKG_VERSION:=0.9.8b
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openssl.org/source/ \
 	ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
@@ -21,6 +20,7 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \
 PKG_MD5SUM:=12cedbeb6813a0d7919dbf1f82134b86
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -110,8 +110,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/openssl \
+	rm -rf	$(STAGING_DIR)/usr/include/openssl \
 		$(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
 endef
 
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 0f7a11a6e..1ea3b4b4f 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -13,12 +13,13 @@ PKG_NAME:=openswan
 PKG_VERSION:=2.4.6
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
 PKG_MD5SUM:=b34d71ca49dedad017879b0e912d40dd
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 PKG_INIT_PRIO:=60
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index 5cd77c833..2241c6f53 100644
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=pcmcia-cs
 PKG_VERSION:=3.2.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 64351a5ca..680076857 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -11,76 +11,84 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.3
 PKG_RELEASE:=7
-PKG_BUILDDEP:=libpcap linux-atm
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
 PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+PKG_BUILDDEP:=libpcap linux-atm
+
 include $(INCLUDE_DIR)/package.mk
 
+define Package/ppp/Default
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://ppp.samba.org/
+endef
+
 define Package/ppp
-SECTION:=net
-CATEGORY:=Network
-MENU:=1
-DEFAULT:=y
-DEPENDS:=+kmod-ppp
-TITLE:=PPP daemon
-DESCRIPTION:=PPP (Point-to-Point Protocol) daemon
-URL:=http://ppp.samba.org/
+  $(call Package/ppp/Default)
+  DEFAULT:=y
+  DEPENDS:=+kmod-ppp
+  TITLE:=PPP daemon
+  DESCRIPTION:=\
+	This package contains the PPP (Point-to-Point Protocol) daemon.
+  MENU:=1
 endef
 
 define Package/ppp-mod-pppoa
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp +linux-atm +kmod-pppoa
-TITLE:=PPPoA plugin
-DESCRIPTION:=PPPoA (PPP over ATM) plugin for ppp
+  $(call Package/ppp/Default)
+  DEPENDS:=ppp +linux-atm +kmod-pppoa
+  TITLE:=PPPoA plugin
+  DESCRIPTION:=\
+	This package contains a PPPoA (PPP over ATM) plugin for ppp.
 endef
 
 define Package/ppp-mod-pppoe
-SECTION:=net
-CATEGORY:=Network
-DEFAULT:=y
-DEPENDS:=ppp +kmod-pppoe
-TITLE:=PPPoE plugin
-DESCRIPTION:=PPPoE (PPP over Ethernet) plugin for ppp
+  $(call Package/ppp/Default)
+  DEFAULT:=y
+  DEPENDS:=ppp +kmod-pppoe
+  TITLE:=PPPoE plugin
+  DESCRIPTION:=\
+	This package contains a PPPoE (PPP over Ethernet) plugin for ppp.
 endef
 
 define Package/ppp-mod-radius
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp
-TITLE:=RADIUS plugin
-DESCRIPTION:=RADIUS (Remote Authentication Dial-In User Service) plugin for ppp
+  $(call Package/ppp/Default)
+  DEPENDS:=ppp
+  TITLE:=RADIUS plugin
+  DESCRIPTION:=\
+	This package contains a RADIUS (Remote Authentication Dial-In User \\\
+	Service) plugin for ppp.
 endef
 
 define Package/chat
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp
-TITLE:=Establish conversation with a modem
-DESCRIPTION:=Utility to establish conversation with other PPP servers (via a modem)
+  $(call Package/ppp/Default)
+  DEPENDS:=ppp
+  TITLE:=Establish conversation with a modem
+  DESCRIPTION:=\
+	This package contains an utility to establish conversation with other \\\
+	PPP servers (via a modem).
 endef
 
 define Package/pppdump
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp
-TITLE:=Read PPP record file
-DESCRIPTION:=Utility to read PPP record file
+  $(call Package/ppp/Default)
+  DEPENDS:=ppp
+  TITLE:=Read PPP record file
+  DESCRIPTION:=\
+	This package contains an utility to read PPP record file.
 endef
 
 define Package/pppstats
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=ppp
-TITLE:=Report PPP statistics
-DESCRIPTION:=Utility to report PPP statistics
+  $(call Package/ppp/Default)
+  DEPENDS:=ppp
+  TITLE:=Report PPP statistics
+  DESCRIPTION:=\
+	This package contains an utility to report PPP statistics.
 endef
 
 define Build/Compile
@@ -96,6 +104,9 @@ define Build/Compile
 endef
 
 define Package/ppp/install
+	install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
+	install -d -m0755 $(1)/usr/sbin
+	install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(1)/usr/sbin/
 	install -d -m0755 $(1)/lib/network
 	install -m0755 ./files/ppp.sh $(1)/lib/network/
 	install -d -m0755 $(1)/etc/ppp
@@ -107,38 +118,35 @@ define Package/ppp/install
 	install -d -m0755 $(1)/etc/ppp/ip-down.d
 	install -m0644 ./files/etc/ppp/options $(1)/etc/ppp/
 	ln -sf /tmp/resolv.conf $(1)/etc/ppp/resolv.conf
-	install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
-	install -d -m0755 $(1)/usr/sbin
-	install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(1)/usr/sbin/
 endef
 	
 define Package/ppp-mod-pppoa/install
-	install -d -m0755 $(1)/lib/network
-	install -m0755 ./files/pppoa.sh $(1)/lib/network/
 	install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
 	install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \
 		$(1)/usr/lib/pppd/$(PKG_VERSION)/
+	install -d -m0755 $(1)/lib/network
+	install -m0755 ./files/pppoa.sh $(1)/lib/network/
 endef
 
 define Package/ppp-mod-pppoe/install
-	install -d -m0755 $(1)/lib/network
-	install -m0755 ./files/pppoe.sh $(1)/lib/network/
 	install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
 	install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \
 		$(1)/usr/lib/pppd/$(PKG_VERSION)/
+	install -d -m0755 $(1)/lib/network
+	install -m0755 ./files/pppoe.sh $(1)/lib/network/
 endef
 
 define Package/ppp-mod-radius/install
+	install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
+	install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/radius.so \
+		$(1)/usr/lib/pppd/$(PKG_VERSION)/
 	install -d -m0755 $(1)/etc/ppp
-	install -m644 ./files/etc/ppp/radius.conf $(1)/etc/ppp/
+	install -m0644 ./files/etc/ppp/radius.conf $(1)/etc/ppp/
 	install -d -m0755 $(1)/etc/ppp/radius
-	install -m644 ./files/etc/ppp/radius/dictionary* \
+	install -m0644 ./files/etc/ppp/radius/dictionary* \
 		$(1)/etc/ppp/radius/
-	install -m600 ./files/etc/ppp/radius/servers \
+	install -m0600 ./files/etc/ppp/radius/servers \
 		$(1)/etc/ppp/radius/
-	install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION)
-	install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/radius.so \
-		$(1)/usr/lib/pppd/$(PKG_VERSION)/
 endef
 
 define Package/chat/install
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index b32ab0627..bb0710419 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -12,12 +12,13 @@ PKG_NAME:=pptp
 PKG_VERSION:=1.6.0
 PKG_RELEASE:=3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pptpclient
 PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pptp
diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index 1a2f7f5f1..f4383a3f9 100644
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -13,12 +13,12 @@ PKG_NAME:=shfs
 PKG_VERSION:=0.35
 PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/shfs
 PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile
index d06343324..643e5863f 100644
--- a/package/spca5xx/Makefile
+++ b/package/spca5xx/Makefile
@@ -13,12 +13,13 @@ PKG_NAME:=spca5xx
 PKG_VERSION:=20060501
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://mxhaard.free.fr/spca50x/Download/
 PKG_MD5SUM:=8fcec25715aea10f9ebec5728c37e752
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 #FIXME: add proper dependency handling on kmod-usb-core & kmod-videodev packages
diff --git a/package/udev/Makefile b/package/udev/Makefile
index e94244203..830ea6a66 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -12,7 +12,6 @@ PKG_NAME:=udev
 PKG_VERSION:=077
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
 	http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
@@ -23,6 +22,7 @@ PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
 PKG_MD5SUM:=61ec646daf7795e9777e8f33975408fe
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile
index d1a0dfbc7..7e93fe1ac 100644
--- a/package/ueagle-atm/Makefile
+++ b/package/ueagle-atm/Makefile
@@ -13,12 +13,12 @@ PKG_NAME:=ueagle-atm
 PKG_VERSION:=1.0d1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://castet.matthieu.free.fr/eagle/release/
 PKG_MD5SUM:=5da1fceb15168f4c7ad407a3e38ddecb
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 18fb25146..8ca8052ea 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -12,7 +12,6 @@ PKG_NAME:=util-linux
 PKG_VERSION:=2.12r
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
 	http://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
@@ -21,6 +20,7 @@ PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
 PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 064407b03..c19ff7613 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=wireless-tools
 PKG_VERSION:=28
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
 PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
 PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -56,8 +56,7 @@ define Build/InstallDev
 endef
 	
 define Build/UninstallDev
-	rm -f \
-		$(STAGING_DIR)/usr/include/{iwlib,wireless}.h \
+	rm -f	$(STAGING_DIR)/usr/include/{iwlib,wireless}.h \
 		$(STAGING_DIR)/usr/lib/libiw.so*
 endef
 
diff --git a/package/yamonenv/Makefile b/package/yamonenv/Makefile
index dfb0c82f9..dfb9bbb59 100644
--- a/package/yamonenv/Makefile
+++ b/package/yamonenv/Makefile
@@ -12,32 +12,26 @@ PKG_NAME:=yamonenv
 PKG_VERSION:=20051022
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)_gruen.4g__$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://meshcube.org/nylon/stable/sources/
 PKG_MD5SUM:=a3e4f24155aa3ba5aa502bc63fdaa6ad
 PKG_CAT:=zcat
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/yamonenv
-SECTION:=sys
-CATEGORY:=Base system
-DEPENDS:=@LINUX_2_6_AU1000@
-TITLE:=YAMON configuration utility
-DESCRIPTION:=YAMON bootloader configuration utility
-URL:=http://meshcube.org/nylon/stable/sources/
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=@LINUX_2_6_AU1000@
+  TITLE:=YAMON configuration utility
+  URL:=http://meshcube.org/nylon/stable/sources/
 endef
 
 define Build/Configure
 endef
 
-define Build/Compile
-	$(call Build/Compile/Default,all)
-endef
-
 define Package/yamonenv/install
 	install -d -m0755 $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/
diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile
index 0c94cd14d..e5d2c2724 100644
--- a/package/zd1211/Makefile
+++ b/package/zd1211/Makefile
@@ -13,24 +13,26 @@ PKG_NAME:=zd1211
 PKG_VERSION:=r69
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://zd1211.ath.cx/download/
 PKG_MD5SUM:=c14133a3d5b27927402a492e84d2467a
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 #FIXME: add proper dependency handling on kmod-usb-core packages
 define Package/kmod-zd1211
-  SECTION:=drivers
-  CATEGORY:=Drivers
+  SECTION:=kernel
+  CATEGORY:=Kernel drivers
   DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML
   TITLE:=Driver for Zydas 1211 based USB devices
-  DESCRIPTION:=Driver for Zydas 1211 based USB devices \\\
-    Linux driver for the ZyDAS ZD1211 802.11b/g USB-WLAN-Chip.\\\
-    Initially contributed by ZyDAS, this driver is actively maintained by the \\\
-    open source community.
+  DESCRIPTION:=\
+	This package contains a Linux driver for the ZyDAS ZD1211 802.11b/g \\\
+	USB-WLAN-Chip.\\\
+	Initially contributed by ZyDAS, this driver is actively maintained by the \\\
+	open source community.
   URL:=http://zd1211.ath.cx/
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
 endef
@@ -50,10 +52,10 @@ define Build/Compile
 endef
 
 define Package/kmod-zd1211/install
-	install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+	install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
 	$(CP) $(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX) \
 		$(1)/lib/modules/$(LINUX_VERSION)/
-	install -m0755 -d $(1)/usr/sbin
+	install -d -m0755 $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/apdbg $(1)/usr/sbin/
 	$(CP) $(PKG_BUILD_DIR)/sta $(1)/usr/sbin/$(PKG_NAME)-sta
 endef
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 681af85c7..df4a4753f 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=zlib
 PKG_VERSION:=1.2.3
 PKG_RELEASE:=3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -61,8 +61,7 @@ define Build/InstallDev
 endef
 	
 define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/z{conf,lib}.h \
+	rm -rf	$(STAGING_DIR)/usr/include/z{conf,lib}.h \
 		$(STAGING_DIR)/usr/lib/libz.{a,so*}
 endef
 
diff --git a/toolchain/ext2fs/Makefile b/toolchain/ext2fs/Makefile
index eebf7a2c8..dd60a7eb9 100644
--- a/toolchain/ext2fs/Makefile
+++ b/toolchain/ext2fs/Makefile
@@ -11,12 +11,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=genext2fs
 PKG_VERSION:=1.4rc1
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=664431bf6737df1c265500e1f0b5d40c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/host-build.mk
 
 define Build/Configure
@@ -45,7 +46,12 @@ define Build/Compile
 endef
 
 define Build/Install
+	mkdir -p $(STAGING_DIR)/bin
 	install -m0755 $(PKG_BUILD_DIR)/genext2fs $(STAGING_DIR)/bin/
 endef
 
+define Build/Clean
+	rm -f $(STAGING_DIR)/bin/genext2fs
+endef
+
 $(eval $(call HostBuild))
diff --git a/toolchain/ipkg-utils/Makefile b/toolchain/ipkg-utils/Makefile
index 4520af176..06bb2adc0 100644
--- a/toolchain/ipkg-utils/Makefile
+++ b/toolchain/ipkg-utils/Makefile
@@ -6,15 +6,15 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := ipkg-utils
-PKG_VERSION := 1.7
+PKG_NAME:=ipkg-utils
+PKG_VERSION:=1.7
 
-PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM := da3e3ef772973d7370a6ac95f0fef9b8
-PKG_SOURCE_URL := http://handhelds.org/packages/ipkg-utils/
-PKG_CAT := zcat
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://handhelds.org/packages/ipkg-utils/
+PKG_MD5SUM:=da3e3ef772973d7370a6ac95f0fef9b8
+PKG_CAT:=zcat
 
-PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -23,16 +23,15 @@ define Build/Install
 	echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
 	echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf
 	mkdir -p $(STAGING_DIR)/usr/bin
-	install -m0755 $(PKG_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin
-	install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin
-	install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin
-	install -m0755 $(PKG_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin/
+	install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin/
+	install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin/
+	install -m0755 $(PKG_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin/
 endef
 
 define Build/Clean
 	rm -f $(STAGING_DIR)/etc/ipkg.conf
 	rm -f $(STAGING_DIR)/usr/bin/ipkg*
-	rm -rf $(PKG_BUILD_DIR)
 endef
 
 $(eval $(call HostBuild))
diff --git a/toolchain/jffs2/Makefile b/toolchain/jffs2/Makefile
index 93e2589c2..a0a26776f 100644
--- a/toolchain/jffs2/Makefile
+++ b/toolchain/jffs2/Makefile
@@ -10,20 +10,25 @@ PKG_NAME:=mtd
 PKG_VERSION:=20050122
 
 PKG_SOURCE=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338
 PKG_SOURCE_URL=http://ftp.debian.org/debian/pool/main/m/mtd
+PKG_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/mtd-20050122.orig
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 
 include $(INCLUDE_DIR)/host-build.mk
 
 define Build/Compile
-	$(MAKE) LINUXDIR=$(LINUX_HEADERS_DIR) -C $(PKG_BUILD_DIR)/util
+	$(MAKE) -C $(PKG_BUILD_DIR)/util LINUXDIR=$(LINUX_HEADERS_DIR)
 endef
 
 define Build/Install
+	mkdir -p $(STAGING_DIR)/bin
 	$(CP) $(PKG_BUILD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/
 endef
 
+define Build/Clean
+	rm -f $(STAGING_DIR)/bin/mkfs.jffs2
+endef
+
 $(eval $(call HostBuild))
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index da525d5f3..42791f1e1 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -10,12 +10,12 @@ PKG_NAME=kernel-headers
 PKG_VERSION=2.4.32
 
 PKG_SOURCE=linux-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 PKG_SOURCE_URL= \
 		http://www.de.kernel.org/pub/linux/kernel/v2.4 \
 		http://www.fi.kernel.org/pub/linux/kernel/v2.4 \
 		http://www.fr.kernel.org/pub/linux/kernel/v2.4 \
 		http://www.kernel.org/pub/linux/kernel/v2.4
+PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 
 PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/linux-$(PKG_VERSION)
 
diff --git a/toolchain/libnotimpl/Makefile b/toolchain/libnotimpl/Makefile
index bc515ca08..d55bf4e3f 100644
--- a/toolchain/libnotimpl/Makefile
+++ b/toolchain/libnotimpl/Makefile
@@ -6,8 +6,9 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := libnotimpl
-PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/libnotimpl
+PKG_NAME:=libnotimpl
+
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/libnotimpl
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -31,9 +32,7 @@ define Build/Install
 endef
 
 define Build/Clean
-	rm -rf \
-		$(STAGING_DIR)/usr/lib/libnotimpl.a \
-		$(PKG_BUILD_DIR)
+	rm -f $(STAGING_DIR)/usr/lib/libnotimpl.a
 endef
 
 $(eval $(call HostBuild))
diff --git a/toolchain/lzma/Makefile b/toolchain/lzma/Makefile
index ab8fea0e6..47f21d1f0 100644
--- a/toolchain/lzma/Makefile
+++ b/toolchain/lzma/Makefile
@@ -6,14 +6,14 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := lzma
-PKG_VERSION := 432
+PKG_NAME:=lzma
+PKG_VERSION:=432
 
-PKG_SOURCE := $(PKG_NAME)$(PKG_VERSION).tar.bz2
-PKG_MD5SUM := 155c1ebce5bc6710ae7ecc926226d9d7
-PKG_SOURCE_URL := @SF/sevenzip
+PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/sevenzip
+PKG_MD5SUM:=155c1ebce5bc6710ae7ecc926226d9d7
 
-PKG_BUILD_DIR=$(TOOL_BUILD_DIR)/lzma-$(PKG_VERSION)/lzma
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/lzma
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -33,11 +33,12 @@ endef
 define Build/Install
 	mkdir -p $(STAGING_DIR)/host/lib
 	$(CP) $(LIB_DIR)/liblzma.a $(STAGING_DIR)/host/lib/
+	mkdir -p $(STAGING_DIR)/bin
 	$(CP) $(ALONE_DIR)/lzma $(STAGING_DIR)/bin/
 endef
 
 define Build/Clean
-	rm -f $(PKG_BUILD_DIR)/liblzma.a $(PKG_BUILD_DIR)/lzma
+	rm -f $(STAGING_DIR)/host/lib/liblzma.a $(STAGING_DIR)/bin/lzma
 endef
 
 $(eval $(call HostBuild))
diff --git a/toolchain/mkimage/Makefile b/toolchain/mkimage/Makefile
index ec27e2716..71285d2e1 100644
--- a/toolchain/mkimage/Makefile
+++ b/toolchain/mkimage/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/host-build.mk
 
-PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/mkimage
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/mkimage
 
 define Build/Compile
 	$(CC) -O -c src/crc32.c -o $(PKG_BUILD_DIR)/crc32.o
@@ -16,7 +16,8 @@ define Build/Compile
 endef
 
 define Build/Install
-	$(CP) $(PKG_BUILD_DIR)/mkimage $(STAGING_DIR)/bin
+	mkdir -p $(STAGING_DIR)/bin
+	$(CP) $(PKG_BUILD_DIR)/mkimage $(STAGING_DIR)/bin/
 endef
 
 define Build/Clean
diff --git a/toolchain/sed/Makefile b/toolchain/sed/Makefile
index fdeeeea2a..b3169918b 100644
--- a/toolchain/sed/Makefile
+++ b/toolchain/sed/Makefile
@@ -6,14 +6,15 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := sed
-PKG_VERSION := 4.1.2
+PKG_NAME:=sed
+PKG_VERSION:=4.1.2
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/$(PKG_NAME)
 PKG_MD5SUM:=928f0e06422f414091917401f1a834d0
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/sed-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 HOST_SED_TARGET=$(strip $(shell ./sedcheck.sh))
 
diff --git a/toolchain/squashfs/Makefile b/toolchain/squashfs/Makefile
index ac5edd996..8e37a1521 100644
--- a/toolchain/squashfs/Makefile
+++ b/toolchain/squashfs/Makefile
@@ -6,15 +6,15 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := squashfs
-PKG_VERSION := 3.0
+PKG_NAME:=squashfs
+PKG_VERSION:=3.0
 
-PKG_SOURCE := $(PKG_NAME)$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL := @SF/squashfs
-PKG_MD5SUM := 9fd05d0bfbb712f5fb95edafea5bc733
-PKG_CAT := zcat
+PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/squashfs
+PKG_MD5SUM:=9fd05d0bfbb712f5fb95edafea5bc733
+PKG_CAT:=zcat
 
-PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/squashfs$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -23,7 +23,12 @@ define Build/Compile
 endef
 
 define Build/Install
+	mkdir -p $(STAGING_DIR)/bin
 	$(CP) $(PKG_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/
 endef
 
+define Build/Clean
+	rm -f $(STAGING_DIR)/bin/mksquashfs-lzma
+endef
+
 $(eval $(call HostBuild))
diff --git a/toolchain/sstrip/Makefile b/toolchain/sstrip/Makefile
index 49983e912..dc3ff4f6d 100644
--- a/toolchain/sstrip/Makefile
+++ b/toolchain/sstrip/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/host-build.mk
 
-PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/sstrip
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/sstrip
 
 OS:=$(shell uname)
 ifeq ($(OS),Darwin)
-CFLAGS += -I./include
+  CFLAGS += -I./include
 endif
 
 define Build/Compile
@@ -19,7 +19,8 @@ define Build/Compile
 endef
 
 define Build/Install
-	$(CP) $(PKG_BUILD_DIR)/sstrip $(STAGING_DIR)/bin
+	mkdir -p $(STAGING_DIR)/bin
+	$(CP) $(PKG_BUILD_DIR)/sstrip $(STAGING_DIR)/bin/
 endef
 
 define Build/Clean
author	nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2006-09-24 20:49:31 +0000
committer	nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2006-09-24 20:49:31 +0000
commit	8afb23270d23db6a033ba8fb77e1cf1a1d925a7c (patch)
tree	b7ed2e950b1b35de067464525dccaf95f2876cfd
parent	1d072248383ae47bd68032d69bd86cc060796ef4 (diff)