Merge branch 'master' of git+ssh://openadk.org/git/openadk

50 files changed, 2378 insertions, 928 deletions

diff --git a/Config.in b/Config.in
index 2ac1dce6a..37321f861 100644
--- a/Config.in
+++ b/Config.in
@@ -51,7 +51,6 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_PATCH
 	select ADK_PACKAGE_PKG_CONFIG
 	select ADK_PACKAGE_MICROPERL
-	select ADK_PACKAGE_TAR
 	select ADK_PACKAGE_TSORT
 	select BUSYBOX_STAT
 	select BUSYBOX_FEATURE_STAT_FORMAT
diff --git a/TODO b/TODO
index 9c121685d..08336f245 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,7 @@
 - relocatable gcc
 - adkinstall with NTP and hwclock support
-- newtarget simplify and make target like newpackage
 - PKG_CONFLICTS for python/python2, is this possible with Kconfig?
 - mirror only option, no internet access
-- check alsa on foxg20 target
-- fix ARM OABI support
 - fix watchdog for alix1c (mfgpt timers problem)
 - add support for brcm 2.6 (flash support)
 - help text for config/ needs adoption
diff --git a/mk/build.mk b/mk/build.mk
index 0569a4570..49b832f72 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -303,6 +303,8 @@ ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
 endif
 ifeq ($(ADKtype),ibm-x40)
+	@echo ADK_ARCH_CHOICE=y >> $(TOPDIR)/.defconfig
+	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
 	@echo ADK_HARDWARE_IBM_X40=y >> $(TOPDIR)/.defconfig
 endif
 ifeq ($(ADKtype),lemote-yeelong)
@@ -313,6 +315,9 @@ endif
 			|grep -i "$(TARGET)"\$$ \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			 >> $(TOPDIR)/.defconfig; \
+		if [ "$(TARGET)" = "native" ];then \
+			echo "ADK_ARCH_CHOICE=y" >> $(TOPDIR)/.defconfig; \
+		fi; \
 	fi
 	@for symbol in ${DEFCONFIG}; do \
 		echo $$symbol >> $(TOPDIR)/.defconfig; \
diff --git a/mk/image.mk b/mk/image.mk
index be1d9f970..9a26434ae 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -50,16 +50,19 @@ INITRAMFS_PIGGYBACK=	${ADK_HW}-${ADK_TARGET}-${ADK_LIBC}-${FS}.cpio
 endif
 
 ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
-	cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@
+	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
+		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
+		${TOOLS_DIR}/cpio -o -Hustar -P | gzip -n9 >$@
 
 ${BIN_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
-	cd ${TARGET_DIR}; tar --exclude ./boot -cf - --owner=0 --group=0 . \
-		| gzip -n9 >$@
+	cd ${TARGET_DIR}; find . | grep -v ./boot | sed -n '/^\.\//s///p' | \
+		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
+		${TOOLS_DIR}/cpio -o -Hustar -P | gzip -n9 >$@
 
 ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR}
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
 		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
-	    ${TOPDIR}/bin/tools/cpio -o -C512 -Hnewc -P | \
+	    ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P | \
 		${ADK_COMPRESSION_TOOL} >$@ 2>/dev/null
 
 ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
@@ -67,7 +70,7 @@ ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
 		$(LINUX_DIR)/.config
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
 		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
-	    ${TOPDIR}/bin/tools/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null
+	    ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null
 
 ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR}
 	${STAGING_TOOLS}/bin/mksquashfs ${TARGET_DIR} \
diff --git a/mk/modules.mk b/mk/modules.mk
index 496b47503..3e0ecacfc 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -70,7 +70,7 @@ $(eval $(call KMOD_template,MAC80211,mac80211,\
 $(eval $(call KMOD_template,ATH5K,ath5k,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath \
 	$(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \
-,20, kmod-led-class))
+,20, kmod-leds-class))
 
 $(eval $(call KMOD_template,P54_COMMON,p54-common,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \
@@ -95,15 +95,15 @@ $(eval $(call KMOD_template,RT2X00,rt2x00,\
 
 $(eval $(call KMOD_template,RT2400PCI,rt2400pci,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2400pci \
-,20, kmod-led-class kmod-rt2x00))
+,20, kmod-leds-class kmod-rt2x00))
 
 $(eval $(call KMOD_template,RT2500PCI,rt2500pci,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2500pci \
-,20, kmod-led-class kmod-rt2x00))
+,20, kmod-leds-class kmod-rt2x00))
 
 $(eval $(call KMOD_template,RT61PCI,rt61pci,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt61pci \
-,20, kmod-led-class kmod-rt2x00))
+,20, kmod-leds-class kmod-rt2x00))
 
 #
 # Networking
@@ -1095,11 +1095,15 @@ $(eval $(call KMOD_template,SND_VIA82XX,snd-via82xx,\
 	$(MODULES_DIR)/kernel/sound/pci/snd-via82xx \
 ,55))
 
+$(eval $(call KMOD_template,SND_INTEL8X0,snd-intel8x0,\
+	$(MODULES_DIR)/kernel/sound/pci/snd-intel8x0 \
+,55))
+
 $(eval $(call KMOD_template,SND_ENS1370,snd-ens1370,\
 	$(MODULES_DIR)/kernel/sound/pci/snd-ens1370 \
 ,55))
 
-$(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\
+$(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\
 	$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
 ,55))
 
diff --git a/mk/vars.mk b/mk/vars.mk
index 3aff9fc76..88dad66fb 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -31,6 +31,7 @@ STAGING_DIR:=		${STAGING_PARENT}/target
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${ADK_TARGET}_${ADK_LIBC}
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
+TOOLS_DIR:=		$(BASE_DIR)/bin/tools
 SCRIPT_DIR:=		$(BASE_DIR)/scripts
 ifeq ($(ADK_HW),)
 BIN_DIR:=		$(BASE_DIR)/bin/${ADK_TARGET}_${ADK_LIBC}
@@ -45,7 +46,7 @@ else
 TARGET_DIR:=		$(BASE_DIR)/root_${ADK_HW}_${ADK_TARGET}_${ADK_LIBC}
 endif
 TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
-TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
+TARGET_PATH=		${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
 REAL_GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
 GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux
 TOOLCHAIN_SYSROOT:=	$(TOOLCHAIN_BUILD_DIR)/libc_dev
@@ -85,8 +86,8 @@ HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${HOSTCC}' \
 PKG_SUFFIX:=		$(strip $(subst ",, $(ADK_PACKAGE_SUFFIX)))
 
 ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
-PKG_BUILD:=		${BASH} ${SCRIPT_DIR}/ipkg-build -c -o 0 -g 0
-
+PKG_BUILD:=		PATH='${TARGET_PATH}' \
+			${BASH} ${SCRIPT_DIR}/ipkg-build
 PKG_INSTALL:=		IPKG_TMP=$(BUILD_DIR)/tmp \
 			IPKG_INSTROOT=$(TARGET_DIR) \
 			IPKG_CONF_DIR=$(STAGING_DIR)/etc \
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 14a884bcf..e0cadbf9a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		34
+PKG_RELEASE:=		36
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -26,7 +26,7 @@ do-install:
 	# allow this to fail, as there might be no target-specific files to copy
 	-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES)
 ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
-	@-rm $(IDIR_BASE_FILES)/etc/network/interfaces
+	@echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces
 endif
 	$(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	$(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
@@ -43,18 +43,12 @@ endif
 ifneq (${ADK_PACKAGE_ZSH},)
 	echo /bin/zsh >>${IDIR_BASE_FILES}/etc/shells
 endif
-	mkdir -p $(IDIR_BASE_FILES)/dev
-	mkdir -p $(IDIR_BASE_FILES)/boot
-	mkdir -p $(IDIR_BASE_FILES)/root
-	mkdir -p $(IDIR_BASE_FILES)/sys
+	mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt}
 	mkdir -p $(IDIR_BASE_FILES)/etc/crontabs
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-pre-up.d
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-up.d
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-down.d
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-post-down.d
-	mkdir -p $(IDIR_BASE_FILES)/mnt
-	mkdir -p $(IDIR_BASE_FILES)/proc
-	mkdir -p $(IDIR_BASE_FILES)/tmp
 	mkdir -p $(IDIR_BASE_FILES)/usr/lib
 	mkdir -p $(IDIR_BASE_FILES)/usr/bin
 	chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
diff --git a/package/base-files/files/base-files.conffiles b/package/base-files/files/base-files.conffiles
index b2f9597a8..59ed2f02b 100644
--- a/package/base-files/files/base-files.conffiles
+++ b/package/base-files/files/base-files.conffiles
@@ -1,6 +1,9 @@
+/etc/mdev.conf
+/etc/inittab
 /etc/banner
 /etc/group
 /etc/hosts
+/etc/hostname
 /etc/ipkg.conf
 /etc/modules
 /etc/passwd
@@ -10,3 +13,5 @@
 /etc/rc.conf
 /etc/sysctl.conf
 /etc/shadow
+/etc/shells
+/etc/network/interfaces
diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf
index 99c910d0b..69d9c0079 100644
--- a/package/base-files/src/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
@@ -1,11 +1,18 @@
+rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
+device-mapper 0:0 660 @mkdir /dev/mapper
 tun 0:0 660 >net/tun
 null 0:0 777
 zero 0:0 666
+u?random 0:0 644
 console 0:0 0600
-kmem 0:0 000
-mem 0:0 0640
-port 0:0 0640
 ptmx 0:0 666
-tty 0:0 0666
+tty 0:0 666
 ttyS* 0:0 640
+audio root:audio 660 >snd/audio
+dsp root:audio 660 >snd/dsp
+timer root:audio 660 >snd/timer
+controlC0 root:audio 660 >snd/controlC0
+pcmC0D0c root:audio 660 >snd/pcmC0D0c
+pcmC0D0p root:audio 660 >snd/pcmC0D0p
+msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr)
 .* 0:0 644 @/lib/mdev/init
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index b6ddc2363..d4b9e8c6a 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.17.2
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		7360b7138b899ee7fc885791c740c3c3
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 81f831d54..10519636b 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,6 +1,17 @@
-diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config.src
---- busybox-1.17.1.orig/archival/Config.src	2010-07-25 00:12:56.000000000 +0200
-+++ busybox-1.17.1/archival/Config.src	2010-07-28 13:07:49.435987872 +0200
+diff -Nur busybox-1.17.2.orig/Makefile busybox-1.17.2/Makefile
+--- busybox-1.17.2.orig/Makefile	2010-08-23 02:51:08.000000000 +0200
++++ busybox-1.17.2/Makefile	2010-12-01 22:25:23.000000000 +0100
+@@ -464,6 +464,7 @@
+ 
+ libs-y		:= \
+ 		archival/ \
++		archival/libipkg/ \
+ 		archival/libunarchive/ \
+ 		console-tools/ \
+ 		coreutils/ \
+diff -Nur busybox-1.17.2.orig/archival/Config.src busybox-1.17.2/archival/Config.src
+--- busybox-1.17.2.orig/archival/Config.src	2010-08-22 10:21:38.000000000 +0200
++++ busybox-1.17.2/archival/Config.src	2010-12-01 22:25:23.000000000 +0100
 @@ -202,6 +202,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -14,9 +25,20 @@ diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config
  config RPM2CPIO
  	bool "rpm2cpio"
  	default y
