allconfig fixes for lemote yeelong

35 files changed, 576 insertions, 696 deletions

diff --git a/Config.in b/Config.in
index b12086c26..bb8b696f4 100644
--- a/Config.in
+++ b/Config.in
@@ -105,24 +105,38 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
-config ADK_KERNEL_VERSION_2_6_39_4
-	prompt "2.6.39.4"
+
+config ADK_KERNEL_VERSION_3_3
+	prompt "3.3"
 	boolean
 
-config ADK_KERNEL_VERSION_3_0_22
-	prompt "3.0.22"
+config ADK_KERNEL_VERSION_3_2_12
+	prompt "3.2.12"
 	boolean
 
 config ADK_KERNEL_VERSION_3_1_10
 	prompt "3.1.10"
 	boolean
 
-config ADK_KERNEL_VERSION_3_2_10
-	prompt "3.2.10"
+config ADK_KERNEL_VERSION_3_0_25
+	prompt "3.0.25"
+	boolean
+
+config ADK_KERNEL_VERSION_2_6_39_4
+	prompt "2.6.39.4"
 	boolean
 
 endchoice
 
+config ADK_KERNEL_VERSION
+	string
+	default "3.3" if ADK_KERNEL_VERSION_3_3
+	default "3.2.12" if ADK_KERNEL_VERSION_3_2_12
+	default "3.1.10" if ADK_KERNEL_VERSION_3_1_10
+	default "3.0.25" if ADK_KERNEL_VERSION_3_0_25
+	default "2.6.39.4" if ADK_KERNEL_VERSION_2_6_39_4
+	help
+
 choice
 prompt "Kernel Compression"
 config ADK_KERNEL_COMP_XZ
diff --git a/mk/build.mk b/mk/build.mk
index 616ec259b..19cd219da 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -15,13 +15,20 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_LOCALES=n \
 			ADK_MAKE_PARALLEL=y \
 			ADK_MAKE_JOBS=4 \
+			ADK_LEAVE_ETC_ALONE=n \
+			ADK_SIMPLE_NETWORK_CONFIG=n \
 			ADK_USE_CCACHE=n \
 			ADK_TOOLCHAIN_GDB=n \
+			ADK_PACKAGE_LIBAU=n \
+			ADK_PACKAGE_AUFS2_UTIL=n \
+			ADK_PACKAGE_KEXECINIT=n \
 			ADK_PACKAGE_CXXTOOLS_DEV=n \
 			ADK_PACKAGE_XORG_SERVER_DEV=n \
 			ADK_PACKAGE_LIBFFMPEG_WITH_VP8=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
+			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
+			ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \
 			ADK_PACKAGE_OPENJDK=n \
 			ADK_PACKAGE_CLASSPATH=n \
 			ADK_PACKAGE_GPSD=n \
@@ -113,7 +120,7 @@ POSTCONFIG=		-@\
 			touch .rebuild.bkeymaps;\
 			rebuild=1;\
 		fi; \
-		if [ "$$(grep ^ADK_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION .config.old|md5sum)" ];then \
+		if [ "$$(grep ^ADK_KERNEL_VERSION_ .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION_ .config.old|md5sum)" ];then \
 			make kernelclean;\
 		fi; \
 		if [ $$rebuild -eq 1 ];then \
@@ -139,6 +146,9 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 .PHONY: all world clean cleantarget cleandir distclean image_clean
 
 world:
+	echo $(KERNEL_BASE)
+	echo $(KERNEL_MAJ)
+	echo $(KERNEL_MIN)
 	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps \
 		$(TOOLS_DIR) $(TOOLS_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
diff --git a/mk/modules.mk b/mk/modules.mk
index 0b3c65d0a..3193afc67 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1,6 +1,10 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+KERNEL_BASE:=$(word 1,$(subst ., ,$(ADK_KERNEL_VERSION)))
+KERNEL_MAJ:=$(word 2,$(subst ., ,$(ADK_KERNEL_VERSION)))
+KERNEL_MIN:=$(word 3,$(subst ., ,$(ADK_KERNEL_VERSION)))
+
 #
 # Virtualization
 #
@@ -162,14 +166,30 @@ $(eval $(call KMOD_template,IPV6_SIT,ipv6-sit,\
 	$(MODULES_DIR)/kernel/net/ipv6/sit \
 ,25))
 
+ifeq ($(KERNEL_BASE),3)
+SLHC:=drivers/net/slip/slhc
+PPP:=drivers/net/ppp/ppp_generic
+PPP_ASYNC:=drivers/net/ppp/ppp_async
+MPPE:=drivers/net/ppp/ppp_mppe
+PPPOE:=drivers/net/ppp/pppox
+PPPOX:=drivers/net/ppp/pppoe
+else
+SLHC:=drivers/net/slhc
+PPP:=drivers/net/ppp_generic
+PPP_ASYNC:=drivers/net/ppp_async
+MPPE:=drivers/net/ppp_mppe
+PPPOE:=drivers/net/pppox
+PPPOX:=drivers/net/pppoe
+endif
+
 $(eval $(call KMOD_template,PPP,ppp,\
-	$(MODULES_DIR)/kernel/drivers/net/slhc \
-	$(MODULES_DIR)/kernel/drivers/net/ppp_generic \
-	$(MODULES_DIR)/kernel/drivers/net/ppp_async \
+	$(MODULES_DIR)/kernel/$(SLHC) \
+	$(MODULES_DIR)/kernel/$(PPP) \
+	$(MODULES_DIR)/kernel/$(PPP_ASYNC) \
 ,50))
 
 $(eval $(call KMOD_template,PPP_MPPE,ppp-mppe,\
-	$(MODULES_DIR)/kernel/drivers/net/ppp_mppe \
+	$(MODULES_DIR)/kernel/$(MPPE) \
 ,55))
 
 $(eval $(call KMOD_template,PPPOATM,pppoatm,\
@@ -177,8 +197,8 @@ $(eval $(call KMOD_template,PPPOATM,pppoatm,\
 ,60))
 
 $(eval $(call KMOD_template,PPPOE,pppoe,\
-	$(MODULES_DIR)/kernel/drivers/net/pppox \
-	$(MODULES_DIR)/kernel/drivers/net/pppoe \
+	$(MODULES_DIR)/kernel/$(PPPOX) \
+	$(MODULES_DIR)/kernel/$(PPPOE) \
 ,60))
 
 $(eval $(call KMOD_template,TUN,tun,\
@@ -891,7 +911,8 @@ $(eval $(call KMOD_template,CRYPTO_DES,crypto-des,\
 ,10))
 
 $(eval $(call KMOD_template,CRYPTO_BLOWFISH,crypto-blowfish,\
-    $(MODULES_DIR)/kernel/crypto/blowfish \
+    $(MODULES_DIR)/kernel/crypto/blowfish_common \
+    $(MODULES_DIR)/kernel/crypto/blowfish_generic \
 ,11))
 
 $(eval $(call KMOD_template,CRYPTO_TWOFISH,crypto-twofish,\
@@ -904,7 +925,7 @@ $(eval $(call KMOD_template,CRYPTO_TWOFISH_586,crypto-twofish-586,\
 ,12))
 
 $(eval $(call KMOD_template,CRYPTO_SERPENT,crypto-serpent,\
-    $(MODULES_DIR)/kernel/crypto/serpent \
+    $(MODULES_DIR)/kernel/crypto/serpent_generic \
 ,11))
 
 $(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\
@@ -1148,14 +1169,14 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
 	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
 ,55))
 
-#V4L_COMPAT:=drivers/media/video/v4l1-compat
-#ifeq ($(ADK_LINUX_64),y)
-#V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32
-#endif
+ifeq ($(ADK_LINUX_64),y)
+V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32
+endif
 
 $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
 	$(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \
 	$(MODULES_DIR)/kernel/drivers/media/video/videodev \
+	$(MODULES_DIR)/kernel/drivers/media/video/videobuf2-core \
 ,65))
 
 $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
@@ -1224,7 +1245,7 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\
 #
 
 USBMODULES:=
-ifeq ($(ADK_KERNEL_VERSION_3_2_10),y)
+ifeq ($(KERNEL_BASE),3)
 USBMODULES+=drivers/usb/usb-common
 endif
 USBMODULES+=drivers/usb/core/usbcore
@@ -1562,8 +1583,9 @@ $(eval $(call KMOD_template,ISDN_CAPI,isdn-capi, \
 	$(MODULES_DIR)/kernel/drivers/isdn/capi/capi \
 ,60))
 
+
 $(eval $(call KMOD_template,SLHC,slhc, \
-	$(MODULES_DIR)/kernel/drivers/net/slhc \
+	$(MODULES_DIR)/kernel/$(SLHC) \
 ,65))
 
 $(eval $(call KMOD_template,HISAX,hisax, \
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 67884cf3e..0f305065e 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.18.4
+PKG_VERSION:=		1.19.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b03c5b46ced732679e525a920a1a62f5
+PKG_MD5SUM:=		9c0cae5a0379228e7b55e5b29528df8e
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
 PKG_URL:=		http://www.busybox.net/
diff --git a/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
index f07b54c3d..e7e376c0d 100644
--- a/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
+++ b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
@@ -11,15 +11,15 @@ config BUSYBOX_CHATTR
 	help
 	  chattr changes the file attributes on a second extended file system.
 
-config BUSYBOX_E2FSCK
-	bool "e2fsck"
-	default n
-	help
-	  e2fsck is used to check Linux second extended file systems (ext2fs).
-	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
-	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
-	  provided.
-
+#config BUSYBOX_E2FSCK
+#	bool "e2fsck"
+#	default n
+#	help
+##	  e2fsck is used to check Linux second extended file systems (ext2fs).
+#	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
+#	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+#	  provided.
+#
 config BUSYBOX_FSCK
 	bool "fsck"
 	default n
@@ -34,34 +34,34 @@ config BUSYBOX_LSATTR
 	help
 	  lsattr lists the file attributes on a second extended file system.
 
-config BUSYBOX_MKE2FS
-	bool "mke2fs"
-	default n
-	help
-	  mke2fs is used to create an ext2/ext3 filesystem. The normal compat
-	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+#config BUSYBOX_MKE2FS
+#	bool "mke2fs"
+#	default n
+#	help
+#	  mke2fs is used to create an ext2/ext3 filesystem. The normal compat
+#	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
 
-config BUSYBOX_TUNE2FS
-	bool "tune2fs"
-	default n
-	help
-	  tune2fs allows the system administrator to adjust various tunable
-	  filesystem parameters on Linux ext2/ext3 filesystems.
+#config BUSYBOX_TUNE2FS
+#	bool "tune2fs"
+#	default n
+#	help
+##	  tune2fs allows the system administrator to adjust various tunable
+#	  filesystem parameters on Linux ext2/ext3 filesystems.
 
-config BUSYBOX_E2LABEL
-	bool "e2label"
-	default n
-	depends on BUSYBOX_TUNE2FS
-	help
-	  e2label will display or change the filesystem label on the ext2
-	  filesystem located on device.
+#config BUSYBOX_E2LABEL
+#	bool "e2label"
+#	default n
+#	depends on BUSYBOX_TUNE2FS
+#	help
+#	  e2label will display or change the filesystem label on the ext2
+#	  filesystem located on device.
 
-config BUSYBOX_FINDFS
-	bool "findfs"
-	default n
-	depends on BUSYBOX_TUNE2FS
-	help
-	  findfs will search the disks in the system looking for a filesystem
-	  which has a label matching label or a UUID equal to uuid.
+#config BUSYBOX_FINDFS
+#	bool "findfs"
+#	default n
+#	depends on BUSYBOX_TUNE2FS
+#	help
+#	  findfs will search the disks in the system looking for a filesystem
+#	  which has a label matching label or a UUID equal to uuid.
 
 endmenu
diff --git a/package/busybox/patches/0001-nameif-fix-parsing-proc-net-dev.patch b/package/busybox/patches/0001-nameif-fix-parsing-proc-net-dev.patch
deleted file mode 100644
index 2c5ef6b41..000000000
--- a/package/busybox/patches/0001-nameif-fix-parsing-proc-net-dev.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ea80044062500c7473cf214010576ea2681d8d2e Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil.sutter@viprinet.com>
-Date: Thu, 3 Mar 2011 15:13:57 +0100
-Subject: [PATCH 1/2] nameif: fix parsing /proc/net/dev
-
-The parser field lineno is initially zero and incremented upon each
-call to config_read(). So lineno is effectively a "real" line number,
-not an index. Fix the off-by-one bug here, which led to parsing for an
-interface named "face".
-
-Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
----
- networking/nameif.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/networking/nameif.c b/networking/nameif.c
-index 6cf1c50..8e325e7 100644
---- a/networking/nameif.c
-+++ b/networking/nameif.c
-@@ -174,7 +174,7 @@ int nameif_main(int argc, char **argv)
- #if  ENABLE_FEATURE_NAMEIF_EXTENDED
- 		struct ethtool_drvinfo drvinfo;
- #endif
--		if (parser->lineno < 2)
-+		if (parser->lineno < 3)
- 			continue; /* Skip the first two lines */
- 
- 		/* Find the current interface name and copy it to ifr.ifr_name */
--- 
-1.7.3.4
-
diff --git a/package/busybox/patches/0002-nameif-Added-matching-for-PhyAddresses.patch b/package/busybox/patches/0002-nameif-Added-matching-for-PhyAddresses.patch
deleted file mode 100644
index e388c4c5b..000000000
--- a/package/busybox/patches/0002-nameif-Added-matching-for-PhyAddresses.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From eb65132adca3fe1e7c39fc6032266a8d04150561 Mon Sep 17 00:00:00 2001
-From: Nico Erfurth <ne@erfurth.eu>
-Date: Sun, 27 Feb 2011 17:57:30 +0100
-Subject: [PATCH 2/2] nameif: Added matching for PhyAddresses
-
-Very useful when trying to distinguish platform-devices served by the
-same driver, which is actually quite common in embedded-devices.
-
-Signed-off-by: Nico Erfurth <ne@erfurth.eu>
-Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
----
- networking/nameif.c |   33 +++++++++++++++++++++++++++++++++
- 1 files changed, 33 insertions(+), 0 deletions(-)
-
-diff --git a/networking/nameif.c b/networking/nameif.c
-index 8e325e7..8d64b37 100644
---- a/networking/nameif.c
-+++ b/networking/nameif.c
-@@ -38,6 +38,7 @@ typedef struct ethtable_s {
- #if ENABLE_FEATURE_NAMEIF_EXTENDED
- 	char *bus_info;
- 	char *driver;
-+	int32_t phy_address;
- #endif
- } ethtable_t;
- 
-@@ -59,6 +60,25 @@ struct ethtool_drvinfo {
- 	uint32_t eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
- 	uint32_t regdump_len;  /* Size of data from ETHTOOL_GREGS (bytes) */
- };
-+
-+struct ethtool_cmd {
-+	__u32   cmd;
-+	__u32   supported;      /* Features this interface supports */
-+	__u32   advertising;    /* Features this interface advertises */
-+	__u16   speed;          /* The forced speed, 10Mb, 100Mb, gigabit */
-+	__u8    duplex;         /* Duplex, half or full */
-+	__u8    port;           /* Which connector port */
-+	__u8    phy_address;
-+	__u8    transceiver;    /* Which transceiver to use */
-+	__u8    autoneg;        /* Enable or disable autonegotiation */
-+	__u32   maxtxpkt;       /* Tx pkts before generating tx int */
-+	__u32   maxrxpkt;       /* Rx pkts before generating rx int */
-+	__u16   speed_hi;
-+	__u16   reserved2;
-+	__u32   reserved[3];
-+};
-+
-+#define ETHTOOL_GSET      0x00000001 /* Get settings. */
- #define ETHTOOL_GDRVINFO  0x00000003 /* Get driver info. */
- #endif
- 
-@@ -74,6 +94,7 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector)
- #endif
- 		selector = skip_whitespace(selector);
- #if ENABLE_FEATURE_NAMEIF_EXTENDED
-+		ch->phy_address = -1;
- 		if (*selector == '\0')
- 			break;
- 		/* Search for the end .... */
-@@ -87,6 +108,9 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector)
- 		} else if (strncmp(selector, "driver=", 7) == 0) {
- 			ch->driver = xstrdup(selector + 7);
- 			found_selector++;
-+		} else if (strncmp(selector, "phyaddr=", 8) == 0) {
-+			ch->phy_address = atoi(selector + 8);
-+			found_selector++;
- 		} else {
- #endif
- 			lmac = xmalloc(ETH_ALEN);
-@@ -173,6 +197,7 @@ int nameif_main(int argc, char **argv)
- 		struct ifreq ifr;
- #if  ENABLE_FEATURE_NAMEIF_EXTENDED
- 		struct ethtool_drvinfo drvinfo;
-+		struct ethtool_cmd eth_settings;
- #endif
- 		if (parser->lineno < 3)
- 			continue; /* Skip the first two lines */
-@@ -182,6 +207,12 @@ int nameif_main(int argc, char **argv)
- 		strncpy_IFNAMSIZ(ifr.ifr_name, token[0]);
- 
- #if ENABLE_FEATURE_NAMEIF_EXTENDED
-+		/* Check for phy address */
-+		memset(&eth_settings, 0, sizeof(struct ethtool_cmd));
-+		eth_settings.cmd = ETHTOOL_GSET;
-+		ifr.ifr_data = (caddr_t) &eth_settings;
-+		ioctl(ctl_sk, SIOCETHTOOL, &ifr);
-+
- 		/* Check for driver etc. */
- 		memset(&drvinfo, 0, sizeof(struct ethtool_drvinfo));
- 		drvinfo.cmd = ETHTOOL_GDRVINFO;
-@@ -198,6 +229,8 @@ int nameif_main(int argc, char **argv)
- 				continue;
- 			if (ch->driver && strcmp(ch->driver, drvinfo.driver) != 0)
- 				continue;
-+			if (ch->phy_address != -1 && ch->phy_address != eth_settings.phy_address)
-+				continue;
- #endif
- 			if (ch->mac && memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN) != 0)
- 				continue;
--- 
-1.7.3.4
-
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 9b5f9a739..df391a54f 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,5 +1,6 @@
---- busybox-1.18.1.orig/Makefile
-+++ busybox-1.18.1/Makefile
+diff -Nur busybox-1.19.4.orig/Makefile busybox-1.19.4/Makefile
+--- busybox-1.19.4.orig/Makefile	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/Makefile	2012-03-17 00:58:08.189100677 +0100
 @@ -465,6 +465,7 @@
  libs-y		:= \
  		archival/ \
@@ -8,8 +9,9 @@
  		console-tools/ \
  		coreutils/ \
  		coreutils/libcoreutils/ \
---- busybox-1.18.1.orig/archival/Config.src
-+++ busybox-1.18.1/archival/Config.src
+diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config.src
+--- busybox-1.19.4.orig/archival/Config.src	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/archival/Config.src	2012-03-17 00:58:08.189100677 +0100
 @@ -202,6 +202,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -23,8 +25,9 @@
  config RPM2CPIO
  	bool "rpm2cpio"
  	default y
---- busybox-1.18.1.orig/archival/Kbuild.src
-+++ busybox-1.18.1/archival/Kbuild.src
+diff -Nur busybox-1.19.4.orig/archival/Kbuild.src busybox-1.19.4/archival/Kbuild.src
+--- busybox-1.19.4.orig/archival/Kbuild.src	2012-02-04 20:24:55.000000000 +0100
++++ busybox-1.19.4/archival/Kbuild.src	2012-03-17 00:58:08.189100677 +0100
 @@ -22,6 +22,7 @@
  lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -33,8 +36,9 @@
  
  lib-$(CONFIG_UNXZ)		+= bbunzip.o
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
---- /dev/null
-+++ busybox-1.18.1/archival/ipkg.c
+diff -Nur busybox-1.19.4.orig/archival/ipkg.c busybox-1.19.4/archival/ipkg.c
+--- busybox-1.19.4.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/ipkg.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -64,8 +68,9 @@
 +{
 +	return ipkg_op(argc, argv);
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/Kbuild
+diff -Nur busybox-1.19.4.orig/archival/libipkg/Kbuild busybox-1.19.4/archival/libipkg/Kbuild
+--- busybox-1.19.4.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/Kbuild	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -127,8 +132,9 @@
 +IPKG_ARCH:=$(TARGET_ARCH)
 +endif
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/args.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/args.c busybox-1.19.4/archival/libipkg/args.c
+--- busybox-1.19.4.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/args.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -372,8 +378,9 @@
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/args.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/args.h busybox-1.19.4/archival/libipkg/args.h
+--- busybox-1.19.4.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/args.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -447,8 +454,9 @@
 +void args_usage(const char *complaint);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/conffile.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile.c busybox-1.19.4/archival/libipkg/conffile.c
+--- busybox-1.19.4.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/conffile.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -515,8 +523,9 @@
 +
 +    return ret;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/conffile.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile.h busybox-1.19.4/archival/libipkg/conffile.h
+--- busybox-1.19.4.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/conffile.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -548,8 +557,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/conffile_list.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile_list.c busybox-1.19.4/archival/libipkg/conffile_list.c
+--- busybox-1.19.4.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/conffile_list.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -598,8 +608,9 @@
 +    return nv_pair_list_pop(list);
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/conffile_list.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile_list.h busybox-1.19.4/archival/libipkg/conffile_list.h
+--- busybox-1.19.4.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/conffile_list.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -637,8 +648,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/file_util.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/file_util.c busybox-1.19.4/archival/libipkg/file_util.c
+--- busybox-1.19.4.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/file_util.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -826,8 +838,9 @@
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/file_util.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/file_util.h busybox-1.19.4/archival/libipkg/file_util.h
+--- busybox-1.19.4.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/file_util.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -858,8 +871,9 @@
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/hash_table.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/hash_table.c busybox-1.19.4/archival/libipkg/hash_table.c
+--- busybox-1.19.4.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/hash_table.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -1016,8 +1030,9 @@
 +    }
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/hash_table.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/hash_table.h busybox-1.19.4/archival/libipkg/hash_table.h
+--- busybox-1.19.4.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/hash_table.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1063,8 +1078,9 @@
 +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
 +
 +#endif /* _HASH_TABLE_H_ */
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg.h busybox-1.19.4/archival/libipkg/ipkg.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -1134,8 +1150,9 @@
 +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.c busybox-1.19.4/archival/libipkg/ipkg_cmd.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_cmd.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,1366 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2503,8 +2520,9 @@
 +}
 +
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_cmd.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.h busybox-1.19.4/archival/libipkg/ipkg_cmd.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_cmd.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2547,8 +2565,9 @@
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_conf.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_conf.c busybox-1.19.4/archival/libipkg/ipkg_conf.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_conf.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3261,8 +3280,9 @@
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_conf.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_conf.h busybox-1.19.4/archival/libipkg/ipkg_conf.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_conf.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3371,8 +3391,9 @@
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_configure.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_configure.c busybox-1.19.4/archival/libipkg/ipkg_configure.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_configure.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3414,8 +3435,9 @@
 +    return 0;
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_configure.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_configure.h busybox-1.19.4/archival/libipkg/ipkg_configure.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_configure.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3442,8 +3464,9 @@
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_download.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.c busybox-1.19.4/archival/libipkg/ipkg_download.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_download.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3640,8 +3663,9 @@
 +     }
 +     return 0;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_download.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.h busybox-1.19.4/archival/libipkg/ipkg_download.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_download.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3673,8 +3697,9 @@
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, cha