-diff -Nur busybox-1.17.1.orig/archival/ipkg.c busybox-1.17.1/archival/ipkg.c
---- busybox-1.17.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/ipkg.c	2010-07-28 13:07:49.439598667 +0200
+diff -Nur busybox-1.17.2.orig/archival/Kbuild.src busybox-1.17.2/archival/Kbuild.src
+--- busybox-1.17.2.orig/archival/Kbuild.src	2010-08-23 02:44:35.000000000 +0200
++++ busybox-1.17.2/archival/Kbuild.src	2010-12-01 22:25:23.000000000 +0100
+@@ -23,6 +23,7 @@
+ lib-$(CONFIG_LZOP_COMPR_HIGH)	+= lzo1x_9x.o
+ lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
+ lib-$(CONFIG_BZIP2)		+= bzip2.o bbunzip.o
++lib-$(CONFIG_IPKG)		+= ipkg.o
+ 
+ lib-$(CONFIG_UNXZ)		+= bbunzip.o
+ lib-$(CONFIG_UNLZMA)		+= bbunzip.o
+diff -Nur busybox-1.17.2.orig/archival/ipkg.c busybox-1.17.2/archival/ipkg.c
+--- busybox-1.17.2.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/ipkg.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -46,20 +68,73 @@ diff -Nur busybox-1.17.1.orig/archival/ipkg.c busybox-1.17.1/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-diff -Nur busybox-1.17.1.orig/archival/Kbuild.src busybox-1.17.1/archival/Kbuild.src
---- busybox-1.17.1.orig/archival/Kbuild.src	2010-07-06 04:25:53.000000000 +0200
-+++ busybox-1.17.1/archival/Kbuild.src	2010-07-28 13:07:49.439598667 +0200
-@@ -23,6 +23,7 @@
- lib-$(CONFIG_LZOP_COMPR_HIGH)	+= lzo1x_9x.o
- lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
- lib-$(CONFIG_BZIP2)		+= bzip2.o bbunzip.o
-+lib-$(CONFIG_IPKG)		+= ipkg.o
- 
- lib-$(CONFIG_UNXZ)		+= bbunzip.o
- lib-$(CONFIG_UNLZMA)		+= bbunzip.o
-diff -Nur busybox-1.17.1.orig/archival/libipkg/args.c busybox-1.17.1/archival/libipkg/args.c
---- busybox-1.17.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/args.c	2010-07-28 13:07:49.443599457 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/Kbuild busybox-1.17.2/archival/libipkg/Kbuild
+--- busybox-1.17.2.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/Kbuild	2010-12-01 22:25:23.000000000 +0100
+@@ -0,0 +1,60 @@
++# Makefile for busybox
++#
++# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
++# Copyright (C) 2006 OpenWrt.org
++#
++# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
++
++LIBIPKG_CORE_OBJS:= \
++	args.o \
++	libipkg.o \
++	user.o \
++
++LIBIPKG_CMD_OBJS:= \
++	ipkg_cmd.o \
++	ipkg_configure.o \
++	ipkg_download.o \
++	ipkg_install.o \
++	ipkg_remove.o \
++	ipkg_upgrade.o \
++
++LIBIPKG_DB_OBJS:= \
++	hash_table.o \
++	ipkg_conf.o \
++	ipkg_utils.o \
++	pkg.o \
++	pkg_depends.o \
++	pkg_extract.o \
++	pkg_hash.o \
++	pkg_parse.o \
++	pkg_vec.o \
++
++LIBIPKG_LIST_OBJS:= \
++	conffile.o \
++	conffile_list.o \
++	nv_pair.o \
++	nv_pair_list.o \
++	pkg_dest.o \
++	pkg_dest_list.o \
++	pkg_src.o \
++	pkg_src_list.o \
++	str_list.o \
++	void_list.o \
++
++LIBIPKG_UTIL_OBJS:= \
++	file_util.o \
++	ipkg_message.o \
++	str_util.o \
++	xsystem.o \
++
++lib-y :=
++lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS)
++
++ifeq ($(strip $(IPKG_ARCH)),)
++IPKG_ARCH:=$(TARGET_ARCH)
++endif
++CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
+diff -Nur busybox-1.17.2.orig/archival/libipkg/args.c busybox-1.17.2/archival/libipkg/args.c
+--- busybox-1.17.2.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/args.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -303,9 +378,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/args.c busybox-1.17.1/archival/li
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/args.h busybox-1.17.1/archival/libipkg/args.h
---- busybox-1.17.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/args.h	2010-07-28 13:07:49.443599457 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/args.h busybox-1.17.2/archival/libipkg/args.h
+--- busybox-1.17.2.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/args.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -379,9 +454,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/args.h busybox-1.17.1/archival/li
 +void args_usage(const char *complaint);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.c busybox-1.17.1/archival/libipkg/conffile.c
---- busybox-1.17.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/conffile.c	2010-07-28 13:07:49.443599457 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.c busybox-1.17.2/archival/libipkg/conffile.c
+--- busybox-1.17.2.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/conffile.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -448,9 +523,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.c busybox-1.17.1/archiva
 +
 +    return ret;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.h busybox-1.17.1/archival/libipkg/conffile.h
---- busybox-1.17.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/conffile.h	2010-07-28 13:07:49.451597683 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.h busybox-1.17.2/archival/libipkg/conffile.h
+--- busybox-1.17.2.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/conffile.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -482,9 +557,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.h busybox-1.17.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.c busybox-1.17.1/archival/libipkg/conffile_list.c
---- busybox-1.17.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/conffile_list.c	2010-07-28 13:07:49.451597683 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.c busybox-1.17.2/archival/libipkg/conffile_list.c
+--- busybox-1.17.2.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/conffile_list.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -533,9 +608,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.c busybox-1.17.1/ar
 +    return nv_pair_list_pop(list);
 +}
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.h busybox-1.17.1/archival/libipkg/conffile_list.h
---- busybox-1.17.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/conffile_list.h	2010-07-28 13:07:49.451597683 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.h busybox-1.17.2/archival/libipkg/conffile_list.h
+--- busybox-1.17.2.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/conffile_list.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -573,9 +648,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.h busybox-1.17.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.c busybox-1.17.1/archival/libipkg/file_util.c
---- busybox-1.17.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/file_util.c	2010-07-28 13:07:49.455597914 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.c busybox-1.17.2/archival/libipkg/file_util.c
+--- busybox-1.17.2.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/file_util.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -763,9 +838,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.c busybox-1.17.1/archiv
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.h busybox-1.17.1/archival/libipkg/file_util.h
---- busybox-1.17.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/file_util.h	2010-07-28 13:07:49.455597914 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.h busybox-1.17.2/archival/libipkg/file_util.h
+--- busybox-1.17.2.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/file_util.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -796,9 +871,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.h busybox-1.17.1/archiv
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.c busybox-1.17.1/archival/libipkg/hash_table.c
---- busybox-1.17.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/hash_table.c	2010-07-28 13:07:49.455597914 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.c busybox-1.17.2/archival/libipkg/hash_table.c
+--- busybox-1.17.2.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/hash_table.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -955,9 +1030,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.c busybox-1.17.1/archi
 +    }
 +}
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.h busybox-1.17.1/archival/libipkg/hash_table.h
---- busybox-1.17.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/hash_table.h	2010-07-28 13:07:49.455597914 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.h busybox-1.17.2/archival/libipkg/hash_table.h
+--- busybox-1.17.2.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/hash_table.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1003,9 +1078,81 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.h busybox-1.17.1/archi
 +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
 +
 +#endif /* _HASH_TABLE_H_ */
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.1/archival/libipkg/ipkg_cmd.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_cmd.c	2010-07-28 13:07:49.487607300 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg.h busybox-1.17.2/archival/libipkg/ipkg.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg.h	2010-12-01 22:25:23.000000000 +0100
+@@ -0,0 +1,68 @@
++/* ipkg.h - the itsy package management system
++
++   Carl D. Worth
++
++   Copyright (C) 2001 University of Southern California
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++*/
++
++#ifndef IPKG_H
++#define IPKG_H
++
++#include "libbb.h"
++
++#include "ipkg_includes.h"
++#include "ipkg_conf.h"
++#include "ipkg_message.h"
++
++#define IPKG_PKG_EXTENSION ".ipk"
++#define DPKG_PKG_EXTENSION ".deb"
++
++#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
++#define IPKG_PKG_VERSION_SEP_CHAR '_'
++
++#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
++#define IPKG_LISTS_DIR_SUFFIX "lists"
++#define IPKG_INFO_DIR_SUFFIX "info"
++#define IPKG_STATUS_FILE_SUFFIX "status"
++
++#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
++
++#define IPKG_LIST_DESCRIPTION_LENGTH 128
++
++#define IPKG_VERSION "1.00"
++
++
++enum ipkg_error {
++    IPKG_SUCCESS = 0,
++    IPKG_PKG_DEPS_UNSATISFIED,
++    IPKG_PKG_IS_ESSENTIAL,
++    IPKG_PKG_HAS_DEPENDENTS,
++    IPKG_PKG_HAS_NO_CANDIDATE
++};
++typedef enum ipkg_error ipkg_error_t;
++
++extern int ipkg_state_changed;
++
++
++struct errlist {
++    char * errmsg;
++    struct errlist * next;
++} ;
++
++extern struct errlist* error_list;
++
++extern ipkg_conf_t *global_conf;
++
++typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
++
++#endif
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archival/libipkg/ipkg_cmd.c
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_cmd.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,1366 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2373,9 +2520,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.1/archival/libipkg/ipkg_cmd.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_cmd.h	2010-07-28 13:07:49.491598591 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.2/archival/libipkg/ipkg_cmd.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_cmd.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2418,9 +2565,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.1/archiva
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.c busybox-1.17.1/archival/libipkg/ipkg_conf.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_conf.c	2010-07-28 13:07:49.495599101 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c busybox-1.17.2/archival/libipkg/ipkg_conf.c
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_conf.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3133,9 +3280,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.c busybox-1.17.1/archiv
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.h busybox-1.17.1/archival/libipkg/ipkg_conf.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_conf.h	2010-07-28 13:07:49.503598444 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h busybox-1.17.2/archival/libipkg/ipkg_conf.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_conf.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3244,9 +3391,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.h busybox-1.17.1/archiv
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.c busybox-1.17.1/archival/libipkg/ipkg_configure.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_configure.c	2010-07-28 13:07:49.503598444 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c busybox-1.17.2/archival/libipkg/ipkg_configure.c
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_configure.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3288,9 +3435,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.c busybox-1.17.1/a
 +    return 0;
 +}
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.h busybox-1.17.1/archival/libipkg/ipkg_configure.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_configure.h	2010-07-28 13:07:49.503598444 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h busybox-1.17.2/archival/libipkg/ipkg_configure.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_configure.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3317,9 +3464,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.h busybox-1.17.1/a
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.c busybox-1.17.1/archival/libipkg/ipkg_download.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_download.c	2010-07-28 13:07:49.503598444 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.c busybox-1.17.2/archival/libipkg/ipkg_download.c
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_download.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3516,9 +3663,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.c busybox-1.17.1/ar
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.h busybox-1.17.1/archival/libipkg/ipkg_download.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_download.h	2010-07-28 13:07:49.503598444 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.h busybox-1.17.2/archival/libipkg/ipkg_download.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_download.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3550,81 +3697,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.h busybox-1.17.1/ar
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg.h busybox-1.17.1/archival/libipkg/ipkg.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg.h	2010-07-28 13:07:49.507597557 +0200
-@@ -0,0 +1,68 @@
-+/* ipkg.h - the itsy package management system
-+
-+   Carl D. Worth
-+
-+   Copyright (C) 2001 University of Southern California
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2, or (at
-+   your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+*/
-+
-+#ifndef IPKG_H
-+#define IPKG_H
-+
-+#include "libbb.h"
-+
-+#include "ipkg_includes.h"
-+#include "ipkg_conf.h"
-+#include "ipkg_message.h"
-+
-+#define IPKG_PKG_EXTENSION ".ipk"
-+#define DPKG_PKG_EXTENSION ".deb"
-+
-+#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-+#define IPKG_PKG_VERSION_SEP_CHAR '_'
-+
-+#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
-+#define IPKG_LISTS_DIR_SUFFIX "lists"
-+#define IPKG_INFO_DIR_SUFFIX "info"
-+#define IPKG_STATUS_FILE_SUFFIX "status"
-+
-+#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
-+
-+#define IPKG_LIST_DESCRIPTION_LENGTH 128
-+
-+#define IPKG_VERSION "1.00"
-+
-+
-+enum ipkg_error {
-+    IPKG_SUCCESS = 0,
-+    IPKG_PKG_DEPS_UNSATISFIED,
-+    IPKG_PKG_IS_ESSENTIAL,
-+    IPKG_PKG_HAS_DEPENDENTS,
-+    IPKG_PKG_HAS_NO_CANDIDATE
-+};
-+typedef enum ipkg_error ipkg_error_t;
-+
-+extern int ipkg_state_changed;
-+
-+
-+struct errlist {
-+    char * errmsg;
-+    struct errlist * next;
-+} ;
-+
-+extern struct errlist* error_list;
-+
-+extern ipkg_conf_t *global_conf;
-+
-+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
-+
-+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_includes.h busybox-1.17.1/archival/libipkg/ipkg_includes.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_includes.h	2010-07-28 13:07:49.507597557 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h busybox-1.17.2/archival/libipkg/ipkg_includes.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_includes.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3708,9 +3783,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_includes.h busybox-1.17.1/ar
 +#include <mntent.h>
 +
 +#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.c busybox-1.17.1/archival/libipkg/ipkg_install.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_install.c	2010-07-28 13:07:49.511600581 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.c busybox-1.17.2/archival/libipkg/ipkg_install.c
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_install.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5694,9 +5769,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.c busybox-1.17.1/arc
 +}
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.h busybox-1.17.1/archival/libipkg/ipkg_install.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_install.h	2010-07-28 13:07:49.511600581 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.h busybox-1.17.2/archival/libipkg/ipkg_install.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_install.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5733,9 +5808,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.h busybox-1.17.1/arc
 +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_message.c busybox-1.17.1/archival/libipkg/ipkg_message.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_message.c	2010-07-28 13:07:49.515599694 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.c busybox-1.17.2/archival/libipkg/ipkg_message.c
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_message.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5772,9 +5847,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_message.c busybox-1.17.1/arc
 +		ipkg_cb_message(conf,level,ts);
 +	}
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_message.h busybox-1.17.1/archival/libipkg/ipkg_message.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_message.h	2010-07-28 13:07:49.515599694 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.h busybox-1.17.2/archival/libipkg/ipkg_message.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_message.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5808,9 +5883,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_message.h busybox-1.17.1/arc
 +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
 +
 +#endif /* _IPKG_MESSAGE_H_ */
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_remove.c busybox-1.17.1/archival/libipkg/ipkg_remove.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_remove.c	2010-07-28 13:07:49.515599694 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c busybox-1.17.2/archival/libipkg/ipkg_remove.c
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_remove.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6197,9 +6272,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_remove.c busybox-1.17.1/arch
 +
 +    return 0;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_remove.h busybox-1.17.1/archival/libipkg/ipkg_remove.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_remove.h	2010-07-28 13:07:49.515599694 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h busybox-1.17.2/archival/libipkg/ipkg_remove.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_remove.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6234,9 +6309,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_remove.h busybox-1.17.1/arch
 +
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.1/archival/libipkg/ipkg_upgrade.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_upgrade.c	2010-07-28 13:07:49.515599694 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.2/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_upgrade.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6317,9 +6392,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.1/arc
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.1/archival/libipkg/ipkg_upgrade.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_upgrade.h	2010-07-28 13:07:49.519597690 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.2/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_upgrade.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6339,9 +6414,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.1/arc
 +#include "ipkg.h"
 +
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.c busybox-1.17.1/archival/libipkg/ipkg_utils.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_utils.c	2010-07-28 13:07:49.519597690 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c busybox-1.17.2/archival/libipkg/ipkg_utils.c
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_utils.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6528,9 +6603,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.c busybox-1.17.1/archi
 +}
 +
 +       
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.h busybox-1.17.1/archival/libipkg/ipkg_utils.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_utils.h	2010-07-28 13:07:49.519597690 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h busybox-1.17.2/archival/libipkg/ipkg_utils.h
+--- busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/ipkg_utils.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6561,73 +6636,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.h busybox-1.17.1/archi
 +int line_is_blank(const char *line);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/Kbuild busybox-1.17.1/archival/libipkg/Kbuild
---- busybox-1.17.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/Kbuild	2010-07-28 13:07:49.519597690 +0200
-@@ -0,0 +1,60 @@
-+# Makefile for busybox
-+#
-+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
-+# Copyright (C) 2006 OpenWrt.org
-+#
-+# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
-+
-+LIBIPKG_CORE_OBJS:= \
-+	args.o \
-+	libipkg.o \
-+	user.o \
-+
-+LIBIPKG_CMD_OBJS:= \
-+	ipkg_cmd.o \
-+	ipkg_configure.o \
-+	ipkg_download.o \
-+	ipkg_install.o \
-+	ipkg_remove.o \
-+	ipkg_upgrade.o \
-+
-+LIBIPKG_DB_OBJS:= \
-+	hash_table.o \
-+	ipkg_conf.o \
-+	ipkg_utils.o \
-+	pkg.o \
-+	pkg_depends.o \
-+	pkg_extract.o \
-+	pkg_hash.o \
-+	pkg_parse.o \
-+	pkg_vec.o \
-+
-+LIBIPKG_LIST_OBJS:= \
-+	conffile.o \
-+	conffile_list.o \
-+	nv_pair.o \
-+	nv_pair_list.o \
-+	pkg_dest.o \
-+	pkg_dest_list.o \
-+	pkg_src.o \
-+	pkg_src_list.o \
-+	str_list.o \
-+	void_list.o \
-+
-+LIBIPKG_UTIL_OBJS:= \
-+	file_util.o \
-+	ipkg_message.o \
-+	str_util.o \
-+	xsystem.o \
-+
-+lib-y :=
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS)
-+
-+ifeq ($(strip $(IPKG_ARCH)),)
-+IPKG_ARCH:=$(TARGET_ARCH)
-+endif
-+CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.c busybox-1.17.1/archival/libipkg/libipkg.c
---- busybox-1.17.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/libipkg.c	2010-07-28 18:54:37.592513964 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.c busybox-1.17.2/archival/libipkg/libipkg.c
+--- busybox-1.17.2.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/libipkg.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7212,9 +7223,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.c busybox-1.17.1/archival
 +
 +	return err;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.h busybox-1.17.1/archival/libipkg/libipkg.h
---- busybox-1.17.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/libipkg.h	2010-07-28 13:07:49.523597362 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.h busybox-1.17.2/archival/libipkg/libipkg.h
+--- busybox-1.17.2.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/libipkg.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7294,9 +7305,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.h busybox-1.17.1/archival
 +extern void free_error_list(struct errlist **errors);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.c busybox-1.17.1/archival/libipkg/nv_pair.c
---- busybox-1.17.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/nv_pair.c	2010-07-28 13:07:49.523597362 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.c busybox-1.17.2/archival/libipkg/nv_pair.c
+--- busybox-1.17.2.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/nv_pair.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7338,9 +7349,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.c busybox-1.17.1/archival
 +}
 +
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.h busybox-1.17.1/archival/libipkg/nv_pair.h
---- busybox-1.17.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/nv_pair.h	2010-07-28 13:07:49.523597362 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.h busybox-1.17.2/archival/libipkg/nv_pair.h
+--- busybox-1.17.2.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/nv_pair.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7374,9 +7385,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.h busybox-1.17.1/archival
 +
 +#endif
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.c busybox-1.17.1/archival/libipkg/nv_pair_list.c
---- busybox-1.17.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/nv_pair_list.c	2010-07-28 13:07:49.523597362 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c busybox-1.17.2/archival/libipkg/nv_pair_list.c
+--- busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/nv_pair_list.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7476,9 +7487,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.c busybox-1.17.1/arc
 +     }    
 +     return NULL;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.h busybox-1.17.1/archival/libipkg/nv_pair_list.h
---- busybox-1.17.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/nv_pair_list.h	2010-07-28 13:07:49.523597362 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h busybox-1.17.2/archival/libipkg/nv_pair_list.h
+--- busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/nv_pair_list.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7540,9 +7551,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.h busybox-1.17.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg.c busybox-1.17.1/archival/libipkg/pkg.c
---- busybox-1.17.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg.c	2010-07-28 13:07:49.543596278 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.c busybox-1.17.2/archival/libipkg/pkg.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9301,9 +9312,242 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg.c busybox-1.17.1/archival/lib
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_depends.c busybox-1.17.1/archival/libipkg/pkg_depends.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_depends.c	2010-07-28 13:07:49.547597626 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.h busybox-1.17.2/archival/libipkg/pkg.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg.h	2010-12-01 22:25:23.000000000 +0100
+@@ -0,0 +1,229 @@
++/* pkg.h - the itsy package management system
++
++   Carl D. Worth
++
++   Copyright (C) 2001 University of Southern California
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++*/
++
++#ifndef PKG_H
++#define PKG_H
++
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++
++#include "pkg_vec.h"
++#include "str_list.h"
++#include "pkg_src.h"
++#include "pkg_dest.h"
++#include "ipkg_conf.h"
++#include "conffile_list.h"
++
++struct ipkg_conf;
++
++/* I think "Size" is currently the shortest field name */
++#define PKG_MINIMUM_FIELD_NAME_LEN 4
++
++enum pkg_state_want
++{
++    SW_UNKNOWN = 1,
++    SW_INSTALL,
++    SW_DEINSTALL,
++    SW_PURGE,
++    SW_LAST_STATE_WANT
++};
++typedef enum pkg_state_want pkg_state_want_t;
++
++enum pkg_state_flag
++{
++    SF_OK        = 0,
++    SF_REINSTREQ = 1,
++    SF_HOLD      = 2,  /* do not upgrade version */
++    SF_REPLACE   = 4,  /* replace this package */
++    SF_NOPRUNE   = 8,  /* do not remove obsolete files */
++    SF_PREFER    = 16, /* prefer this version */
++    SF_OBSOLETE  = 32, /* old package in upgrade pair */
++    SF_MARKED    = 64, /* temporary mark */
++    SF_FILELIST_CHANGED = 128, /* needs filelist written */
++    SF_USER      = 256,
++    SF_LAST_STATE_FLAG
++};
++typedef enum pkg_state_flag pkg_state_flag_t;
++#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER)
++
++enum pkg_state_status
++{
++    SS_NOT_INSTALLED = 1,
++    SS_UNPACKED,
++    SS_HALF_CONFIGURED,
++    SS_INSTALLED,
++    SS_HALF_INSTALLED,
++    SS_CONFIG_FILES,
++    SS_POST_INST_FAILED,
++    SS_REMOVAL_FAILED,
++    SS_LAST_STATE_STATUS
++};
++typedef enum pkg_state_status pkg_state_status_t;
++
++struct abstract_pkg{
++    char * name;
++    int dependencies_checked;
++    pkg_vec_t * pkgs;
++    pkg_state_status_t state_status;
++    pkg_state_flag_t state_flag;
++    struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */
++    abstract_pkg_vec_t * provided_by;
++    abstract_pkg_vec_t * replaced_by;
++};
++
++#include "pkg_depends.h"
++
++/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways:
++
++   The 3 version fields should go into a single version struct. (This
++   is especially important since, currently, pkg->version can easily
++   be mistaken for pkg_verson_str_alloc(pkg) although they are very
++   distinct. This has been the source of multiple bugs.
++
++   The 3 state fields could possibly also go into their own struct.
++
++   All fields which deal with lists of packages, (Depends,
++   Pre-Depends, Provides, Suggests, Recommends, Enhances), should each
++   be handled by a single struct in pkg_t
++
++   All string fields for which there is a small set of possible
++   values, (section, maintainer, architecture, maybe version?), that
++   are reused among different packages -- for all such packages we
++   should move from "char *"s to some atom datatype to share data
++   storage and use less memory. We might even do reference counting,
++   but probably not since most often we only create new pkg_t structs,
++   we don't often free them.  */
++struct pkg
++{
++     char *name;
++     unsigned long epoch;
++     char *version;
++     char *revision;
++     char *familiar_revision;
++     pkg_src_t *src;
++     pkg_dest_t *dest;
++     char *architecture;
++     char *section;
++     char *maintainer;
++     char *description;
++     pkg_state_want_t state_want;
++     pkg_state_flag_t state_flag;
++     pkg_state_status_t state_status;
++     char **depends_str;
++     int depends_count;
++     char **pre_depends_str;
++     int pre_depends_count;
++     char **recommends_str;
++     int recommends_count;
++     char **suggests_str;
++     int suggests_count;
++     compound_depend_t * depends;
++
++     /* Abhaya: new conflicts */
++     char **conflicts_str;
++     compound_depend_t * conflicts;
++     int conflicts_count;
++	
++     char **replaces_str;
++     int replaces_count;
++     abstract_pkg_t ** replaces;
++
++     char **provides_str;
++     int provides_count;
++     abstract_pkg_t ** provides;
++
++     abstract_pkg_t *parent;
++
++     pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */
++
++     char *filename;
++     char *local_filename;
++     char *url;
++     char *tmp_unpack_dir;
++     char *md5sum;
++     char *size;
++     char *installed_size;
++     char *priority;
++     char *source;
++     conffile_list_t conffiles;
++     time_t installed_time;
++     /* As pointer for lazy evaluation */
++     str_list_t *installed_files;
++     /* XXX: CLEANUP: I'd like to perhaps come up with a better
++	mechanism to avoid the problem here, (which is that the
++	installed_files list was being freed from an inner loop while
++	still being used within an outer loop. */
++     int installed_files_ref_cnt;
++     int essential;
++     int arch_priority;
++/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */
++     int provided_by_hand;
++};
++
++pkg_t *pkg_new(void);
++int pkg_init(pkg_t *pkg);
++void pkg_deinit(pkg_t *pkg);
++int pkg_init_from_file(pkg_t *pkg, const char *filename);
++abstract_pkg_t *abstract_pkg_new(void);
++int abstract_pkg_init(abstract_pkg_t *ab_pkg);
++
++/* 
++ * merges fields from newpkg into oldpkg.
++ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero 
++ */
++int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status);
++
++char *pkg_version_str_alloc(pkg_t *pkg);
++
++int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
++int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b);
++int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b);
++
++char * pkg_formatted_info(pkg_t *pkg );
++char * pkg_formatted_field(pkg_t *pkg, const char *field );
++
++void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg);
++
++void pkg_print_info(pkg_t *pkg, FILE *file);
++void pkg_print_status(pkg_t * pkg, FILE * file);
++void pkg_print_field(pkg_t *pkg, FILE *file, const char *field);
++str_list_t *pkg_get_installed_files(pkg_t *pkg);
++int pkg_free_installed_files(pkg_t *pkg);
++int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg);
++conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name);
++int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg,
++		   const char *script, const char *args);
++
++/* enum mappings */
++char *pkg_state_want_to_str(pkg_state_want_t sw);
++pkg_state_want_t pkg_state_want_from_str(char *str);
++char *pkg_state_flag_to_str(pkg_state_flag_t sf);
++pkg_state_flag_t pkg_state_flag_from_str(char *str);
++char *pkg_state_status_to_str(pkg_state_status_t ss);
++pkg_state_status_t pkg_state_status_from_str(char *str);
++
++int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);
++
++int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg);
++int pkg_info_preinstall_check(ipkg_conf_t *conf);
++int pkg_free_installed_files(pkg_t *pkg);
++
++int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg);
++int pkg_write_changed_filelists(ipkg_conf_t *conf);
++
++#endif
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.c busybox-1.17.2/archival/libipkg/pkg_depends.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_depends.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10337,9 +10581,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_depends.c busybox-1.17.1/arch
 +
 +     return 0;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_depends.h busybox-1.17.1/archival/libipkg/pkg_depends.h
---- busybox-1.17.1.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_depends.h	2010-07-28 13:07:49.547597626 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.h busybox-1.17.2/archival/libipkg/pkg_depends.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_depends.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10446,9 +10690,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_depends.h busybox-1.17.1/arch
 +int pkg_dependence_satisfied(depend_t *depend);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest.c busybox-1.17.1/archival/libipkg/pkg_dest.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_dest.c	2010-07-28 13:07:49.551597019 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.c busybox-1.17.2/archival/libipkg/pkg_dest.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_dest.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10542,9 +10786,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest.c busybox-1.17.1/archiva
 +
 +    dest->root_dir = NULL;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest.h busybox-1.17.1/archival/libipkg/pkg_dest.h
---- busybox-1.17.1.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_dest.h	2010-07-28 13:07:49.551597019 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.h busybox-1.17.2/archival/libipkg/pkg_dest.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_dest.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10584,9 +10828,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest.h busybox-1.17.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.1/archival/libipkg/pkg_dest_list.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_dest_list.c	2010-07-28 13:07:49.551597019 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.2/archival/libipkg/pkg_dest_list.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_dest_list.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10673,9 +10917,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.1/ar
 +{
 +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.1/archival/libipkg/pkg_dest_list.h
---- busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_dest_list.h	2010-07-28 13:07:49.551597019 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.2/archival/libipkg/pkg_dest_list.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_dest_list.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10727,9 +10971,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_extract.c busybox-1.17.1/archival/libipkg/pkg_extract.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_extract.c	2010-07-28 13:07:49.555597807 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.c busybox-1.17.2/archival/libipkg/pkg_extract.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_extract.c	2010-12-01 22:27:00.000000000 +0100
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -10834,7 +11078,7 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_extract.c busybox-1.17.1/arch
 +{
 +	archive_handle_t *archive;
 +	char *name;
-+	const char *filename = "./" IPKG_CONTROL_FILE;
++	const char *filename = IPKG_CONTROL_FILE;
 +
 +	extract_ipkg_file_to_dir(pkg, global_conf->tmp_dir, "./" IPKG_CONTROL_ARCHIVE);	
 +	sprintf_alloc(&name, "%s/%s", global_conf->tmp_dir, IPKG_CONTROL_ARCHIVE);
@@ -10986,9 +11230,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_extract.c busybox-1.17.1/arch
 +	
 +	return 0;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_extract.h busybox-1.17.1/archival/libipkg/pkg_extract.h
---- busybox-1.17.1.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_extract.h	2010-07-28 13:07:49.555597807 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.h busybox-1.17.2/archival/libipkg/pkg_extract.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_extract.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11022,242 +11266,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_extract.h busybox-1.17.1/arch
 +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg.h busybox-1.17.1/archival/libipkg/pkg.h
---- busybox-1.17.1.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg.h	2010-07-28 13:07:49.555597807 +0200
-@@ -0,0 +1,229 @@
-+/* pkg.h - the itsy package management system
-+
-+   Carl D. Worth
-+
-+   Copyright (C) 2001 University of Southern California
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2, or (at
-+   your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+*/
-+
-+#ifndef PKG_H
-+#define PKG_H
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+
-+#include "pkg_vec.h"
-+#include "str_list.h"
-+#include "pkg_src.h"
-+#include "pkg_dest.h"
-+#include "ipkg_conf.h"
-+#include "conffile_list.h"
-+
-+struct ipkg_conf;
-+
-+/* I think "Size" is currently the shortest field name */
-+#define PKG_MINIMUM_FIELD_NAME_LEN 4
-+
-+enum pkg_state_want
-+{
-+    SW_UNKNOWN = 1,
-+    SW_INSTALL,
-+    SW_DEINSTALL,
-+    SW_PURGE,
-+    SW_LAST_STATE_WANT
-+};
-+typedef enum pkg_state_want pkg_state_want_t;
-+
-+enum pkg_state_flag
-+{
-+    SF_OK        = 0,
-+    SF_REINSTREQ = 1,
-+    SF_HOLD      = 2,  /* do not upgrade version */
-+    SF_REPLACE   = 4,  /* replace this package */
-+    SF_NOPRUNE   = 8,  /* do not remove obsolete files */
-+    SF_PREFER    = 16, /* prefer this version */
-+    SF_OBSOLETE  = 32, /* old package in upgrade pair */
-+    SF_MARKED    = 64, /* temporary mark */
-+    SF_FILELIST_CHANGED = 128, /* needs filelist written */
-+    SF_USER      = 256,
-+    SF_LAST_STATE_FLAG
-+};
-+typedef enum pkg_state_flag pkg_state_flag_t;
-+#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER)
-+
-+enum pkg_state_status
-+{
-+    SS_NOT_INSTALLED = 1,
-+    SS_UNPACKED,
-+    SS_HALF_CONFIGURED,
-+    SS_INSTALLED,
-+    SS_HALF_INSTALLED,
-+    SS_CONFIG_FILES,
-+    SS_POST_INST_FAILED,
-+    SS_REMOVAL_FAILED,
-+    SS_LAST_STATE_STATUS
-+};
-+typedef enum pkg_state_status pkg_state_status_t;
-+
-+struct abstract_pkg{
-+    char * name;
-+    int dependencies_checked;
-+    pkg_vec_t * pkgs;
-+    pkg_state_status_t state_status;
-+    pkg_state_flag_t state_flag;
-+    struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */
-+    abstract_pkg_vec_t * provided_by;
-+    abstract_pkg_vec_t * replaced_by;
-+};
-+
-+#include "pkg_depends.h"
-+
-+/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways:
-+
-+   The 3 version fields should go into a single version struct. (This
-+   is especially important since, currently, pkg->version can easily
-+   be mistaken for pkg_verson_str_alloc(pkg) although they are very
-+   distinct. This has been the source of multiple bugs.
-+
-+   The 3 state fields could possibly also go into their own struct.
-+
-+   All fields which deal with lists of packages, (Depends,
-+   Pre-Depends, Provides, Suggests, Recommends, Enhances), should each
-+   be handled by a single struct in pkg_t
-+
-+   All string fields for which there is a small set of possible
-+   values, (section, maintainer, architecture, maybe version?), that
-+   are reused among different packages -- for all such packages we
-+   should move from "char *"s to some atom datatype to share data
-+   storage and use less memory. We might even do reference counting,
-+   but probably not since most often we only create new pkg_t structs,
-+   we don't often free them.  */
-+struct pkg
-+{
-+     char *name;
-+     unsigned long epoch;
-+     char *version;
-+     char *revision;
-+     char *familiar_revision;
-+     pkg_src_t *src;
-+     pkg_dest_t *dest;
-+     char *architecture;
-+     char *section;
-+     char *maintainer;
-+     char *description;
-+     pkg_state_want_t state_want;
-+     pkg_state_flag_t state_flag;
-+     pkg_state_status_t state_status;
-+     char **depends_str;
-+     int depends_count;
-+     char **pre_depends_str;
-+     int pre_depends_count;
-+     char **recommends_str;
-+     int recommends_count;
-+     char **suggests_str;
-+     int suggests_count;
-+     compound_depend_t * depends;
-+
-+     /* Abhaya: new conflicts */
-+     char **conflicts_str;
-+     compound_depend_t * conflicts;
-+     int conflicts_count;
-+	
-+     char **replaces_str;
-+     int replaces_count;
-+     abstract_pkg_t ** replaces;
-+
-+     char **provides_str;
-+     int provides_count;
-+     abstract_pkg_t ** provides;
-+
-+     abstract_pkg_t *parent;
-+
-+     pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */
-+
-+     char *filename;
-+     char *local_filename;
-+     char *url;
-+     char *tmp_unpack_dir;
-+     char *md5sum;
-+     char *size;
-+     char *installed_size;
-+     char *priority;
-+     char *source;
-+     conffile_list_t conffiles;
-+     time_t installed_time;
-+     /* As pointer for lazy evaluation */
-+     str_list_t *installed_files;
-+     /* XXX: CLEANUP: I'd like to perhaps come up with a better
-+	mechanism to avoid the problem here, (which is that the
-+	installed_files list was being freed from an inner loop while
-+	still being used within an outer loop. */
-+     int installed_files_ref_cnt;
-+     int essential;
-+     int arch_priority;
-+/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */
-+     int provided_by_hand;
-+};
-+
-+pkg_t *pkg_new(void);
-+int pkg_init(pkg_t *pkg);
-+void pkg_deinit(pkg_t *pkg);
-+int pkg_init_from_file(pkg_t *pkg, const char *filename);
-+abstract_pkg_t *abstract_pkg_new(void);
-+int abstract_pkg_init(abstract_pkg_t *ab_pkg);
-+
-+/* 
-+ * merges fields from newpkg into oldpkg.
-+ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero 
-+ */
-+int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status);
-+
-+char *pkg_version_str_alloc(pkg_t *pkg);
-+
-+int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
-+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b);
-+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b);
-+
-+char * pkg_formatted_info(pkg_t *pkg );
-+char * pkg_formatted_field(pkg_t *pkg, const char *field );
-+
-+void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg);
-+
-+void pkg_print_info(pkg_t *pkg, FILE *file);
-+void pkg_print_status(pkg_t * pkg, FILE * file);
-+void pkg_print_field(pkg_t *pkg, FILE *file, const char *field);
-+str_list_t *pkg_get_installed_files(pkg_t *pkg);
-+int pkg_free_installed_files(pkg_t *pkg);
-+int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg);
-+conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name);
-+int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg,
-+		   const char *script, const char *args);
-+
-+/* enum mappings */
-+char *pkg_state_want_to_str(pkg_state_want_t sw);
-+pkg_state_want_t pkg_state_want_from_str(char *str);
-+char *pkg_state_flag_to_str(pkg_state_flag_t sf);
-+pkg_state_flag_t pkg_state_flag_from_str(char *str);
-+char *pkg_state_status_to_str(pkg_state_status_t ss);
-+pkg_state_status_t pkg_state_status_from_str(char *str);
-+
-+int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);
-+
-+int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg);
-+int pkg_info_preinstall_check(ipkg_conf_t *conf);
-+int pkg_free_installed_files(pkg_t *pkg);
-+
-+int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg);
-+int pkg_write_changed_filelists(ipkg_conf_t *conf);
-+
-+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_hash.c busybox-1.17.1/archival/libipkg/pkg_hash.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_hash.c	2010-07-28 13:07:49.555597807 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.c busybox-1.17.2/archival/libipkg/pkg_hash.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_hash.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11882,9 +11893,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_hash.c busybox-1.17.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_hash.h busybox-1.17.1/archival/libipkg/pkg_hash.h
---- busybox-1.17.1.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_hash.h	2010-07-28 13:07:49.563598547 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.h busybox-1.17.2/archival/libipkg/pkg_hash.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_hash.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11947,9 +11958,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_hash.h busybox-1.17.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_parse.c busybox-1.17.1/archival/libipkg/pkg_parse.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_parse.c	2010-07-28 13:07:49.603597497 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.c busybox-1.17.2/archival/libipkg/pkg_parse.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_parse.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12319,9 +12330,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_parse.c busybox-1.17.1/archiv
 +
 +    return 0;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_parse.h busybox-1.17.1/archival/libipkg/pkg_parse.h
---- busybox-1.17.1.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_parse.h	2010-07-28 13:07:49.607598006 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.h busybox-1.17.2/archival/libipkg/pkg_parse.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_parse.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12354,9 +12365,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_parse.h busybox-1.17.1/archiv
 +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src.c busybox-1.17.1/archival/libipkg/pkg_src.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_src.c	2010-07-28 13:07:49.607598006 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.c busybox-1.17.2/archival/libipkg/pkg_src.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_src.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12401,9 +12412,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src.c busybox-1.17.1/archival
 +}
 +
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src.h busybox-1.17.1/archival/libipkg/pkg_src.h
---- busybox-1.17.1.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_src.h	2010-07-28 13:07:49.611599074 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.h busybox-1.17.2/archival/libipkg/pkg_src.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_src.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12439,9 +12450,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src.h busybox-1.17.1/archival
 +void pkg_src_deinit(pkg_src_t *src);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src_list.c busybox-1.17.1/archival/libipkg/pkg_src_list.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_src_list.c	2010-07-28 13:07:49.611599074 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.c busybox-1.17.2/archival/libipkg/pkg_src_list.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_src_list.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12518,9 +12529,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src_list.c busybox-1.17.1/arc
 +{
 +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src_list.h busybox-1.17.1/archival/libipkg/pkg_src_list.h
---- busybox-1.17.1.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_src_list.h	2010-07-28 13:07:49.660190465 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.h busybox-1.17.2/archival/libipkg/pkg_src_list.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_src_list.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12579,9 +12590,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src_list.h busybox-1.17.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_vec.c busybox-1.17.1/archival/libipkg/pkg_vec.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_vec.c	2010-07-28 13:07:49.660190465 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.c busybox-1.17.2/archival/libipkg/pkg_vec.c
+--- busybox-1.17.2.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_vec.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12814,9 +12825,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_vec.c busybox-1.17.1/archival
 +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
 +}
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_vec.h busybox-1.17.1/archival/libipkg/pkg_vec.h
---- busybox-1.17.1.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_vec.h	2010-07-28 13:07:49.663598721 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.h busybox-1.17.2/archival/libipkg/pkg_vec.h
+--- busybox-1.17.2.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/pkg_vec.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12880,9 +12891,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_vec.h busybox-1.17.1/archival
 +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
 +#endif
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.1/archival/libipkg/sprintf_alloc.h
---- busybox-1.17.1.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/sprintf_alloc.h	2010-07-28 13:07:49.663598721 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.2/archival/libipkg/sprintf_alloc.h
+--- busybox-1.17.2.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/sprintf_alloc.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12909,9 +12920,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.1/ar
 +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/str_list.c busybox-1.17.1/archival/libipkg/str_list.c
---- busybox-1.17.1.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/str_list.c	2010-07-28 13:07:49.667598672 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.c busybox-1.17.2/archival/libipkg/str_list.c
+--- busybox-1.17.2.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/str_list.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -12989,9 +13000,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/str_list.c busybox-1.17.1/archiva
 +					 (void *)target_str,
 +					 (void_list_cmp_t)strcmp);
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/str_list.h busybox-1.17.1/archival/libipkg/str_list.h
---- busybox-1.17.1.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/str_list.h	2010-07-28 13:07:49.667598672 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.h busybox-1.17.2/archival/libipkg/str_list.h
+--- busybox-1.17.2.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/str_list.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13044,9 +13055,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/str_list.h busybox-1.17.1/archiva
 +char *str_list_remove_elt(str_list_t *list, const char *target_str);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/str_util.c busybox-1.17.1/archival/libipkg/str_util.c
---- busybox-1.17.1.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/str_util.c	2010-07-28 13:07:49.671598344 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.c busybox-1.17.2/archival/libipkg/str_util.c
+--- busybox-1.17.2.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/str_util.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13117,9 +13128,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/str_util.c busybox-1.17.1/archiva
 +    return str ? strdup(str) : NULL;
 +}
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/str_util.h busybox-1.17.1/archival/libipkg/str_util.h
---- busybox-1.17.1.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/str_util.h	2010-07-28 13:07:49.671598344 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.h busybox-1.17.2/archival/libipkg/str_util.h
+--- busybox-1.17.2.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/str_util.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13148,9 +13159,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/str_util.h busybox-1.17.1/archiva
 +char *str_dup_safe(const char *str);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/user.c busybox-1.17.1/archival/libipkg/user.c
---- busybox-1.17.1.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/user.c	2010-07-28 13:07:49.671598344 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/user.c busybox-1.17.2/archival/libipkg/user.c
+--- busybox-1.17.2.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/user.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13201,9 +13212,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/user.c busybox-1.17.1/archival/li
 +
 +     return response;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/user.h busybox-1.17.1/archival/libipkg/user.h
---- busybox-1.17.1.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/user.h	2010-07-28 13:07:49.675598296 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/user.h busybox-1.17.2/archival/libipkg/user.h
+--- busybox-1.17.2.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/user.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13228,9 +13239,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/user.h busybox-1.17.1/archival/li
 +
 +char *get_user_response(const char *format, ...);
 +
-diff -Nur busybox-1.17.1.orig/archival/libipkg/void_list.c busybox-1.17.1/archival/libipkg/void_list.c
---- busybox-1.17.1.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/void_list.c	2010-07-28 13:07:49.675598296 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.c busybox-1.17.2/archival/libipkg/void_list.c
+--- busybox-1.17.2.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/void_list.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13426,9 +13437,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/void_list.c busybox-1.17.1/archiv
 +     else
 +	  return NULL;
 +}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/void_list.h busybox-1.17.1/archival/libipkg/void_list.h
---- busybox-1.17.1.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/void_list.h	2010-07-28 13:07:49.675598296 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.h busybox-1.17.2/archival/libipkg/void_list.h
+--- busybox-1.17.2.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/void_list.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13489,9 +13500,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/void_list.h busybox-1.17.1/archiv
 +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
 +
 +#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/xsystem.c busybox-1.17.1/archival/libipkg/xsystem.c
---- busybox-1.17.1.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/xsystem.c	2010-07-28 13:07:49.675598296 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.c busybox-1.17.2/archival/libipkg/xsystem.c
+--- busybox-1.17.2.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/xsystem.c	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13557,9 +13568,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/xsystem.c busybox-1.17.1/archival
 +    return -1;
 +}
 +	 
-diff -Nur busybox-1.17.1.orig/archival/libipkg/xsystem.h busybox-1.17.1/archival/libipkg/xsystem.h
---- busybox-1.17.1.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/xsystem.h	2010-07-28 13:07:49.675598296 +0200
+diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.h busybox-1.17.2/archival/libipkg/xsystem.h
+--- busybox-1.17.2.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.2/archival/libipkg/xsystem.h	2010-12-01 22:25:23.000000000 +0100
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13595,9 +13606,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/xsystem.h busybox-1.17.1/archival
 +
 +#endif
 +	 
-diff -Nur busybox-1.17.1.orig/archival/libunarchive/Kbuild.src busybox-1.17.1/archival/libunarchive/Kbuild.src
---- busybox-1.17.1.orig/archival/libunarchive/Kbuild.src	2010-07-06 04:25:53.000000000 +0200
-+++ busybox-1.17.1/archival/libunarchive/Kbuild.src	2010-07-28 13:07:49.675598296 +0200
+diff -Nur busybox-1.17.2.orig/archival/libunarchive/Kbuild.src busybox-1.17.2/archival/libunarchive/Kbuild.src
+--- busybox-1.17.2.orig/archival/libunarchive/Kbuild.src	2010-08-23 02:44:35.000000000 +0200
++++ busybox-1.17.2/archival/libunarchive/Kbuild.src	2010-12-01 22:25:23.000000000 +0100
 @@ -43,6 +43,7 @@
  lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
  lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
@@ -13606,9 +13617,9 @@ diff -Nur busybox-1.17.1.orig/archival/libunarchive/Kbuild.src busybox-1.17.1/ar
  lib-$(CONFIG_RPM2CPIO)                  += decompress_unzip.o get_header_cpio.o
  lib-$(CONFIG_RPM)                       += open_transformer.o decompress_unzip.o get_header_cpio.o
  lib-$(CONFIG_TAR)                       += get_header_tar.o
-diff -Nur busybox-1.17.1.orig/include/applets.src.h busybox-1.17.1/include/applets.src.h
---- busybox-1.17.1.orig/include/applets.src.h	2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/include/applets.src.h	2010-07-28 13:07:49.679607187 +0200
+diff -Nur busybox-1.17.2.orig/include/applets.src.h busybox-1.17.2/include/applets.src.h
+--- busybox-1.17.2.orig/include/applets.src.h	2010-08-23 02:44:35.000000000 +0200
++++ busybox-1.17.2/include/applets.src.h	2010-12-01 22:25:23.000000000 +0100
 @@ -209,6 +209,7 @@
  IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
@@ -13617,9 +13628,9 @@ diff -Nur busybox-1.17.1.orig/include/applets.src.h busybox-1.17.1/include/apple
  IF_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_DROP))
-diff -Nur busybox-1.17.1.orig/include/unarchive.h busybox-1.17.1/include/unarchive.h
---- busybox-1.17.1.orig/include/unarchive.h	2010-07-06 04:25:54.000000000 +0200
-+++ busybox-1.17.1/include/unarchive.h	2010-07-28 13:07:49.679607187 +0200
+diff -Nur busybox-1.17.2.orig/include/unarchive.h busybox-1.17.2/include/unarchive.h
+--- busybox-1.17.2.orig/include/unarchive.h	2010-08-22 10:21:38.000000000 +0200
++++ busybox-1.17.2/include/unarchive.h	2010-12-01 22:25:23.000000000 +0100
 @@ -76,7 +76,7 @@
  	off_t offset;
  
@@ -13638,9 +13649,9 @@ diff -Nur busybox-1.17.1.orig/include/unarchive.h busybox-1.17.1/include/unarchi
  	/* Temporary storage */
  	char *dpkg__buffer;
  	/* How to process any sub archive, e.g. get_header_tar_gz */
-diff -Nur busybox-1.17.1.orig/include/usage.src.h busybox-1.17.1/include/usage.src.h
---- busybox-1.17.1.orig/include/usage.src.h	2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/include/usage.src.h	2010-07-28 13:07:49.683599037 +0200
+diff -Nur busybox-1.17.2.orig/include/usage.src.h busybox-1.17.2/include/usage.src.h
+--- busybox-1.17.2.orig/include/usage.src.h	2010-08-23 02:44:35.000000000 +0200
++++ busybox-1.17.2/include/usage.src.h	2010-12-01 22:25:23.000000000 +0100
 @@ -1556,6 +1556,82 @@
         "$ ls -la /tmp/busybox*\n" \
         "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
@@ -13724,14 +13735,3 @@ diff -Nur busybox-1.17.1.orig/include/usage.src.h busybox-1.17.1/include/usage.s
  #define halt_trivial_usage \
         "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
  #define halt_full_usage "\n\n" \
-diff -Nur busybox-1.17.1.orig/Makefile busybox-1.17.1/Makefile
---- busybox-1.17.1.orig/Makefile	2010-07-25 00:13:44.000000000 +0200
-+++ busybox-1.17.1/Makefile	2010-07-28 13:07:49.683599037 +0200
-@@ -459,6 +459,7 @@
- 
- libs-y		:= \
- 		archival/ \
-+		archival/libipkg/ \
- 		archival/libunarchive/ \
- 		console-tools/ \
- 		coreutils/ \
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index d23aa0a39..85960b1bc 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -24,6 +24,8 @@ ifeq (${ADK_HOST_OPENBSD},y)
 XAKE_FLAGS+=		AUTOCONF_VERSION=2.62
 endif
 
+CONFIGURE_ARGS+=	--enable-ltdl-install
+
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBLTDL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libltdl.so* ${IDIR_LIBLTDL}/usr/lib/
diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile
index fd651a5b9..d7f46c858 100644
--- a/package/libusb-compat/Makefile
+++ b/package/libusb-compat/Makefile
@@ -13,6 +13,10 @@ PKG_BUILDDEP:=		libusb
 PKG_URL:=		http://libusb.wiki.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libusb/}
 
+PKG_SUBPKGS:=		LIBUSB_COMPAT LIBUSB_COMPAT_DEV
+PKGSD_LIBUSB_COMPAT_DEV:=	header files for libusb library
+PKGSC_LIBUSB_COMPAT_DEV:=	devel
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 ifeq ($(ADK_STATIC),y)
@@ -22,9 +26,18 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBUSB_COMPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUSB_COMPAT_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_COMPAT_DEV},${PKGSC_LIBUSB_COMPAT_DEV},${PKG_OPTS}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_COMPAT_DEV}+=	libusb-compat-dev-install
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib/
 
+libusb-compat-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUSB_COMPAT_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index 795d2ee1a..4358bc720 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -12,6 +12,10 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://libusb.wiki.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libusb/}
 
+PKG_SUBPKGS:=		LIBUSB LIBUSB_DEV
+PKGSD_LIBUSB_DEV:=	header files for libusb library
+PKGSC_LIBUSB_DEV:=	devel
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -21,9 +25,18 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBUSB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUSB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_DEV}+=	libusb-dev-install
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib/
 
+libusb-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBUSB_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUSB_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile
index efe299c71..0f691f7f5 100644
--- a/package/pcsc-lite/Makefile
+++ b/package/pcsc-lite/Makefile
@@ -5,24 +5,33 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pcsc-lite
 PKG_VERSION:=		1.6.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		fc3fd0e83090ecc81e5b32700fa246c2
 PKG_DESCR:=		middleware for smartcards
 PKG_SECTION:=		crypto
-PKG_DEPENDS:=		libusb libusb-compat libpthread ccid
+PKG_DEPENDS:=		libusb libusb-compat libpthread
 PKG_BUILDDEP:=		libusb libusb-compat
 PKG_URL:=		http://pcsclite.alioth.debian.org/
 PKG_SITES:=		https://alioth.debian.org/frs/download.php/3279/
 
+PKG_SUBPKGS:=		PCSC_LITE PCSC_LITE_DEV
+PKGSD_PCSC_LITE_DEV:=	header files for pcsc-lite
+PKGSC_PCSC_LITE_DEV:=	devel
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PCSC_LITE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PCSC_LITE_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_PCSC_LITE_DEV},${PKGSC_PCSC_LITE_DEV}))
 
 CONFIGURE_ARGS+=	--disable-libhal
 
-post-install:
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_PCSC_LITE_DEV}+=	pcsc-lite-dev-install
+
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	$(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc
 	$(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin
 	$(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib
@@ -33,4 +42,8 @@ post-install:
 	$(CP) $(WRKINST)/usr/lib/libpcsclite.so* \
 		$(IDIR_PCSC_LITE)/usr/lib
 
+pcsc-lite-dev-install:
+	${INSTALL_DIR} ${IDIR_PCSC_LITE_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_PCSC_LITE_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pm-utils/Makefile b/package/pm-utils/Makefile
new file mode 100644
index 000000000..1ac1431dd
--- /dev/null
+++ b/package/pm-utils/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		pm-utils
+PKG_VERSION:=		1.4.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1742a556089c36c3a89eb1b957da5a60
+PKG_DESCR:=		Power Management Utilities
+PKG_SECTION:=		utils
+PKG_URL:=		http://pm-utils.freedesktop.org/
+PKG_SITES:=		http://pm-utils.freedesktop.org/releases/
+
+PKG_CFLINE_PM_UTILS:=	select BUSYBOX_FLOCK
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PM_UTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_PM_UTILS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/pm-utils \
+		 $(IDIR_PM_UTILS)/usr/lib
+	$(INSTALL_DIR) $(IDIR_PM_UTILS)/usr/sbin
+	$(CP) $(WRKINST)/usr/sbin/pm-* \
+		$(IDIR_PM_UTILS)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sudo/Makefile b/package/sudo/Makefile
index cdde122fe..4e031c871 100644
--- a/package/sudo/Makefile
+++ b/package/sudo/Makefile
@@ -16,7 +16,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,SUDO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--without-pam
+CONFIGURE_ARGS+=	--without-pam \
+			--with-timedir=/var/run
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_SUDO)/usr/bin
diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index a94593944..47158c409 100644
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -1,12 +1,9 @@
 #!/usr/bin/env bash
-
 # ipkg-build -- construct a .ipk from a directory
+# Waldemar Brodkorb <wbx@openadk.org>
+# use cpio instead of tar for uid/gid handling
 # Carl Worth <cworth@east.isi.edu>
-# based on a script by Steve Redler IV, steve@sr-tech.com 5-21-2001
-# 2003-04-25 rea@sr.unh.edu
-#   Updated to work on Familiar Pre0.7rc1, with busybox tar.
-#   Note it Requires: binutils-ar (since the busybox ar can't create)
-#   For UID debugging it needs a better "find".
+# based on a script by Steve Redler IV <steve@sr-tech.com>
 set -e
 
 version=1.0
@@ -47,19 +44,6 @@ pkg_appears_sane() {
 
 	PKG_ERROR=0
 
-	cvs_dirs=`find . -name 'CVS'`
-	if [ -n "$cvs_dirs" ]; then
-	    if [ "$noclean" = "1" ]; then
-		echo "*** Warning: The following CVS directories where found.
-You probably want to remove them: " >&2
-		ls -ld $cvs_dirs
-		echo >&2
-	    else
-		echo "*** Removing the following files: $cvs_dirs"
-		rm -rf "$cvs_dirs"
-	    fi
-	fi
-
 	tilde_files=`find . -name '*~'`
 	if [ -n "$tilde_files" ]; then
 	    if [ "$noclean" = "1" ]; then
@@ -162,20 +146,10 @@ You probably want to remove them: " >&2
 ###
 # ipkg-build "main"
 ###
-ogargs=""
-outer=ar
 noclean=0
-usage="Usage: $0 [-c] [-C] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
-while getopts "cg:ho:v" opt; do
+usage="Usage: $0 [-C] <pkg_directory> [<destination_directory>]"
+while getopts ":h:v" opt; do
     case $opt in
-	o ) owner=$OPTARG
-	    ogargs="--owner=$owner"
-	    ;;
-	g ) group=$OPTARG
-	    ogargs="$ogargs --group=$group"
-	    ;;
-        c ) outer=tar
-            ;;
         C ) noclean=1
             ;;
 	v ) echo $version
@@ -186,7 +160,6 @@ while getopts "cg:ho:v" opt; do
 	esac
 done
 
-
 shift $(($OPTIND - 1))
 
 # continue on to process additional arguments
@@ -232,22 +205,18 @@ fi
 tmp_dir=$dest_dir/IPKG_BUILD.$$
 mkdir $tmp_dir
 
-echo $CONTROL > $tmp_dir/tarX
-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
-( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . )
-rm $tmp_dir/tarX
+( cd $pkg_dir && find . | grep -v $CONTROL | \
+	sed "s#\(.*\)#:0:0::::::\1#" | \
+	sort | cpio -o -Hustar -P | gzip -n9 > $tmp_dir/data.tar.gz )
 
-echo "2.0" > $tmp_dir/debian-binary
+( cd $pkg_dir/$CONTROL && find . | \
+	sed "s#\(.*\)#:0:0::::::\1#" | \
+	sort | cpio -o -Hustar -P | gzip -n9 > $tmp_dir/control.tar.gz )
 
+echo "2.0" > $tmp_dir/debian-binary
 pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
 rm -f $pkg_file
-if [ "$outer" = "ar" ] ; then
-  ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
-else
-  ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
-fi
-
+( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
 rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
 rmdir $tmp_dir
-
 echo "Packaged contents of $pkg_dir into $pkg_file"
diff --git a/scripts/ipkg-make-index.sh b/scripts/ipkg-make-index.sh
index 927e67b93..5738e9983 100644
--- a/scripts/ipkg-make-index.sh
+++ b/scripts/ipkg-make-index.sh
@@ -3,7 +3,7 @@ set -e
 pkg_dir=$1
 
 if [[ -z $pkg_dir || ! -d $pkg_dir ]]; then
-	echo "Usage: ipkg-make-index <package_directory>"
+	echo "Usage: ipkg-make-index.sh <package_directory>"
 	exit 1
 fi
 
@@ -13,7 +13,7 @@ find "$pkg_dir" -name '*.ipk' | sort | while IFS= read pkg; do
 	file_size=$(ls -l $pkg | awk '{print $5}')
 	md5sum=$(md5sum $pkg)
 	tar -xzOf "$pkg" ./control.tar.gz | \
-	    tar -xzOf - ./control | \
+	    tar -xzOf - control | \
 	    sed -e "s
^Description:
Filename: $dpkg\\
 Size: $file_size\\
 MD5Sum: ${md5sum%% *}\\
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 124355161..28a2e31c6 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -38,6 +38,12 @@ if [[ -n $ADK_NATIVE ]];then
 	if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then
 		NEED_RPM="$NEED_RPM rpm"
 	fi
+	if [[ -n $ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL ]]; then
+		NEED_LIBSSLDEV="$NEED_LIBSSLDEV wpa_supplicant"
+	fi
+	if [[ -n $ADK_PACKAGE_IW ]]; then
+		NEED_LIBNLDEV="$NEED_LIBNLDEV iw"
+	fi
 fi
 
 if [[ -n $ADK_PACKAGE_GPSD ]]; then
@@ -156,6 +162,13 @@ if [[ -n $NEED_JPEGDEV ]];then
 	fi
 fi
 
+if [[ -n $NEED_LIBNLDEV ]];then
+	if ! test -f /usr/include/netlink/netlink.h >/dev/null; then
+		echo >&2 You need libnl headers to build $NEED_LIBNLDEV
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_X11DEV ]];then
 	if ! test -f /usr/include/X11/Xlib.h >/dev/null; then
 		echo >&2 You need X11 headers to build $NEED_X11DEV
@@ -170,14 +183,12 @@ if [[ -n $NEED_XEXTDEV ]];then
 	fi
 fi
 
-#if [[ -n $NEED_SSLDEV ]]; then
-#	if ! test -f /usr/lib/pkgconfig/openssl.pc >/dev/null; then
-#		if ! test -f /usr/include/openssl/ssl.h >/dev/null; then
-#			echo >&2 You need openssl headers to build $NEED_SSLDEV
-#			out=1
-#		fi
-#	fi
-#fi
+if [[ -n $NEED_LIBSSLDEV ]]; then
+	if ! test -f /usr/include/openssl/ssl.h >/dev/null; then
+		echo >&2 You need openssl headers to build $NEED_LIBSSLDEV
+		out=1
+	fi
+fi
 
 if [[ -n $NEED_MKFONTDIR ]]; then
 	if ! which mkfontdir >/dev/null 2>&1; then
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index ed939d9ca..c86239d39 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -102,21 +102,11 @@ fi
 rm test 2>/dev/null
 
 if ! which tar >/dev/null 2>&1; then
-	echo You must install GNU tar to continue.
+	echo You must install tar to continue.
 	echo
 	out=1
 fi
 
-if ! (tar --version | grep GNU) >/dev/null 2>&1;then
-	if ! which gtar >/dev/null 2>&1; then
-		if ! which gnutar >/dev/null 2>&1; then
-			echo You must install GNU tar to continue.
-			echo
-			out=1
-		fi
-	fi
-fi
-
 if ! which gzip >/dev/null 2>&1; then
 	echo You must install gzip to continue.
 	echo
diff --git a/target/Config.in b/target/Config.in
index d92d2b0ef..4a439031b 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -528,7 +528,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 		ADK_LINUX_PPC || \
 		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86_ALIX || \
-		ADK_LINUX_QEMU || \
+		ADK_HARDWARE_QEMU || \
 		ADK_LINUX_NATIVE
 	select ADK_KERNEL_BLK_DEV_INITRD
 	help
@@ -541,7 +541,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_PPC || \
 		ADK_LINUX_SPARC || \
-		ADK_LINUX_QEMU || \
+		ADK_HARDWARE_QEMU || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_NATIVE
@@ -578,7 +578,8 @@ config ADK_TARGET_ROOTFS_NFSROOT
 		ADK_LINUX_MIPS_BRCM || \
 		ADK_LINUX_MIPS_RB532 || \
 		ADK_LINUX_MIPS_RB4XX || \
-		ADK_LINUX_MIPS_AG241
+		ADK_LINUX_MIPS_AG241 || \
+		ADK_LINUX_NATIVE
 	select ADK_KERNEL_SUNRPC
 	select ADK_KERNEL_NFS_FS
 	select ADK_KERNEL_NFS_V3
@@ -621,7 +622,7 @@ config ADK_TARGET_ROOTFS_ARCHIVE
 	depends on \
 		ADK_LINUX_NATIVE || \
 		ADK_LINUX_ARM || \
-		ADK_LINUX_AMREL || \
+		ADK_LINUX_ARMEL || \
 		ADK_LINUX_MIPS || \
 		ADK_LINUX_MIPSEL || \
 		ADK_LINUX_MIPS64 || \
diff --git a/target/Config.in.arm b/target/Config.in.arm
index 813be1792..6e966fd32 100644
--- a/target/Config.in.arm
+++ b/target/Config.in.arm
@@ -4,12 +4,16 @@ prompt "Hardware model"
 
 config ADK_HARDWARE_GENERIC_ARM
 	bool "Generic arm system"
+	select ADK_EABI
+	select ADK_TARGET_NO_FPU
 	help
 	  Generic arm system.
 
 config ADK_HARDWARE_QEMU_ARM
 	bool "Qemu arm"
 	select ADK_qemu
+	select ADK_EABI
+	select ADK_TARGET_NO_FPU
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
@@ -21,9 +25,10 @@ config ADK_HARDWARE_QEMU_ARM
 
 config ADK_HARDWARE_GENERIC_ARM_TOOLCHAIN
 	bool "arm toolchain"
+	select ADK_EABI
+	select ADK_TARGET_NO_FPU
 	select ADK_TOOLCHAIN_ONLY
 	help
 	  arm toolchain.
 
 endchoice
-
diff --git a/target/Config.in.armel b/target/Config.in.armel
index 4cce08a36..53203df46 100644
--- a/target/Config.in.armel
+++ b/target/Config.in.armel
@@ -4,12 +4,16 @@ prompt "Hardware model"
 
 config ADK_HARDWARE_GENERIC_ARMEL
 	bool "Generic armel system"
+	select ADK_TARGET_NO_FPU
+	select ADK_EABI
 	help
 	  Generic armel system.
 
 config ADK_HARDWARE_QEMU_ARMEL
 	bool "Qemu armel"
 	select ADK_qemu
+	select ADK_EABI
+	select ADK_TARGET_NO_FPU
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
@@ -21,9 +25,10 @@ config ADK_HARDWARE_QEMU_ARMEL
 
 config ADK_HARDWARE_GENERIC_ARMEL_TOOLCHAIN
 	bool "armel toolchain"
+	select ADK_EABI
+	select ADK_TARGET_NO_FPU
 	select ADK_TOOLCHAIN_ONLY
 	help
 	  armel toolchain.
 
 endchoice
-
diff --git a/target/Config.in.x86 b/target/Config.in.x86
index db66195a6..e7e98c65a 100644
--- a/target/Config.in.x86
+++ b/target/Config.in.x86
@@ -1,5 +1,5 @@
 choice
-depends on ADK_LINUX_X86
+depends on ADK_LINUX_X86 || ADK_LINUX_NATIVE
 prompt "Hardware model"
 
 config ADK_HARDWARE_GENERIC_X86
diff --git a/target/ag241/files/etc/mdev.conf b/target/ag241/files/etc/mdev.conf
deleted file mode 100644
index 582a7b43f..000000000
--- a/target/ag241/files/etc/mdev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-tun 0:0 660 >net/tun
-device-mapper 0:0 660 @mkdir /dev/mapper
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/alix/files/etc/mdev.conf b/target/alix/files/etc/mdev.conf
deleted file mode 100644
index 69d9c0079..000000000
--- a/target/alix/files/etc/mdev.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-audio root:audio 660 >snd/audio
-dsp root:audio 660 >snd/dsp
-timer root:audio 660 >snd/timer
-controlC0 root:audio 660 >snd/controlC0
-pcmC0D0c root:audio 660 >snd/pcmC0D0c
-pcmC0D0p root:audio 660 >snd/pcmC0D0p
-msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr)
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/arm/Makefile b/target/arm/Makefile
new file mode 100644
index 000000000..d671ee338
--- /dev/null
+++ b/target/arm/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+include $(TOPDIR)/mk/kernel.mk
+include $(TOPDIR)/mk/modules.mk
+include $(TOPDIR)/mk/kernel-build.mk
+include $(TOPDIR)/mk/image.mk
+
+KERNEL:=$(LINUX_DIR)/vmlinux
+
+ifeq ($(FS),archive)
+imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo "Use following command to create a QEMU Image:"
+	@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo "Start qemu with following options:"
+	@echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+endif
+
+ifeq ($(FS),initramfs)
+imageinstall: $(BIN_DIR)/$(INITRAMFS)
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
+endif
+ifeq ($(FS),initramfs-piggyback)
+imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo "Start qemu with following command line:"
+	@echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
+endif
diff --git a/target/arm/kernel.config b/target/arm/kernel.config
new file mode 100644
index 000000000..9b6ac99fc
--- /dev/null
+++ b/target/arm/kernel.config
@@ -0,0 +1,715 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.36
+# Tue Nov 30 05:17:16 2010
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_CGROUPS is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_FREEZER is not set
+
+#
+# System Type
+#
+CONFIG_MMU=y
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+CONFIG_ARCH_VERSATILE=y
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_STMP3XXX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P6442 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_S5PV310 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_PLAT_SPEAR is not set
+
+#
+# Versatile platform type
+#
+CONFIG_ARCH_VERSATILE_PB=y
+# CONFIG_MACH_VERSATILE_AB is not set
+CONFIG_PLAT_VERSATILE=y
+CONFIG_ARM_TIMER_SP804=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_ARM_VIC=y
+CONFIG_ARM_VIC_NR=2
+CONFIG_ICST=y
+CONFIG_COMMON_CLKDEV=y
+
+#
+# Bus support
+#
+CONFIG_ARM_AMBA=y
+# CONFIG_PCI is not set
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=100
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_HIGHMEM is not set
+# CONFIG_SPARSE_IRQ is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_CMDLINE=""
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_AUTO_ZRELADDR is not set
+
+#
+# CPU Power Management
+#
+# CONFIG_CPU_IDLE is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_NET is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_MTD is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ARM_CHARLCD is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_93CX6 is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_AMBAKMI is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_AMBA_PL011 is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+# CONFIG_FSNOTIFY is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_INOTIFY_USER is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+# CONFIG_TMPFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_MISC_FILESYSTEMS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_NLS is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_ARM_UNWIND=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_OC_ETM is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+# CONFIG_CRYPTO is not set
+
+#
+# OCF Configuration
+#
+# CONFIG_OCF_OCF is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_GENERIC_ATOMIC64=y
diff --git a/target/armel/Makefile b/target/armel/Makefile
new file mode 100644
index 000000000..d671ee338
--- /dev/null
+++ b/target/armel/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+include $(TOPDIR)/mk/kernel.mk
+include $(TOPDIR)/mk/modules.mk
+include $(TOPDIR)/mk/kernel-build.mk
+include $(TOPDIR)/mk/image.mk
+
+KERNEL:=$(LINUX_DIR)/vmlinux
+
+ifeq ($(FS),archive)
+imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo "Use following command to create a QEMU Image:"
+	@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo "Start qemu with following options:"
+	@echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
+endif
+
+ifeq ($(FS),initramfs)
+imageinstall: $(BIN_DIR)/$(INITRAMFS)
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
+endif
+ifeq ($(FS),initramfs-piggyback)
+imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo "Start qemu with following command line:"
+	@echo 'qemu-system-arm -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
+endif
diff --git a/target/armel/kernel.config b/target/armel/kernel.config
new file mode 100644
index 000000000..9b6ac99fc
--- /dev/null
+++ b/target/armel/kernel.config
@@ -0,0 +1,715 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.36
+# Tue Nov 30 05:17:16 2010
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TINY_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_CGROUPS is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_FREEZER is not set
+
+#
+# System Type
+#
+CONFIG_MMU=y
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+CONFIG_ARCH_VERSATILE=y
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_STMP3XXX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P6442 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_S5PV310 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_PLAT_SPEAR is not set
+
+#
+# Versatile platform type
+#
+CONFIG_ARCH_VERSATILE_PB=y
+# CONFIG_MACH_VERSATILE_AB is not set
+CONFIG_PLAT_VERSATILE=y
+CONFIG_ARM_TIMER_SP804=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_ARM_VIC=y
+CONFIG_ARM_VIC_NR=2
+CONFIG_ICST=y
+CONFIG_COMMON_CLKDEV=y
+
+#
+# Bus support
+#
+CONFIG_ARM_AMBA=y
+# CONFIG_PCI is not set
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=100
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_HIGHMEM is not set
+# CONFIG_SPARSE_IRQ is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_CMDLINE=""
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_AUTO_ZRELADDR is not set
+
+#
+# CPU Power Management
+#
+# CONFIG_CPU_IDLE is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_NET is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_MTD is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ARM_CHARLCD is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_93CX6 is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_AMBAKMI is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_AMBA_PL011 is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+# CONFIG_FSNOTIFY is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_INOTIFY_USER is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+# CONFIG_TMPFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_MISC_FILESYSTEMS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_NLS is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_ARM_UNWIND=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_OC_ETM is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+# CONFIG_CRYPTO is not set
+
+#
+# OCF Configuration
+#
+# CONFIG_OCF_OCF is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_GENERIC_ATOMIC64=y
diff --git a/target/brcm/files/etc/mdev.conf b/target/brcm/files/etc/mdev.conf
deleted file mode 100644
index a8b87c84c..000000000
--- a/target/brcm/files/etc/mdev.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-tun 0:0 660 >net/tun
-device-mapper 0:0 660 @mkdir /dev/mapper
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/foxboard/files/etc/mdev.conf b/target/foxboard/files/etc/mdev.conf
deleted file mode 100644
index 178ba51e8..000000000
--- a/target/foxboard/files/etc/mdev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-null 0:0 777
-zero 0:0 666
-console 0:0 0600
-u?random 0:0 644
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/foxg20/files/etc/mdev.conf b/target/foxg20/files/etc/mdev.conf
deleted file mode 100644
index f7902c89f..000000000
--- a/target/foxg20/files/etc/mdev.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-null 0:0 777
-zero 0:0 666
-console 0:0 0600
-u?random 0:0 644
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
-audio root:audio 660 >snd/audio
-dsp root:audio 660 >snd/dsp
-timer root:audio 660 >snd/timer
-controlC0 root:audio 660 >snd/controlC0
-pcmC0D0c root:audio 660 >snd/pcmC0D0c
-pcmC0D0p root:audio 660 >snd/pcmC0D0p
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 65fc7fbbb..a68bbadb6 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -15,5 +15,6 @@ source target/linux/config/Config.in.bluetooth
 source target/linux/config/Config.in.leds
 source target/linux/config/Config.in.misc
 source target/linux/config/Config.in.lib
+source target/linux/config/Config.in.pm
 source target/linux/config/Config.in.kvm
 source target/linux/config/Config.in.debug
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 20e778314..4415489c1 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -53,6 +53,7 @@ config ADK_KERNEL_CONNECTOR
 config ADK_KERNEL_ATA_PIIX
 	boolean
 	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
 	select ADK_KERNEL_BLK_DEV_SD
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index bd45e0c35..c6dd6ed26 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -5,10 +5,6 @@ config ADK_KERNEL_MEDIA_SUPPORT
 	boolean
 	default n
 
-config ADK_KERNEL_SND_AC97_CODEC
-	boolean
-	default n
-
 config ADK_KERNEL_SND_TIMER
 	boolean
 	default n
@@ -44,68 +40,79 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI
 	default n
 	help
 
+config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
+	tristate
+	default n
+	help
+	 ALSA AC97 codec support.
+
+menu "Audio devices support"
+
 config ADK_KPACKAGE_KMOD_SND
-	prompt "kmod-sound-alsa................. ALSA sound support"
+	prompt "kmod-snd...................... ALSA sound support"
+	tristate
 	select ADK_KPACKAGE_KMOD_SOUND
 	select ADK_KERNEL_SND_OSSEMUL
 	select ADK_KERNEL_SND_TIMER
 	select ADK_KERNEL_SND_PCM
 	select ADK_KERNEL_SND_HWDEP
-	tristate
 	default n
 	help
 	 Basic ALSA sound support.
 
 config ADK_KPACKAGE_KMOD_SND_OSSEMUL
-	prompt "kmod-sound-alsa-oss-emul....... ALSA OSS Emulation"
-	depends on ADK_KPACKAGE_KMOD_SND
+	prompt "kmod-snd-ossemul.............. ALSA OSS Emulation"
+	tristate
 	select ADK_KERNEL_SND_MIXER_OSS
 	select ADK_KERNEL_SND_PCM_OSS
-	tristate
+	select ADK_KPACKAGE_KMOD_SND
+	default y if ADK_HARDWARE_IBM_X40
 	default n
 	help
 	 ALSA OSS Emulation
 
-config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
-	prompt "kmod-sound-alsa-ac97-codec..... ALSA AC97 codec"
-	depends on ADK_KPACKAGE_KMOD_SND
-	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
-	select ADK_KERNEL_SND_AC97_CODEC
+config ADK_KPACKAGE_KMOD_SND_INTEL8X0
+	prompt "kmod-snd-intel8x0............. Intel AC97 driver"
 	tristate
+	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
+	select ADK_KPACKAGE_KMOD_SND
+	default y if ADK_HARDWARE_IBM_X40
 	default n
 	help
-	 ALSA AC97 driver
+	  Driver for intel chipsets.	
 
 config ADK_KPACKAGE_KMOD_SND_VIA82XX
-	prompt "kmod-sound-alsa-via82xx........ ALSA VIA82XX driver"
-	depends on ADK_KPACKAGE_KMOD_SND
-	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
-	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
+	prompt "kmod-snd-via82xx.............. ALSA VIA82XX driver"
 	tristate
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
+	select ADK_KPACKAGE_KMOD_SND
 	default n
 	help
 	 ALSA VIA82XX driver
 
 config ADK_KPACKAGE_KMOD_SND_ENS1370
-	prompt "kmod-sound-alsa-ens1370........ ALSA Ensoniq 1370 driver"
-	depends on ADK_KPACKAGE_KMOD_SND
-	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
+	prompt "kmod-snd-ens1370.............. ALSA Ensoniq 1370 driver"
 	tristate
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
+	select ADK_KPACKAGE_KMOD_SND
 	default n
 	help
 	 ALSA Ensonique 1370 driver
 
 config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
-	prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver"
-	depends on ADK_KPACKAGE_KMOD_SND
-	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
+	prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver"
 	tristate
+	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
+	select ADK_KPACKAGE_KMOD_SND
 	default y if ADK_HARDWARE_LEMOTE_YEELONG
 	default y if ADK_HARDWARE_ALIX1C
 	default n
 	help
 	 ALSA AMD CS5535 driver
 
+endmenu
+
+menu "Video devices support"
 config ADK_KPACKAGE_KMOD_VIDEO_DEV
 	prompt "kmod-video-dev.................. Video (For Linux) kernel support"
 	tristate
@@ -142,3 +149,4 @@ config ADK_KPACKAGE_KMOD_USB_PWC
 	help
 
 endmenu
+endmenu
diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm
new file mode 100644
index 000000000..45e674efb
--- /dev/null
+++ b/target/linux/config/Config.in.pm
@@ -0,0 +1,52 @@
+config ADK_KERNEL_PM
+	boolean
+
+config ADK_KERNEL_ACPI
+	boolean
+
+config ADK_KERNEL_ACPI_SYSFS_POWER
+	boolean
+
+config ADK_KERNEL_ACPI_AC
+	boolean
+
+config ADK_KERNEL_ACPI_BATTERY
+	boolean
+
+config ADK_KERNEL_ACPI_BUTTON
+	boolean
+
+config ADK_KERNEL_ACPI_FAN
+	boolean
+
+config ADK_KERNEL_ACPI_DOCK
+	boolean
+
+menu "Power Management support"
+
+config ADK_HARDWARE_ACPI
+	prompt "Enable ACPI support"
+	boolean
+	select ADK_KERNEL_PM
+	select ADK_KERNEL_ACPI
+	select ADK_KERNEL_ACPI_SYSFS_POWER
+	select ADK_KERNEL_ACPI_AC
+	select ADK_KERNEL_ACPI_BATTERY
+	select ADK_KERNEL_ACPI_BUTTON
+	select ADK_KERNEL_ACPI_FAN
+	select ADK_KERNEL_ACPI_DOCK
+	default y if ADK_HARDWARE_IBM_X40
+	default n
+	help
+	 Enable ACPI support.
+
+config ADK_KERNEL_SUSPEND
+	prompt "Enable Suspend support"
+	boolean
+	select ADK_KERNEL_PM
+	default y if ADK_HARDWARE_IBM_X40
+	default n
+	help
+	  Enable Suspend-to-RAM and Suspend-to-Disk support.
+
+endmenu
diff --git a/target/mips/files/etc/mdev.conf b/target/mips/files/etc/mdev.conf
deleted file mode 100644
index a8b87c84c..000000000
--- a/target/mips/files/etc/mdev.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-tun 0:0 660 >net/tun
-device-mapper 0:0 660 @mkdir /dev/mapper
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/mips64/files/etc/mdev.conf b/target/mips64/files/etc/mdev.conf
deleted file mode 100644
index a8b87c84c..000000000
--- a/target/mips64/files/etc/mdev.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-tun 0:0 660 >net/tun
-device-mapper 0:0 660 @mkdir /dev/mapper
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/mips64el/files/etc/mdev.conf b/target/mips64el/files/etc/mdev.conf
deleted file mode 100644
index a8b87c84c..000000000
--- a/target/mips64el/files/etc/mdev.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-tun 0:0 660 >net/tun
-device-mapper 0:0 660 @mkdir /dev/mapper
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/mipsel/files/etc/mdev.conf b/target/mipsel/files/etc/mdev.conf
deleted file mode 100644
index a8b87c84c..000000000
--- a/target/mipsel/files/etc/mdev.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-tun 0:0 660 >net/tun
-device-mapper 0:0 660 @mkdir /dev/mapper
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/native/Makefile b/target/native/Makefile
index 0904cb491..d2ddee919 100644
--- a/target/native/Makefile
+++ b/target/native/Makefile
@@ -29,3 +29,9 @@ ifeq ($(FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 endif
+ifeq ($(FS),nfsroot)
+imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
+	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
+endif
diff --git a/target/native/files/etc/mdev.conf b/target/native/files/etc/mdev.conf
deleted file mode 100644
index 363d02262..000000000
--- a/target/native/files/etc/mdev.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-kmem 0:0 000
-mem 0:0 0640
-port 0:0 0640
-ptmx 0:0 666
-tty 0:0 0666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/rb4xx/files/etc/mdev.conf b/target/rb4xx/files/etc/mdev.conf
deleted file mode 100644
index baa2eb140..000000000
--- a/target/rb4xx/files/etc/mdev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/rb532/files/etc/mdev.conf b/target/rb532/files/etc/mdev.conf
deleted file mode 100644
index a8b87c84c..000000000
--- a/target/rb532/files/etc/mdev.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-tun 0:0 660 >net/tun
-device-mapper 0:0 660 @mkdir /dev/mapper
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/wrap/files/etc/mdev.conf b/target/wrap/files/etc/mdev.conf
deleted file mode 100644
index 7d966e5bd..000000000
--- a/target/wrap/files/etc/mdev.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-ptmx 0:0 666
-tty 0:0 666
-ttyS* 0:0 640
-msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr)
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/x86/files/etc/mdev.conf b/target/x86/files/etc/mdev.conf
deleted file mode 100644
index 363d02262..000000000
--- a/target/x86/files/etc/mdev.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-kmem 0:0 000
-mem 0:0 0640
-port 0:0 0640
-ptmx 0:0 666
-tty 0:0 0666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init
diff --git a/target/x86/kernel.config b/target/x86/kernel.config
index 1a6c964da..4b2c4bab0 100644
--- a/target/x86/kernel.config
+++ b/target/x86/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.36
-# Fri Nov 26 00:21:27 2010
+# Tue Nov 30 21:48:16 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -348,11 +348,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_SUSPEND is not set
-# CONFIG_PM_RUNTIME is not set
-# CONFIG_ACPI is not set
+# CONFIG_PM is not set
 # CONFIG_SFI is not set
 
 #
diff --git a/target/x86_64/files/etc/mdev.conf b/target/x86_64/files/etc/mdev.conf
deleted file mode 100644
index 363d02262..000000000
--- a/target/x86_64/files/etc/mdev.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
-null 0:0 777
-zero 0:0 666
-u?random 0:0 644
-console 0:0 0600
-kmem 0:0 000
-mem 0:0 0640
-port 0:0 0640
-ptmx 0:0 666
-tty 0:0 0666
-ttyS* 0:0 640
-.* 0:0 644 @/lib/mdev/init