resolve conflict

Makefile

@@ -191,7 +191,7 @@ NO_ERROR=0
 		echo "GMAKE:=$$(which gmake)" >>prereq.mk ;\
 	fi
 	@echo "GNU_HOST_NAME:=$$(${CC} -dumpmachine)" >>prereq.mk
-	@echo "HOSTARCH:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \
+	@echo "ARCH_FOR_BUILD:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \
 	    -e 's/sparc.*/sparc/' \
 	    -e 's/armeb.*/armeb/g' \
 	    -e 's/arm.*/arm/g' \
@@ -205,8 +205,6 @@ NO_ERROR=0
 	    )" >>prereq.mk
 	@echo 'CC_FOR_BUILD:=${CC}' >>prereq.mk
 	@echo 'CXX_FOR_BUILD:=${CXX}' >>prereq.mk
-	@echo 'HOSTCC:=${CC}' >>prereq.mk
-	@echo 'HOSTCXX:=${CXX}' >>prereq.mk
 	@echo 'LANGUAGE:=C' >>prereq.mk
 	@echo 'LC_ALL:=C' >>prereq.mk
 	@echo 'MAKE:=$${GMAKE}' >>prereq.mk

TODO

@@ -1,4 +1,3 @@
-- Xorg update
 - add and test brcm 2.6 wireless support
 - man pages in ipkg/tgz packages (automatic)
 - automate /etc handling via conffiles

mk/build.mk

@@ -302,21 +302,21 @@ endif
 ifeq ($(ADKtype),ibm-x40)
 	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
 	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \
-		target/$(HOSTARCH)/sys-enabled/.$(ADKtype)
+	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
+		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
 	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
 	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(HOSTARCH)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
+	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
 	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
 endif
 ifeq ($(ADKtype),lemote-yeelong)
 	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
 	@echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \
-		target/$(HOSTARCH)/sys-enabled/.$(ADKtype)
+	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
+		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
 	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
 	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(HOSTARCH)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
+	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
 	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
 endif
 	@echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
@@ -385,20 +385,20 @@ ifneq (,$(filter CYGWIN%,${OStype}))
 endif
 ifeq ($(ADKtype),ibmx-40)
 	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/all.config
-	@sed -e "s#TARGET#NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \
-		target/$(HOSTARCH)/sys-enabled/.$(ADKtype)
+	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
+		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
 	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
 	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(HOSTARCH)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
+	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
 	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
 endif
 ifeq ($(ADKtype),lemote-yeelong)
 	@echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/all.config
-	@sed -e "s#TARGET#NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \
-		target/$(HOSTARCH)/sys-enabled/.$(ADKtype)
+	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
+		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
 	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
 	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(HOSTARCH)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
+	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
 	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
 endif
 	@echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
@@ -551,20 +551,20 @@ bulkallmod:
 	  done <${TOPDIR}/target/arch.lst ;\
 	done
 
-${TOPDIR}/bin/tools/pkgmaker: tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c
+${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c
 	@mkdir -p $(TOPDIR)/bin/tools
-	@$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c
+	@$(CC_FOR_BUILD) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c
 
-${TOPDIR}/bin/tools/pkgrebuild:
-	@$(HOSTCC) -Wall -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c
+${TOPDIR}/bin/tools/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c
+	@$(CC_FOR_BUILD) -Wall -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c
 
 package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker ${TOPDIR}/bin/tools/pkgrebuild
 	@echo "Generating menu structure ..."
 	@$(TOPDIR)/bin/tools/pkgmaker
 	@:>.menu
 
-${TOPDIR}/bin/tools/depmaker:
-	$(HOSTCC) -g -o $(TOPDIR)/bin/tools/depmaker $(TOPDIR)/tools/adk/depmaker.c
+${TOPDIR}/bin/tools/depmaker: $(TOPDIR)/tools/adk/depmaker.c
+	$(CC_FOR_BUILD) -g -o $(TOPDIR)/bin/tools/depmaker $(TOPDIR)/tools/adk/depmaker.c
 
 dep: $(TOPDIR)/bin/tools/depmaker
 	@echo "Generating dependencies ..."

mk/vars.mk

@@ -57,6 +57,12 @@ TARGET_LDFLAGS:=	-Wl,-O2 -Wl,-rpath -Wl,/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
 			-L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib
 
+ifneq ($(ADK_NATIVE),)
+TARGET_CPPFLAGS:=
+TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
+TARGET_LDFLAGS:=
+endif
+
 ifneq ($(ADK_STATIC),)
 TARGET_CFLAGS+=		-static
 TARGET_CXXFLAGS+=	-static
@@ -81,18 +87,20 @@ else
 TARGET_CFLAGS+=		-fomit-frame-pointer $(TARGET_OPTIMIZATION)
 endif
 
-ifneq ($(ADK_NATIVE),)
-TARGET_CPPFLAGS:=
-TARGET_CFLAGS:=		$(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
-TARGET_LDFLAGS:=
-endif
+
+# A nifty macro to make testing gcc features easier (from uClibc project)
+check_gcc=$(shell \
+        if $(CC_FOR_BUILD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
+        then echo "$(1)"; else echo "$(2)"; fi)
+
+CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,)
 
 # host compiler flags
 CPPFLAGS_FOR_BUILD?=
-CFLAGS_FOR_BUILD?=      -O2 -Wall
+CFLAGS_FOR_BUILD=      -O2 -Wall $(CF_FOR_BUILD)
 CXXFLAGS_FOR_BUILD?=    -O2 -Wall
 LDFLAGS_FOR_BUILD?=
-FLAGS_FOR_BUILD:=       ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
+FLAGS_FOR_BUILD=	${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
 
 PATCH=			${BASH} $(SCRIPT_DIR)/patch.sh
 SED:=			sed -i -e

package/MesaLib/Makefile

@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--with-dri-drivers=${DRI_DRIVERS},swrast \
 			--with-demos=xdemos
 
-XAKE_FLAGS+=		HOST_CC=${HOSTCC} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile
+XAKE_FLAGS+=		HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile
 
 post-extract:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		43
+PKG_RELEASE:=		44
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 

package/base-files/src/etc/profile

@@ -1,5 +1,6 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export TERM=linux
+export EDITOR=/bin/vi
 if [[ $(id -u) = 0 ]]; then
 	export PS1='`whoami`@`hostname`:`pwd` # '
 else

package/busybox/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.18.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		f15fe752d8b7012aa5e59f83b88ccb1c
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
@@ -35,30 +35,34 @@ ifeq ($(ADK_NATIVE),y)
 	yes '' | \
 	$(MAKE) V=1 \
 	    IPKG_ARCH="$(CPU_ARCH)" \
-	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
+	    ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 else
 	yes '' | \
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 	    EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(CPU_ARCH)" \
-	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
+	    ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 endif
 
 do-build:
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) busybox
 else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) busybox
 endif
 
 do-install:
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) install $(MAKE_TRACE)
 else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) install $(MAKE_TRACE)
 endif
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
 ifeq ($(ADK_DEBUG),y)

package/busybox/config/util-linux/Config.in

@@ -358,7 +358,7 @@ config BUSYBOX_LOSETUP
 
 config BUSYBOX_LSPCI
 	bool "lspci"
-	default y
+	default n
 	depends on !ADK_PACKAGE_PCIUTILS
 	help
 	  lspci is a utility for displaying information about PCI buses in the
@@ -368,7 +368,7 @@ config BUSYBOX_LSPCI
 
 config BUSYBOX_LSUSB
 	bool "lsusb"
-	default y
+	default n
 	depends on !ADK_PACKAGE_LSUSB
 	help
 	  lsusb is a utility for displaying information about USB buses in the

package/busybox/patches/001-ipkg.patch

@@ -1,6 +1,5 @@
-diff -Nur busybox-1.18.1.orig/Makefile busybox-1.18.1/Makefile
---- busybox-1.18.1.orig/Makefile	2010-12-21 05:31:43.000000000 +0100
-+++ busybox-1.18.1/Makefile	2010-12-25 22:38:55.000000000 +0100
+--- busybox-1.18.1.orig/Makefile
++++ busybox-1.18.1/Makefile
 @@ -465,6 +465,7 @@
  libs-y		:= \
  		archival/ \
@@ -9,9 +8,8 @@ diff -Nur busybox-1.18.1.orig/Makefile busybox-1.18.1/Makefile
  		console-tools/ \
  		coreutils/ \
  		coreutils/libcoreutils/ \
-diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config.src
---- busybox-1.18.1.orig/archival/Config.src	2010-12-20 01:41:26.000000000 +0100
-+++ busybox-1.18.1/archival/Config.src	2010-12-25 22:38:07.000000000 +0100
+--- busybox-1.18.1.orig/archival/Config.src
++++ busybox-1.18.1/archival/Config.src
 @@ -202,6 +202,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -25,9 +23,8 @@ diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config
  config RPM2CPIO
  	bool "rpm2cpio"
  	default y
-diff -Nur busybox-1.18.1.orig/archival/Kbuild.src busybox-1.18.1/archival/Kbuild.src
---- busybox-1.18.1.orig/archival/Kbuild.src	2010-12-20 01:41:26.000000000 +0100
-+++ busybox-1.18.1/archival/Kbuild.src	2010-12-25 22:38:07.000000000 +0100
+--- busybox-1.18.1.orig/archival/Kbuild.src
++++ busybox-1.18.1/archival/Kbuild.src
 @@ -22,6 +22,7 @@
  lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -36,9 +33,8 @@ diff -Nur busybox-1.18.1.orig/archival/Kbuild.src busybox-1.18.1/archival/Kbuild
  
  lib-$(CONFIG_UNXZ)		+= bbunzip.o
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
-diff -Nur busybox-1.18.1.orig/archival/ipkg.c busybox-1.18.1/archival/ipkg.c
---- busybox-1.18.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/ipkg.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/ipkg.c
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -68,9 +64,8 @@ diff -Nur busybox-1.18.1.orig/archival/ipkg.c busybox-1.18.1/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/Kbuild busybox-1.18.1/archival/libipkg/Kbuild
---- busybox-1.18.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/Kbuild	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/Kbuild
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -132,9 +127,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/Kbuild busybox-1.18.1/archival/li
 +IPKG_ARCH:=$(TARGET_ARCH)
 +endif
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.18.1.orig/archival/libipkg/args.c busybox-1.18.1/archival/libipkg/args.c
---- busybox-1.18.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/args.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/args.c
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -378,9 +372,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/args.c busybox-1.18.1/archival/li
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/args.h busybox-1.18.1/archival/libipkg/args.h
---- busybox-1.18.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/args.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/args.h
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -454,9 +447,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/args.h busybox-1.18.1/archival/li
 +void args_usage(const char *complaint);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.c busybox-1.18.1/archival/libipkg/conffile.c
---- busybox-1.18.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/conffile.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/conffile.c
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -523,9 +515,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.c busybox-1.18.1/archiva
 +
 +    return ret;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.h busybox-1.18.1/archival/libipkg/conffile.h
---- busybox-1.18.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/conffile.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/conffile.h
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -557,9 +548,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.h busybox-1.18.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.c busybox-1.18.1/archival/libipkg/conffile_list.c
---- busybox-1.18.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/conffile_list.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/conffile_list.c
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -608,9 +598,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.c busybox-1.18.1/ar
 +    return nv_pair_list_pop(list);
 +}
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.h busybox-1.18.1/archival/libipkg/conffile_list.h
---- busybox-1.18.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/conffile_list.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/conffile_list.h
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -648,9 +637,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.h busybox-1.18.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archival/libipkg/file_util.c
---- busybox-1.18.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/file_util.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/file_util.c
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -797,7 +785,7 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archiv
 +	} context;
 +	uint8_t *hash_value = NULL;
 +	RESERVE_CONFIG_UBUFFER(in_buf, 4096);
-+	void FAST_FUNC (*update)(const void*, size_t, void*);
++	void FAST_FUNC (*update)(void*, const void*, size_t);
 +	void FAST_FUNC (*final)(void*, void*);
 +
 +	src_fd = open_or_warn_stdin(filename);
@@ -815,12 +803,12 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archiv
 +		bb_error_msg_and_die("algorithm not supported");
 +	}
 +
-+	while (0 < (count = safe_read(src_fd, in_buf, 4096))) {
-+		update(in_buf, count, &context);
++	while ((count = safe_read(src_fd, in_buf, 4096)) > 0) {
++		update(&context, in_buf, count);
 +	}
 +
 +	if (count == 0) {
-+		final(in_buf, &context);
++		final(&context, in_buf);
 +		hash_value = hash_bin_to_hex(in_buf, hash_len);
 +	}
 +
@@ -838,9 +826,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archiv
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.h busybox-1.18.1/archival/libipkg/file_util.h
---- busybox-1.18.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/file_util.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/file_util.h
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -871,9 +858,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.h busybox-1.18.1/archiv
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.c busybox-1.18.1/archival/libipkg/hash_table.c
---- busybox-1.18.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/hash_table.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/hash_table.c
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -1030,9 +1016,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.c busybox-1.18.1/archi
 +    }
 +}
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.h busybox-1.18.1/archival/libipkg/hash_table.h
---- busybox-1.18.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/hash_table.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/hash_table.h
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1078,9 +1063,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.h busybox-1.18.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.18.1.orig/archival/libipkg/ipkg.h busybox-1.18.1/archival/libipkg/ipkg.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg.h
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -1150,9 +1134,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg.h busybox-1.18.1/archival/li
 +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.18.1/archival/libipkg/ipkg_cmd.c
---- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c	2010-12-25 22:47:47.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c
 @@ -0,0 +1,1366 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2520,9 +2503,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.18.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.18.1/archival/libipkg/ipkg_cmd.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_cmd.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.h
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2565,9 +2547,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.18.1/archiva
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c busybox-1.18.1/archival/libipkg/ipkg_conf.c
---- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_conf.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_conf.c
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3280,9 +3261,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c busybox-1.18.1/archiv
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h busybox-1.18.1/archival/libipkg/ipkg_conf.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_conf.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_conf.h
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3391,9 +3371,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h busybox-1.18.1/archiv
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c busybox-1.18.1/archival/libipkg/ipkg_configure.c
---- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_configure.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_configure.c
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3435,9 +3414,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c busybox-1.18.1/a
 +    return 0;
 +}
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h busybox-1.18.1/archival/libipkg/ipkg_configure.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_configure.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_configure.h
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3464,9 +3442,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h busybox-1.18.1/a
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.c busybox-1.18.1/archival/libipkg/ipkg_download.c
---- busybox-1.18.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_download.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_download.c
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3663,9 +3640,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.c busybox-1.18.1/ar
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.h busybox-1.18.1/archival/libipkg/ipkg_download.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_download.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_download.h
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3697,9 +3673,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.h busybox-1.18.1/ar
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h busybox-1.18.1/archival/libipkg/ipkg_includes.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_includes.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_includes.h
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3783,9 +3758,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h busybox-1.18.1/ar
 +#include <mntent.h>
 +
 +#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.c busybox-1.18.1/archival/libipkg/ipkg_install.c
---- busybox-1.18.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_install.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_install.c
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5769,9 +5743,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.c busybox-1.18.1/arc
 +}
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.h busybox-1.18.1/archival/libipkg/ipkg_install.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_install.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_install.h
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5808,9 +5781,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.h busybox-1.18.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.18.1.orig/archival/libipkg/ipkg_message.c busybox-1.18.1/archival/libipkg/ipkg_message.c
---- busybox-1.18.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_message.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_message.c
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5847,9 +5819,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.c busybox-1.18.1/arc
 +		ipkg_cb_message(conf,level,ts);
 +	}
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.h busybox-1.18.1/archival/libipkg/ipkg_message.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_message.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_message.h
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5883,9 +5854,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.h busybox-1.18.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.18.1.orig/archival/libipkg/ipkg_remove.c busybox-1.18.1/archival/libipkg/ipkg_remove.c
---- busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_remove.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_remove.c
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6272,9 +6242,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c busybox-1.18.1/arch
 +
 +    return 0;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h busybox-1.18.1/archival/libipkg/ipkg_remove.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_remove.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_remove.h
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6309,9 +6278,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h busybox-1.18.1/arch
 +
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.18.1/archival/libipkg/ipkg_upgrade.c
---- busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.c
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6392,9 +6360,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.18.1/arc
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.18.1/archival/libipkg/ipkg_upgrade.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.h
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6414,9 +6381,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.18.1/arc
 +#include "ipkg.h"
 +
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c busybox-1.18.1/archival/libipkg/ipkg_utils.c
---- busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_utils.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_utils.c
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6603,9 +6569,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c busybox-1.18.1/archi
 +}
 +
 +       
-diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h busybox-1.18.1/archival/libipkg/ipkg_utils.h
---- busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/ipkg_utils.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_utils.h
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6636,9 +6601,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h busybox-1.18.1/archi
 +int line_is_blank(const char *line);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.c busybox-1.18.1/archival/libipkg/libipkg.c
---- busybox-1.18.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/libipkg.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/libipkg.c
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7223,9 +7187,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.c busybox-1.18.1/archival
 +
 +	return err;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.h busybox-1.18.1/archival/libipkg/libipkg.h
---- busybox-1.18.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/libipkg.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/libipkg.h
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7305,9 +7268,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.h busybox-1.18.1/archival
 +extern void free_error_list(struct errlist **errors);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.c busybox-1.18.1/archival/libipkg/nv_pair.c
---- busybox-1.18.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/nv_pair.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/nv_pair.c
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7349,9 +7311,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.c busybox-1.18.1/archival
 +}
 +
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.h busybox-1.18.1/archival/libipkg/nv_pair.h
---- busybox-1.18.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/nv_pair.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/nv_pair.h
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7385,9 +7346,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.h busybox-1.18.1/archival
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c busybox-1.18.1/archival/libipkg/nv_pair_list.c
---- busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/nv_pair_list.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/nv_pair_list.c
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7487,9 +7447,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c busybox-1.18.1/arc
 +     }    
 +     return NULL;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h busybox-1.18.1/archival/libipkg/nv_pair_list.h
---- busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/nv_pair_list.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/nv_pair_list.h
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7551,9 +7510,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h busybox-1.18.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.c busybox-1.18.1/archival/libipkg/pkg.c
---- busybox-1.18.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg.c
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9312,9 +9270,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.c busybox-1.18.1/archival/lib
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.h busybox-1.18.1/archival/libipkg/pkg.h
---- busybox-1.18.1.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg.h
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -9545,9 +9502,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.h busybox-1.18.1/archival/lib
 +int pkg_write_changed_filelists(ipkg_conf_t *conf);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.c busybox-1.18.1/archival/libipkg/pkg_depends.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_depends.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_depends.c
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10581,9 +10537,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.c busybox-1.18.1/arch
 +
 +     return 0;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.h busybox-1.18.1/archival/libipkg/pkg_depends.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_depends.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_depends.h
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10690,9 +10645,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.h busybox-1.18.1/arch
 +int pkg_dependence_satisfied(depend_t *depend);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.c busybox-1.18.1/archival/libipkg/pkg_dest.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_dest.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_dest.c
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10786,9 +10740,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.c busybox-1.18.1/archiva
 +
 +    dest->root_dir = NULL;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.h busybox-1.18.1/archival/libipkg/pkg_dest.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_dest.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_dest.h
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10828,9 +10781,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.h busybox-1.18.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.18.1/archival/libipkg/pkg_dest_list.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_dest_list.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.c
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10917,9 +10869,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.18.1/ar
 +{
 +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.18.1/archival/libipkg/pkg_dest_list.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_dest_list.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.h
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10971,9 +10922,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.18.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.c busybox-1.18.1/archival/libipkg/pkg_extract.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_extract.c	2010-12-25 22:48:39.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_extract.c
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11230,9 +11180,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.c busybox-1.18.1/arch
 +	
 +	return 0;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.h busybox-1.18.1/archival/libipkg/pkg_extract.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_extract.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_extract.h
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11266,9 +11215,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.h busybox-1.18.1/arch
 +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.c busybox-1.18.1/archival/libipkg/pkg_hash.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_hash.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_hash.c
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11893,9 +11841,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.c busybox-1.18.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.h busybox-1.18.1/archival/libipkg/pkg_hash.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_hash.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_hash.h
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11958,9 +11905,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.h busybox-1.18.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.c busybox-1.18.1/archival/libipkg/pkg_parse.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_parse.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_parse.c
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12330,9 +12276,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.c busybox-1.18.1/archiv
 +
 +    return 0;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.h busybox-1.18.1/archival/libipkg/pkg_parse.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_parse.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_parse.h
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12365,9 +12310,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.h busybox-1.18.1/archiv
 +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.c busybox-1.18.1/archival/libipkg/pkg_src.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_src.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_src.c
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12412,9 +12356,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.c busybox-1.18.1/archival
 +}
 +
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.h busybox-1.18.1/archival/libipkg/pkg_src.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_src.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_src.h
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12450,9 +12393,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.h busybox-1.18.1/archival
 +void pkg_src_deinit(pkg_src_t *src);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c busybox-1.18.1/archival/libipkg/pkg_src_list.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_src_list.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_src_list.c
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12529,9 +12471,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c busybox-1.18.1/arc
 +{
 +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h busybox-1.18.1/archival/libipkg/pkg_src_list.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_src_list.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_src_list.h
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12590,9 +12531,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h busybox-1.18.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.c busybox-1.18.1/archival/libipkg/pkg_vec.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_vec.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_vec.c
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12825,9 +12765,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.c busybox-1.18.1/archival
 +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
 +}
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.h busybox-1.18.1/archival/libipkg/pkg_vec.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_vec.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_vec.h
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12891,9 +12830,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.h busybox-1.18.1/archival
 +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.18.1/archival/libipkg/sprintf_alloc.h
---- busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/sprintf_alloc.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/sprintf_alloc.h
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12920,9 +12858,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.18.1/ar
 +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.c busybox-1.18.1/archival/libipkg/str_list.c
---- busybox-1.18.1.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/str_list.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/str_list.c
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -13000,9 +12937,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.c busybox-1.18.1/archiva
 +					 (void *)target_str,
 +					 (void_list_cmp_t)strcmp);
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.h busybox-1.18.1/archival/libipkg/str_list.h
---- busybox-1.18.1.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/str_list.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/str_list.h
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13055,9 +12991,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.h busybox-1.18.1/archiva
 +char *str_list_remove_elt(str_list_t *list, const char *target_str);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.c busybox-1.18.1/archival/libipkg/str_util.c
---- busybox-1.18.1.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/str_util.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/str_util.c
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13128,9 +13063,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.c busybox-1.18.1/archiva
 +    return str ? strdup(str) : NULL;
 +}
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.h busybox-1.18.1/archival/libipkg/str_util.h
---- busybox-1.18.1.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/str_util.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/str_util.h
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13159,9 +13093,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.h busybox-1.18.1/archiva
 +char *str_dup_safe(const char *str);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/user.c busybox-1.18.1/archival/libipkg/user.c
---- busybox-1.18.1.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/user.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/user.c
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13212,9 +13145,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/user.c busybox-1.18.1/archival/li
 +
 +     return response;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/user.h busybox-1.18.1/archival/libipkg/user.h
---- busybox-1.18.1.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/user.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/user.h
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13239,9 +13171,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/user.h busybox-1.18.1/archival/li
 +
 +char *get_user_response(const char *format, ...);
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.c busybox-1.18.1/archival/libipkg/void_list.c
---- busybox-1.18.1.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/void_list.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/void_list.c
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13437,9 +13368,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.c busybox-1.18.1/archiv
 +     else
 +	  return NULL;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.h busybox-1.18.1/archival/libipkg/void_list.h
---- busybox-1.18.1.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/void_list.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/void_list.h
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13500,9 +13430,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.h busybox-1.18.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.18.1.orig/archival/libipkg/xsystem.c busybox-1.18.1/archival/libipkg/xsystem.c
---- busybox-1.18.1.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/xsystem.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/xsystem.c
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13568,9 +13497,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.c busybox-1.18.1/archival
 +    return -1;
 +}
 +	 
-diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.h busybox-1.18.1/archival/libipkg/xsystem.h
---- busybox-1.18.1.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/xsystem.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/xsystem.h
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13606,9 +13534,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.h busybox-1.18.1/archival
 +
 +#endif
 +	 
-diff -Nur busybox-1.18.1.orig/include/applets.src.h busybox-1.18.1/include/applets.src.h
---- busybox-1.18.1.orig/include/applets.src.h	2010-12-21 05:31:04.000000000 +0100
-+++ busybox-1.18.1/include/applets.src.h	2010-12-25 22:38:09.000000000 +0100
+--- busybox-1.18.1.orig/include/applets.src.h
++++ busybox-1.18.1/include/applets.src.h
 @@ -195,6 +195,7 @@
  IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
@@ -13617,9 +13544,8 @@ diff -Nur busybox-1.18.1.orig/include/applets.src.h busybox-1.18.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.18.1.orig/include/archive.h busybox-1.18.1/include/archive.h
---- busybox-1.18.1.orig/include/archive.h	2010-12-20 01:41:27.000000000 +0100
-+++ busybox-1.18.1/include/archive.h	2010-12-25 22:51:31.000000000 +0100
+--- busybox-1.18.1.orig/include/archive.h
++++ busybox-1.18.1/include/archive.h
 @@ -95,7 +95,7 @@
  	struct hardlinks_t *cpio__hardlinks_to_create;
  	struct hardlinks_t *cpio__created_hardlinks;
@@ -13629,9 +13555,8 @@ diff -Nur busybox-1.18.1.orig/include/archive.h busybox-1.18.1/include/archive.h
  	/* Temporary storage */
  	char *dpkg__buffer;
  	/* How to process any sub archive, e.g. get_header_tar_gz */
-diff -Nur busybox-1.18.1.orig/include/usage.src.h busybox-1.18.1/include/usage.src.h
---- busybox-1.18.1.orig/include/usage.src.h	2010-12-21 05:29:45.000000000 +0100
-+++ busybox-1.18.1/include/usage.src.h	2010-12-25 22:45:09.000000000 +0100
+--- busybox-1.18.1.orig/include/usage.src.h
++++ busybox-1.18.1/include/usage.src.h
 @@ -1919,6 +1919,82 @@
       "\n	-l	Limits" \
       "\n	-u	Summary" \

package/busybox/patches/004-remove-cflags.patch

@@ -0,0 +1,22 @@
+diff -Nur busybox-1.18.1.orig/Makefile.flags busybox-1.18.1/Makefile.flags
+--- busybox-1.18.1.orig/Makefile.flags	2010-12-20 01:41:26.000000000 +0100
++++ busybox-1.18.1/Makefile.flags	2011-01-27 21:24:51.000000000 +0100
+@@ -57,18 +57,6 @@
+ # be fixed..
+ #CFLAGS += $(call cc-option,-Wconversion,)
+ 
+-ifneq ($(CONFIG_DEBUG),y)
+-CFLAGS += $(call cc-option,-Os,)
+-else
+-CFLAGS += $(call cc-option,-g,)
+-#CFLAGS += "-D_FORTIFY_SOURCE=2"
+-ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
+-CFLAGS += $(call cc-option,-O0,)
+-else
+-CFLAGS += $(call cc-option,-Os,)
+-endif
+-endif
+-
+ # If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)...
+ ARCH_FPIC ?= -fpic
+ ARCH_FPIE ?= -fpie

package/cfgfs/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.8
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/
@@ -14,7 +14,6 @@ PKG_CFLINE_CFGFS:=	select BUSYBOX_COMM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
-PKG_CFLINE_CFGFS+=	select BUSYBOX_DIFF@
 PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
 PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_HARDWARE_QEMU)
 

package/cyrus-sasl/Makefile

@@ -61,8 +61,8 @@ CONFIGURE_ARGS+=	--disable-sample \
 
 pre-build:
 	${MAKE} -C ${WRKBUILD}/include \
-		CC="${HOSTCC}" \
-		LINK="${HOSTCC} -o makemd5 -lc" \
+		CC="${CC_FOR_BUILD}" \
+		LINK="${CC_FOR_BUILD} -o makemd5 -lc" \
 		LIBS="" \
 		CFLAGS="" \
 		LDFLAGS="" \

package/dnsmasq/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dnsmasq
 PKG_VERSION:=		2.55
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		b093d7c6bc7f97ae6fd35d048529232a
 PKG_DESCR:=		A lightweight DNS and DHCP server
 PKG_SECTION:=		dns

package/dnsmasq/files/dnsmasq.conf

@@ -12,21 +12,19 @@ expand-hosts
 # add more dhcp-range options for every subnet
 dhcp-range=192.168.1.129,192.168.1.254,255.255.255.0,72h
 interface=lo
-interface=eth0.0
-#interface=eth1
-interface=br0
+interface=eth0
 
 # Enable dnsmasq's built-in TFTP server
-#enable-tftp
+enable-tftp
 # Set the root directory for files available via TFTP.
-#tftp-root=/tftpboot
+tftp-root=/tftpboot
 
 dhcp-authoritative
 dhcp-leasefile=/tmp/dhcp.leases
 
 # use /etc/ethers for static hosts
 # <hwaddr> <ipaddr>
-#read-ethers
+read-ethers
 
 # other useful options (0.0.0.0 means server itself)
 # default route(s):

package/dnsmasq/files/dnsmasq.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $dns_dhcp = NO ]] && exit 0
+	[[ $dnsmasq = NO ]] && exit 0
 	exec sh $0 start
 	;;
 start)

package/dnsmasq/files/dnsmasq.postinst

@@ -4,4 +4,4 @@
 gid=$(get_next_gid)
 add_user dnsmasq $(get_next_uid) $gid /tmp
 add_group dnsmasq $gid
-add_rcconf dnsmasq dns_dhcp NO
+add_rcconf dnsmasq dnsmasq NO

package/eglibc/Makefile

@@ -91,7 +91,7 @@ eglibc-dev-install:
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
-		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
+		HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \

package/file/Makefile

@@ -9,13 +9,19 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		accade81ff1cc774904b47c72c8aeea0
 PKG_DESCR:=		a file type guesser
 PKG_SECTION:=		utils
+PKG_DEPENDS:=		libmagic
 PKG_URL:=		http://www.darwinsys.com/file
 PKG_SITES:=		ftp://ftp.fu-berlin.de/unix/tools/file/ \
 			ftp://ftp.astron.com/pub/file/
 
+PKG_SUBPKGS:=		FILE LIBMAGIC
+PKGSD_LIBMAGIC:=	file type guesser library
+PKGSC_LIBMAGIC:=	libs
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC}))
 
 pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
@@ -26,12 +32,15 @@ pre-configure:
 	${INSTALL_BIN} ${WRKBUILD}/src/file ${WRKBUILD}/magic
 	${MAKE} -C ${WRKBUILD} clean
 
-post-install:
-	${INSTALL_DIR} ${IDIR_FILE}/usr/bin ${IDIR_FILE}/usr/lib \
-		${IDIR_FILE}/usr/share/misc
+file-install:
+	${INSTALL_DIR} ${IDIR_FILE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/file ${IDIR_FILE}/usr/bin
+
+libmagic-install:
+	${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/share/misc
 	${INSTALL_DATA} ${WRKINST}/usr/share/misc/magic.mgc \
-		${IDIR_FILE}/usr/share/misc
-	${CP} ${WRKINST}/usr/lib/libmagic.so.* ${IDIR_FILE}/usr/lib/
+		${IDIR_LIBMAGIC}/usr/share/misc
+	${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libmagic.so* ${IDIR_LIBMAGIC}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/firefox/Makefile

@@ -16,6 +16,7 @@ PKG_BUILDDEP:=		alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
 PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
+PKG_NOPARALLEL:=	1
 
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin

package/glibc/Makefile

@@ -62,7 +62,7 @@ glibc-dev-install:
 	done
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
-		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
+		HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \

package/gmediaserver/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c422de386331e2a1a859d45f6fa270a3
 PKG_DESCR:=		An UPnP music media server
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		id3lib libupnp libiconv
-PKG_BUILDDEP:=		id3lib libupnp libiconv
+PKG_DEPENDS:=		id3lib libupnp libmagic libiconv
+PKG_BUILDDEP:=		id3lib libupnp file libiconv
 PKG_URL:=		http://www.gnu.org/software/gmediaserver
 PKG_SITES:=		http://savannah.nongnu.org/download/gmediaserver/
 

package/libX11/Makefile

@@ -11,6 +11,7 @@ PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau xcb-proto
 PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto libxcb
+PKG_DEPENDS:=		libxdmcp libxcb libxau
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBX11 LIBX11_DEV

package/libaudiofile/Makefile

@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBAUDIOFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
-CONFIGURE_ARGS+=	--with-build-cc=${HOSTCC}
+CONFIGURE_ARGS+=	--with-build-cc=${CC_FOR_BUILD}
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBAUDIOFILE}/usr/lib

package/libthread_db/Makefile

@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
 
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${TOPDIR}/toolchain/glibc/Makefile.inc
-else
+endif
 ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
 include ${TOPDIR}/toolchain/eglibc/Makefile.inc
-else
-include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
+include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
 
 PKG_NAME:=		libthread-db
@@ -28,7 +28,9 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
+ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib
 	${CP} ${STAGING_TARGET_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib
+endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libxcb/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		f715e53c9c1b25f856d14d6123663d96
 PKG_DESCR:=		X11 keyboard library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		python2 libpthread-stubs
+PKG_BUILDDEP:=		python2 libpthread-stubs libxslt libXau
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBXCB LIBXCB_DEVEL
@@ -25,6 +25,8 @@ $(eval $(call PKG_template,LIBXCB_DEVEL,${PKG_NAME}-devel,${PKG_VERSION}-${PKG_R
 
 include $(TOPDIR)/mk/python.mk
 
+CONFIGURE_ENV+=		PYTHON=$(PYTHON)
+
 libxcb-install:
 	${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib/

package/libxslt/Makefile

@@ -14,9 +14,14 @@ PKG_BUILDDEP:=		libxml2
 PKG_URL:=		http://xmlsoft.org/XSLT
 PKG_SITES:=		http://xmlsoft.org/sources/
 
+PKG_SUBPKGS:=		LIBXSLT XSLTPROC
+PKGSD_XSLTPROC:=	xslt processor utility
+PKGSC_XSLTPROC:=	misc
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBXSLT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XSLTPROC,xsltproc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XSLTPROC},${PKGSC_XSLTPROC}))
 
 CONFIGURE_ARGS+=	--with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \
 			--with-libxml-include-prefix="${STAGING_TARGET_DIR}/usr/include/libxml2" \
@@ -27,7 +32,11 @@ CONFIGURE_ARGS+=	--with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \
 			--without-mem-debug \
 			--without-debugger
 
-post-install:
+xsltproc-install:
+	${INSTALL_DIR} ${IDIR_XSLTPROC}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/xsltproc ${IDIR_XSLTPROC}/usr/bin
+
+libxslt-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib/
 

package/lzop/Makefile

@@ -0,0 +1,25 @@
+# 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:=		lzop
+PKG_VERSION:=		1.03
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		006c5e27fb78cdd14a628fdfa5aa1905
+PKG_DESCR:=		LZO compression utility
+PKG_SECTION:=		archive
+PKG_DEPENDS:=		liblzo
+PKG_BUILDDEP:=		liblzo
+PKG_URL:=		http://www.lzop.org/
+PKG_SITES:=		http://www.lzop.org/download/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LZOP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+lzop-install:
+	$(INSTALL_DIR) $(IDIR_LZOP)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/lzop $(IDIR_LZOP)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/ncurses/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ncurses
 PKG_VERSION:=		5.7
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		cce05daf61a64501ef6cd8da1f727ec6
 PKG_DESCR:=		a terminal handling library
 PKG_SECTION:=		libs
@@ -27,7 +27,7 @@ $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RE
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
-			--with-build-cc=${HOSTCC} \
+			--with-build-cc=${CC_FOR_BUILD} \
 			--without-progs \
 			--with-fallbacks \
 			--disable-termcap \
@@ -60,6 +60,7 @@ pre-configure:
 	);
 	${MAKE} -C ${WRKBUILD}/include
 	${MAKE} -C ${WRKBUILD}/progs
+	${CP} ${WRKBUILD}/progs/tic ${STAGING_HOST_DIR}/bin
 	find ${WRKBUILD} -name *.o -exec rm {} \;
 	find ${WRKBUILD} -name *.a -exec rm {} \;
 

package/nfs-utils/Makefile

@@ -5,21 +5,26 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
 PKG_VERSION:=		1.2.3
-PKG_RELEASE:=		3
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		1131dc5f27c4f3905a6e7ee0d594fd4d
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
-PKG_DEPENDS:=		kmod-nfsd portmap
+PKG_DEPENDS:=		kmod-nfsd
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
-PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS WITH_TIRPC
+PKG_CHOICES_NFS_UTILS:= WITH_TIRPC WITHOUT_TIRPC
+PKGCD_WITH_TIRPC:=	enable Transport Independent RPC
+PKGCS_WITH_TIRPC:=	libtirpc rpcbind
+PKGCB_WITH_TIRPC:=	libtirpc rpcbind
+PKGCD_WITHOUT_TIRPC:=	disable Transport Independent RPC
+PKGCS_WITHOUT_TIRPC:=	portmap
+PKGCB_WITHOUT_TIRPC:=	portmap
+
+PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS
 PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
 PKGFS_WITH_KERBEROS:=	libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
 PKGFB_WITH_KERBEROS:=	libnfsidmap krb5 libevent libgssglue librpcsecgss
-PKGFD_WITH_TIRPC:=	enable Transport Independent RPC
-PKGFS_WITH_TIRPC:=	libtirpc rpcbind
-PKGFB_WITH_TIRPC:=	libtirpc rpcbind
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

package/nfs-utils/files/nfsd.init

@@ -7,7 +7,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	test x"${portmap:-NO}" = x"NO" && exit 0
+	test x"${portmap:-NO}" = x"NO" || test x"${rpcbind:-NO}" = x"NO" && exit 0
 	test x"${nfs_server:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
@@ -18,9 +18,8 @@ start)
 	/bin/touch /var/lib/nfs/xtab
 	/bin/touch /var/lib/nfs/sm
 	chown nfs:nfs /var/lib/nfs/sm
-	/usr/sbin/exportfs -r
-	/usr/sbin/mountd
 	/usr/sbin/nfsd
+	/usr/sbin/mountd
 	if [ ${nfs_server_version} -eq 4 ];then
 		mkdir -p /var/lib/nfs/rpc_pipefs
 		mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
@@ -29,7 +28,6 @@ start)
 	fi
 	;;
 stop)
-	kill $(pgrep -f /usr/sbin/nfsd)
 	kill $(pgrep -f /usr/sbin/mountd)
 	if [ ${nfs_server_version} -eq 4 ];then
 		kill $(pgrep -f /usr/sbin/idmapd)

package/openssh/Makefile

@@ -7,36 +7,40 @@ PKG_NAME:=		openssh
 PKG_VERSION:=		5.6p1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e6ee52e47c768bf0ec42a232b5d18fb0
-PKG_DESCR:=		OpenSSH server
+PKG_DESCR:=		OpenSSH
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		zlib libopenssl libpthread
 PKG_BUILDDEP:=		zlib openssl
 PKG_URL:=		http://www.openssh.com/
 PKG_SITES:=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
+PKG_MULTI:=		1
 
-PKG_SUBPKGS:=		OPENSSH_SERVER OPENSSH_CLIENT OPENSSH_CLIENT_UTILS
+PKG_SUBPKGS:=		OPENSSH OPENSSH_SERVER OPENSSH_CLIENT OPENSSH_CLIENT_UTILS
 PKG_SUBPKGS+=		OPENSSH_SFTP_CLIENT OPENSSH_SFTP_SERVER
+
+PKGSD_OPENSSH_SERVER:=		OpenSSH server
 PKGSD_OPENSSH_CLIENT:=		OpenSSH client
 PKGSD_OPENSSH_CLIENT_UTILS:=	OpenSSH client utilities
 PKGSD_OPENSSH_SFTP_CLIENT:=	OpenSSH sftp client
 PKGSD_OPENSSH_SFTP_SERVER:=	OpenSSH sftp server
 
-PKG_CHOICES_OPENSSH_SERVER:=	NOKRB WITH_KRB5 WITH_HEIMDAL
-PKGCD_NOKRB:=			no Kerberos support
-PKGCD_WITH_KRB5:=		with MIT Kerberos
-PKGCS_WITH_KRB5:=		libkrb5 libcom-err
-PKGCB_WITH_KRB5:=		krb5
-PKGCD_WITH_HEIMDAL:=		with Heimdal Kerberos
-PKGCS_WITH_HEIMDAL:=		libheimdal libcom-err
-PKGCB_WITH_HEIMDAL:=		heimdal
+PKG_CHOICES_OPENSSH:=	NOKRB WITH_KRB5 WITH_HEIMDAL
+PKGCD_NOKRB:=		no Kerberos support
+PKGCD_WITH_KRB5:=	with MIT Kerberos
+PKGCS_WITH_KRB5:=	libkrb5 libcom-err
+PKGCB_WITH_KRB5:=	krb5
+PKGCD_WITH_HEIMDAL:=	with Heimdal Kerberos
+PKGCS_WITH_HEIMDAL:=	libheimdal libcom-err
+PKGCB_WITH_HEIMDAL:=	heimdal
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_CLIENT},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_CLIENT_UTILS},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_SFTP_CLIENT},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH,openssh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SERVER},${PKGSD_OPENSSH_SERVER},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_CLIENT},${PKGSD_OPENSSH_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_CLIENT_UTILS},${PKGSD_OPENSSH_CLIENT_UTILS},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_CLIENT},${PKGSD_OPENSSH_SFTP_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_SERVER},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION}))
 
 ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y)
 CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
@@ -65,7 +69,11 @@ CONFIGURE_ARGS+=	--disable-strip \
 			--with-privsep-path=/var/run/sshd \
 			--with-ssl-dir="${STAGING_TARGET_DIR}/usr"
 
-post-install:
+openssh-install:
+	${INSTALL_DIR} ${IDIR_OPENSSH}/etc/ssh
+	chmod 0700 ${IDIR_OPENSSH}/etc/ssh
+
+openssh-server-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/bin
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/sbin
@@ -74,28 +82,34 @@ post-install:
 		${IDIR_OPENSSH_SERVER}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/sshd \
 	 	${IDIR_OPENSSH_SERVER}/usr/sbin
+	# ssh pubkey
+	test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \
+		mkdir -p $(IDIR_OPENSSH_SERVER)/etc/ssh; \
+		echo $(ADK_RUNTIME_SSH_PUBKEY) \
+		>$(IDIR_OPENSSH_SERVER)/etc/ssh/authorized_keys; \
+        )
+
+openssh-client-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH_CLIENT}/etc/ssh
 	${INSTALL_DIR} ${IDIR_OPENSSH_CLIENT}/usr/bin
 	${INSTALL_DATA} ${WRKINST}/etc/ssh/ssh_config \
 	    ${IDIR_OPENSSH_CLIENT}/etc/ssh
 	${INSTALL_BIN} ${WRKINST}/usr/bin/{ssh,scp} \
 	    ${IDIR_OPENSSH_CLIENT}/usr/bin
+
+openssh-client-utils-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH_CLIENT_UTILS}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/ssh-{add,agent,keyscan} \
 	    ${IDIR_OPENSSH_CLIENT_UTILS}/usr/bin
+
+openssh-sftp-client-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_CLIENT}/usr/bin
-	${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/sftp \
 		${IDIR_OPENSSH_SFTP_CLIENT}/usr/bin
+
+openssh-sftp-server-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec
 	${INSTALL_BIN} ${WRKINST}/usr/libexec/sftp-server \
 		${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec
-	chmod 0700 {${IDIR_OPENSSH_CLIENT},${IDIR_OPENSSH_SERVER}}/etc/ssh
-	# ssh pubkey
-	test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \
-		mkdir -p $(IDIR_OPENSSH_SERVER)/etc/ssh; \
-		echo $(ADK_RUNTIME_SSH_PUBKEY) \
-		>$(IDIR_OPENSSH_SERVER)/etc/ssh/authorized_keys; \
-        )
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/openssh/patches/patch-openbsd-compat_port-linux_c

@@ -0,0 +1,14 @@
+avoid following warning in syslog:
+sshd (1111): /proc/1111/oom_adj is deprecated, please use /proc/1111/oom_score_adj instead.
+
+--- openssh-5.6p1.orig/openbsd-compat/port-linux.c	2010-03-01 05:52:50.000000000 +0100
++++ openssh-5.6p1/openbsd-compat/port-linux.c	2011-01-27 19:16:12.000000000 +0100
+@@ -208,7 +208,7 @@ ssh_selinux_change_context(const char *n
+ #endif /* WITH_SELINUX */
+ 
+ #ifdef LINUX_OOM_ADJUST
+-#define OOM_ADJ_PATH	"/proc/self/oom_adj"
++#define OOM_ADJ_PATH	"/proc/self/oom_score_adj"
+ /*
+  * The magic "don't kill me", as documented in eg:
+  * http://lxr.linux.no/#linux+v2.6.32/Documentation/filesystems/proc.txt

package/openssh/patches/patch-openbsd-compat_port-tun_c

@@ -1,6 +1,6 @@
---- openssh-5.5p1.orig/openbsd-compat/port-tun.c	2008-05-19 07:28:36.000000000 +0200
-+++ openssh-5.5p1/openbsd-compat/port-tun.c	2010-04-21 20:14:00.000000000 +0200
-@@ -213,7 +213,7 @@ sys_tun_infilter(struct Channel *c, char
+--- openssh-5.6p1.orig/openbsd-compat/port-tun.c	2010-08-10 04:47:42.000000000 +0200
++++ openssh-5.6p1/openbsd-compat/port-tun.c	2011-01-27 18:16:39.000000000 +0100
+@@ -215,7 +215,7 @@ sys_tun_infilter(struct Channel *c, char
  	if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af)))
  		return (-1);
  	ptr = (char *)&rbuf[0];

package/pciutils/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		pciutils
 PKG_VERSION:=		3.1.7
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		f3e349d22a3714b4272b171649ad5235
 PKG_DESCR:=		PCI Utilities
 PKG_SECTION:=		utils
@@ -29,8 +29,8 @@ MAKE_FLAGS+=		CC="${TARGET_CC}" \
 ALL_TARGET:=
 
 do-install:
-	${INSTALL_DIR} ${IDIR_PCIUTILS}/usr/{share,sbin}
-	${INSTALL_BIN} ${WRKBUILD}/{lspci,setpci} ${IDIR_PCIUTILS}/usr/sbin/
-	${INSTALL_DATA} ${WRKBUILD}/pci.ids ${IDIR_PCIUTILS}/usr/share/
+	${INSTALL_DIR} ${IDIR_PCIUTILS}/usr/{share,bin}
+	${INSTALL_BIN} ${WRKBUILD}/{lspci,setpci} ${IDIR_PCIUTILS}/usr/bin
+	${INSTALL_DATA} ${WRKBUILD}/pci.ids ${IDIR_PCIUTILS}/usr/share
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/perl/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		perl
 PKG_VERSION:=		5.12.2
 PKG_RELEASE:=		2
-PKG_MD5SUM:=		af2df531d46b77fdf0d97eecb03eddb2
+PKG_MD5SUM:=		20781ca125fb6346bb343a15e082d127
 PKG_DESCR:=		full-blown Perl
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.perl.org/
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,PERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 CONFIG_STYLE:=          manual
 
 pre-configure:
-	(cd ${WRKBUILD}; ./Configure -des -Dcc=gcc -Dprefix=/usr);
+	(cd ${WRKBUILD}; ./Configure -des -Dcc=gcc -Dprefix=/usr -A ccflags="${TARGET_CFLAGS}");
 
 post-install:
 	${INSTALL_DIR} ${IDIR_PERL}/usr/bin

package/postgresql/Makefile

@@ -41,7 +41,7 @@ pre-configure:
 		${PKG_CONFIGURE_ARGS} \
 	);
 	${MAKE} -C "${WRKBUILD}/src/bin/pg_config" \
-		CC="${HOSTCC}" \
+		CC="${CC_FOR_BUILD}" \
 		DESTDIR="${WRKINST}" \
 		all install
 

package/ppp/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ppp
 PKG_VERSION:=		2.4.5
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_MD5SUM:=		4621bc56167b6953ec4071043fe0ec57
 PKG_DESCR:=		Point-to-Point Protocol software
 PKG_SECTION:=		ppp
@@ -16,19 +16,19 @@ PKG_MULTI:=		1
 
 PKG_SUBPKGS:=		PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS
 PKG_SUBPKGS+=		PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS
-PKG_DEPENDS_PPPOE:=	kmod-pppoe
-PKG_DEPENDS_UMTS:=	comgt
+PKGSS_PPP_MOD_PPPOE:=	kmod-pppoe
+PKGSS_PPP_MOD_PPPUMTS:=	comgt
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_PPPOE},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PPP_MOD_PPPOE},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UMTS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PPP_MOD_PPPUMTS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		minimal
 CONFIGURE_ARGS+=	--system=Linux

package/sudo/Makefile

@@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		sudo
 PKG_VERSION:=		1.7.4p4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		55d9906535d70a1de347cd3d3550ee87
 PKG_DESCR:=		su do
-PKG_SECTION:=		misc
+PKG_SECTION:=		admin
 PKG_URL:=		http://www.courtesan.com/sudo/
 PKG_SITES:=		http://www.courtesan.com/sudo/dist/
 
@@ -17,6 +17,7 @@ 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 \
+			--with-env-editor \
 			--with-timedir=/var/run
 
 post-install:

package/tcpdump/Makefile

@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TCPDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" HOSTCC=${HOSTCC} \
+CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" HOSTCC=${CC_FOR_BUILD} \
 			ac_cv_linux_vers=2 \
 			td_cv_buggygetaddrinfo="no"
 CONFIGURE_ARGS+=	--without-crypto

package/uclibc++/Makefile

@@ -12,6 +12,7 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://cxx.uclibc.org/
 PKG_SITES:=		http://cxx.uclibc.org/src/
 PKG_NEED_CXX:=		1
+PKG_NOPARALLEL:=	1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

package/uclibc/Makefile

@@ -55,7 +55,7 @@ uclibc-dev-install:
 		PREFIX=$(IDIR_UCLIBC_DEV)/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(IDIR_UCLIBC_DEV)/ \
-		HOSTCC="$(HOSTCC)" \
+		HOSTCC="$(CC_FOR_BUILD)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_headers
 	@find $(IDIR_UCLIBC_DEV) -name .install -exec rm {} \;

package/usbutils/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		usbutils
 PKG_VERSION:=		0.86
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		34979f675d2bcb3e1b45012fa830a53f
 PKG_DESCR:=		A program to list USB devices
 PKG_SECTION:=		utils
@@ -23,7 +23,7 @@ post-install:
 	${INSTALL_DIR} ${IDIR_LSUSB}/usr/share
 	${INSTALL_DATA} ${WRKINST}/usr/share/usb.ids \
 		${IDIR_LSUSB}/usr/share/
-	${INSTALL_DIR} ${IDIR_LSUSB}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/lsusb ${IDIR_LSUSB}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_LSUSB}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/lsusb ${IDIR_LSUSB}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/x11-headers/Makefile

@@ -1,28 +0,0 @@
-# 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:=		x11-headers
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-PKG_DESCR:=		X11 header files
-PKG_BUILDDEP:=		xproto xtrans xextproto
-PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto
-PKG_SECTION:=		devel
-
-NO_DISTFILES:=		1
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,X11_HEADERS,x11-headers,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-install: 
-	${INSTALL_DIR} ${IDIR_X11_HEADERS}/usr/include
-	${CP} ${STAGING_TARGET_DIR}/usr/include/X11 ${IDIR_X11_HEADERS}/usr/include
-
-include ${TOPDIR}/mk/pkg-bottom.mk

package/xcb-proto/Makefile

@@ -16,6 +16,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+include $(TOPDIR)/mk/python.mk
+
+CONFIGURE_ENV+=		PYTHON=$(PYTHON)
+
 post-install:
 	${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share
 	${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share

package/xrdb/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		146c009e7abc52b611db4cac4883488e
 PKG_DESCR:=		X resource database management tools
 PKG_SECTION:=		x11/apps
+PKG_DEPENDS:=		libx11 libxmu
+PKG_BUILDDEP:=		libX11 libXmu
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk

scripts/scan-pkgs.sh

@@ -60,6 +60,10 @@ if [[ -n $ADK_COMPILE_HEIMDAL ]]; then
 	NEED_BISON="$NEED_BISON heimdal-server"
 fi
 
+if [[ -n $ADK_PACKAGE_LIBXCB ]]; then
+	NEED_XSLTPROC="$NEED_XSLTPROC libxcb"
+fi
+
 if [[ -n $ADK_COMPILE_PCMCIAUTILS ]]; then
 	NEED_BISON="$NEED_BISON pcmciautils"
 	NEED_FLEX="$NEED_FLEX pcmciautils"
@@ -278,6 +282,13 @@ if [[ -n $NEED_FLEX ]]; then
 	fi
 fi
 
+if [[ -n $NEED_XSLTPROC ]]; then
+	if ! which xsltproc >/dev/null 2>&1; then
+		echo >&2 You need xsltproc to to use $NEED_XSLTPROC package
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_PYTHON ]]; then
 	if ! which python >/dev/null 2>&1; then
 		if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then

scripts/scan-tools.sh

@@ -72,11 +72,10 @@ set +e
 
 cat >Makefile <<'EOF'
 include ${TOPDIR}/prereq.mk
-HOSTCFLAGS+=	-O2
 all: run-test
 
 test: test.c
-	${HOSTCC} ${HOSTCFLAGS} -o $@ $^ ${LDADD}
+	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} -o $@ $^ ${LDADD}
 
 run-test: test
 	./test

target/linux/config/Config.in.misc

@@ -1,9 +1,3 @@
-#config ADK_LINUX_INITRAMFS_BUILTIN
-#	select ADK_KERNEL_BLK_DEV_INITRD
-#	select ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
-#	boolean
-#	default n
-
 config ADK_KERNEL_RFKILL
  	boolean
 
@@ -46,6 +40,7 @@ config ADK_KERNEL_RTC_DRV_CMOS
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_IBM_X40
  	default n
+	depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40)
  	help
 	 PC CMOS RTC support.
 	

target/linux/config/Config.in.netdevice

@@ -340,6 +340,7 @@ config ADK_KPACKAGE_KMOD_P54_USB
 	select ADK_PACKAGE_P54_FIRMWARE
 	select ADK_KERNEL_EXPERIMENTAL
 	select ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KPACKAGE_KMOD_CRC_CCITT
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 	default n
 	help

target/linux/config/Config.in.usb

@@ -1,35 +1,37 @@
 menu "USB support"
 depends on ADK_TARGET_WITH_USB
 
+config ADK_KERNEL_USB
+	boolean
+
 config ADK_KERNEL_USB_LIBUSUAL
 	tristate
 
 config ADK_KERNEL_USB_SERIAL
 	boolean
 
-config ADK_KERNEL_USB
-	boolean
-
 config ADK_KERNEL_USB_STORAGE
 	boolean
 
 config ADK_KERNEL_USB_EHCI_HCD
 	boolean
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 
 config ADK_KERNEL_USB_UHCI_HCD
 	boolean
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 
 config ADK_KPACKAGE_KMOD_USB
 	prompt "kmod-usb......................... USB support"
 	tristate
+	select ADK_KERNEL_NLS
+	depends on !ADK_KERNEL_USB
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
-	depends on !ADK_KERNEL_USB
-	select ADK_KERNEL_NLS
 	help
 	  Universal Serial Bus (USB) is a specification for a serial bus
 	  subsystem which offers higher speeds and more features than the
@@ -62,10 +64,12 @@ config ADK_KPACKAGE_KMOD_USB
 config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 	prompt   "kmod-usb-uhci................... Support for UHCI controllers"
 	tristate
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_KERNEL_USB_UHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default n
 	help
 	  The Universal Host Controller Interface is a standard by Intel for
 	  accessing the USB hardware in the PC (which is also called the USB
@@ -79,15 +83,13 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	prompt   "kmod-usb-ohci................... Support for OHCI controllers"
 	tristate
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	depends on ADK_KPACKAGE_KMOD_USB
+	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
-	depends on ADK_KPACKAGE_KMOD_USB
-	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
 	  USB 1.1 host controller hardware.  It does more in hardware than Intel's
@@ -101,10 +103,10 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 	prompt   "kmod-usb-isp116x................ ISP116X HCD support"
 	tristate
-	default n
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 	help
 	  The ISP1160 and ISP1161 chips are USB host controllers. Enable this
 	  option if your board has this chip. If unsure, say N.
@@ -114,10 +116,10 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 	prompt   "kmod-usb-sl811.................. SL811HS HCD support"
 	tristate
-	default n
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 	help
 	  The SL811HS is a single-port USB controller that supports either
 	  host side or peripheral side roles.  Enable this option if your
@@ -128,15 +130,15 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	prompt   "kmod-usb-ehci................... Support for USB 2.0 controllers"
 	tristate
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on !ADK_KERNEL_USB_EHCI_HCD
+	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
+	depends on ADK_KPACKAGE_KMOD_USB
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
-	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on ADK_KPACKAGE_KMOD_USB
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	  The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
 	  "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -158,7 +160,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 
 config ADK_PACKAGE_KMOD_USB_CONTROLLER
 	tristate
-	depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD
+	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
 
 config ADK_KPACKAGE_KMOD_USB_ACM

target/linux/patches/2.6.36/zboot-brcm-reloc.patch

@@ -0,0 +1,297 @@
+--- /dev/null	Thu Jan  6 02:10:11 2011
++++ linux-2.6.36/arch/mips/boot/compressed/invcache.S	Thu Jan  6 01:32:57 2011
+@@ -0,0 +1,132 @@
++/*-
++ * written 2011 by Thorsten Glaser <tg@mirbsd.org> based on
++ * code from LZMA-Loader with the following copyright note:
++ * Copyright 2005 Oleg I. Vdovikin <oleg@cs.msu.su>
++ * cache manipulation adapted from Broadcom code
++ * idea taken from original bunzip2 decompressor code
++ * Copyright 2004 Manuel Novoa III <mjn3@codepoet.org>
++ */
++
++/*
++ * This file is supposed to be #include’d where it’s
++ * needed; we will not trash s0, s1, s2, s3.
++ */
++
++#define KSEG0		0x80000000
++
++#define C0_CONFIG	$16
++#define C0_TAGLO	$28
++#define C0_TAGHI	$29
++
++#define CONF1_DA_SHIFT	7			/* D$ associativity */
++#define CONF1_DA_MASK	0x00000380
++#define CONF1_DA_BASE	1
++#define CONF1_DL_SHIFT	10			/* D$ line size */
++#define CONF1_DL_MASK	0x00001c00
++#define CONF1_DL_BASE	2
++#define CONF1_DS_SHIFT	13			/* D$ sets/way */
++#define CONF1_DS_MASK	0x0000e000
++#define CONF1_DS_BASE	64
++#define CONF1_IA_SHIFT	16			/* I$ associativity */
++#define CONF1_IA_MASK	0x00070000
++#define CONF1_IA_BASE	1
++#define CONF1_IL_SHIFT	19			/* I$ line size */
++#define CONF1_IL_MASK	0x00380000
++#define CONF1_IL_BASE	2
++#define CONF1_IS_SHIFT	22			/* Instruction cache sets/way */
++#define CONF1_IS_MASK	0x01c00000
++#define CONF1_IS_BASE	64
++
++#define Index_Invalidate_I	0x00
++#define Index_Writeback_Inv_D	0x01
++
++	/* Get cache sizes */
++	.set	mips32
++	mfc0	s4,C0_CONFIG,1
++	.set	mips0
++
++	li	s5,CONF1_DL_MASK
++	and	s5,s4
++	beq	s5,zero,2f
++	 nop
++
++	srl	s5,CONF1_DL_SHIFT
++	li	t0,CONF1_DL_BASE
++	sll	s5,t0,s5		/* s5 has D$ cache line size */
++
++	li	s6,CONF1_DA_MASK
++	and	s6,s4
++	srl	s6,CONF1_DA_SHIFT
++	addiu	s6,CONF1_DA_BASE	/* s6 now has D$ associativity */
++
++	li	t0,CONF1_DS_MASK
++	and	t0,s4
++	srl	t0,CONF1_DS_SHIFT
++	li	s7,CONF1_DS_BASE
++	sll	s7,s7,t0		/* s7 has D$ sets per way */
++
++	multu	s6,s7			/* sets/way * associativity */
++	mflo	t0			/* total cache lines */
++
++	multu	s5,t0			/* D$ linesize * lines */
++	mflo	s6			/* s6 is now D$ size in bytes */
++
++	/* Initilize the D$: */
++	mtc0	zero,C0_TAGLO
++	mtc0	zero,C0_TAGHI
++
++	li	t0,KSEG0		/* Just an address for the first $ line */
++	addu	t1,t0,s6		/*  + size of cache == end */
++
++	.set	mips3
++1:	cache	Index_Writeback_Inv_D,0(t0)
++	.set	mips0
++	bne	t0,t1,1b
++	 addu	t0,s5
++
++2:
++	/* Now we get to do it all again for the I$ */
++
++	move	s7,zero			/* just in case there is no icache */
++	move	t8,zero
++
++	li	t0,CONF1_IL_MASK
++	and	t0,s4
++	beq	t0,zero,3f
++	 nop
++
++	srl	t0,CONF1_IL_SHIFT
++	li	s7,CONF1_IL_BASE
++	sll	s7,t0			/* s7 has I$ cache line size */
++
++	li	t0,CONF1_IA_MASK
++	and	t0,s4
++	srl	t0,CONF1_IA_SHIFT
++	addiu	t8,t0,CONF1_IA_BASE	/* t8 now has I$ associativity */
++
++	li	t0,CONF1_IS_MASK
++	and	t0,s4
++	srl	t0,CONF1_IS_SHIFT
++	li	t9,CONF1_IS_BASE
++	sll	t9,t0			/* t9 has I$ sets per way */
++
++	multu	t8,t9			/* sets/way * associativity */
++	mflo	t0			/* t8 is now total cache lines */
++
++	multu	s7,t0			/* I$ linesize * lines */
++	mflo	t8			/* t8 is cache size in bytes */
++
++	/* Initilize the I$: */
++	mtc0	zero,C0_TAGLO
++	mtc0	zero,C0_TAGHI
++
++	li	t0,KSEG0		/* Just an address for the first $ line */
++	addu	t1,t0,t8		/*  + size of cache == end */
++
++	.set	mips3
++1:	cache	Index_Invalidate_I,0(t0)
++	.set	mips0
++	bne	t0,t1,1b
++	 addu	t0,s7
++
++3:
+--- /dev/null	Thu Jan  6 00:14:18 2011
++++ linux-2.6.36/arch/mips/boot/compressed/selfreloc.lds.S	Wed Jan  5 23:52:43 2011
+@@ -0,0 +1,39 @@
++/*-
++ * written 2010 by Thorsten Glaser <tg@debian.org> based on
++ * arch/mips/kernel/vmlinux.lds and arch/mips/boot/compressed/ld.script
++ */
++
++#include <asm/asm-offsets.h>
++#include <asm/page.h>
++#include <asm-generic/vmlinux.lds.h>
++
++#undef mips
++#define mips mips
++OUTPUT_ARCH(mips)
++ENTRY(selfreloc_start)
++PHDRS {
++	text PT_LOAD FLAGS(7);	/* RWX */
++}
++SECTIONS
++{
++	. = VMLINUX_LOAD_ADDRESS;
++	.text : {
++		*(.text)
++		*(.text.*)
++		*(.rodata)
++		*(.rodata.*)
++		*(.data)
++		*(.data.*)
++		*(.bss)
++		*(.bss.*)
++	} :text
++	/DISCARD/ : {
++		*(.MIPS.options)
++		*(.options)
++		*(.pdr)
++		*(.reginfo)
++		*(.comment)
++		*(.note)
++		*(.gnu.attributes)
++	}
++}
+--- /dev/null	Thu Jan  6 02:10:14 2011
++++ linux-2.6.36/arch/mips/boot/compressed/selfreloc.S	Thu Jan  6 01:21:44 2011
+@@ -0,0 +1,60 @@
++/*-
++ * written 2011 by Thorsten Glaser <tg@freewrt.org> based on
++ * arch/mips/boot/compressed/head.S and code from LZMA-Loader
++ */
++
++#include <asm/asm.h>
++#include <asm/regdef.h>
++
++	.set noreorder
++	.cprestore
++
++	.text
++	LEAF(selfreloc_start)
++selfreloc_start:
++	/* Save boot rom start args */
++	move	s0, a0
++	move	s1, a1
++	move	s2, a2
++	move	s3, a3
++
++	/* Copy code to the correct place */
++	PTR_LI	a0, VMLINUZ_LOAD_ADDRESS
++	PTR_LA	a1, imgbeg
++	PTR_LA	a2, imgend
++1:	lw	t0, 0(a1)
++	sw	t0, 0(a0)
++	add	a1, 4
++	add	a0, 4
++	blt	a1, a2, 1b
++	 nop
++
++	/*
++	 * At this point we need to invalidate dcache and
++	 * icache before jumping to the new code
++	 */
++/* #include "invcache.S" // since this may work only on brcm? */
++
++	/* Restore boot rom start args */
++	move	a0, s0
++	move	a1, s1
++	move	a2, s2
++	move	a3, s3
++
++	/* Jump to the code at its new location */
++	PTR_LI	k0, VMLINUZ_LOAD_ADDRESS
++	jr	k0
++	 nop
++
++	/* Just in case we come back… */
++3:
++	b	3b
++	 nop
++	END(selfreloc_start)
++
++	.globl	imgbeg
++	.p2align 2
++imgbeg:	.incbin	"vmlinuz.bin"
++	.globl	imgend
++	.p2align 2
++imgend:
+--- linux-2.6.36/arch/mips/boot/compressed/Makefile~	Wed Jan  5 21:26:40 2011
++++ linux-2.6.36/arch/mips/boot/compressed/Makefile	Wed Jan  5 23:35:58 2011
+@@ -62,8 +62,13 @@ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vm
+ # Calculate the load address of the compressed kernel image
+ hostprogs-y := calc_vmlinuz_load_addr
+ 
++ifdef CONFIG_BCM47XX
++# XXX just after CFE, just pray the address is static
++VMLINUZ_LOAD_ADDRESS = 0xffffffff80480000
++else
+ VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
+ 		$(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))
++endif
+ 
+ vmlinuzobjs-y += $(obj)/piggy.o
+ 
+@@ -106,4 +107,12 @@ OBJCOPYFLAGS_vmlinuz.srec := $(OBJCOPYFL
+ vmlinuz.srec: vmlinuz
+ 	$(call cmd,objcopy)
+ 
+-clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec}
++AFLAGS_selfreloc.o := -DVMLINUZ_LOAD_ADDRESS=$(VMLINUZ_LOAD_ADDRESS)
++arch/mips/boot/compressed/selfreloc.o: arch/mips/boot/compressed/selfreloc.S vmlinuz.bin arch/mips/boot/compressed/invcache.S
++
++CPPFLAGS_selfreloc.lds := $(KBUILD_CFLAGS)
++
++vmlinub.elf: arch/mips/boot/compressed/selfreloc.o arch/mips/boot/compressed/selfreloc.lds
++	$(LD) $(LDFLAGS) -T arch/mips/boot/compressed/selfreloc.lds arch/mips/boot/compressed/selfreloc.o -o $@
++
++clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec} $(objtree)/vmlinub.elf $(objtree)/arch/mips/boot/compressed/selfreloc.{o,lds}
+--- linux-2.6.36/arch/mips/Makefile~	Wed Jan  5 20:26:12 2011
++++ linux-2.6.36/arch/mips/Makefile	Wed Jan  5 22:41:38 2011
+@@ -79,6 +79,7 @@ endif
+ all-$(CONFIG_BOOT_ELF32)	:= $(vmlinux-32)
+ all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64)
+ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlinuz
++all-$(CONFIG_BCM47XX)		+= vmlinub.elf
+ 
+ #
+ # GCC uses -G 0 -mabicalls -fpic as default.  We don't want PIC in the kernel
+@@ -285,7 +286,7 @@ vmlinux.bin vmlinux.ecoff vmlinux.srec: 
+ 	$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) arch/mips/boot/$@
+ 
+ # boot/compressed
+-vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec: $(vmlinux-32) FORCE
++vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec vmlinub.elf: $(vmlinux-32) FORCE
+ 	$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \
+ 	   VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $@
+ 
+@@ -322,6 +323,7 @@ define archhelp
+ 	echo '  vmlinuz.ecoff        - ECOFF zboot image'
+ 	echo '  vmlinuz.bin          - Raw binary zboot image'
+ 	echo '  vmlinuz.srec         - SREC zboot image'
++	echo '  vmlinub.elf          - ELF self-relocating zboot image'
+ 	echo
+ 	echo '  These will be default as apropriate for a configured platform.'
+ endef

target/packages/pkg-available/laptop

@@ -1,19 +1,11 @@
 config ADK_PKG_LAPTOP
 	bool "Choose packages for a laptop system with X"
 	default n
-	select ADK_KPACKAGE_KMOD_PCMCIA
-	select ADK_KPACKAGE_KMOD_PCCARD
-	select ADK_KPACKAGE_KMOD_SERIAL_8250_CS
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_VIM
 	select ADK_PACKAGE_SUDO
 	select ADK_PACKAGE_KEYCHAIN
-	select ADK_PACKAGE_CRYPTSETUP
-	select ADK_PACKAGE_OPENSC
-	select ADK_PACKAGE_PCSC_LITE
-	select ADK_PACKAGE_CCID
 	select ADK_PACKAGE_ALSA_UTILS
-	select ADK_PACKAGE_OPENSSL_PKCS11
 	select ADK_PACKAGE_OPENSSH_CLIENT
 	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
 	select ADK_PACKAGE_OPENSSH_SERVER

toolchain/eglibc/Makefile

@@ -25,7 +25,7 @@ EGLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--enable-add-ons
 
 EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
-			BUILD_CC=${HOSTCC} \
+			BUILD_CC=${CC_FOR_BUILD} \
 			CFLAGS="$(TARGET_CFLAGS)" \
 			CC=${REAL_GNU_TARGET_NAME}-gcc \
 			CXX=${REAL_GNU_TARGET_NAME}-g++ \

toolchain/glibc/Makefile.inc

@@ -22,7 +22,7 @@ GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--enable-kernel="2.6.0" \
 			--enable-add-ons
 GLIBC_ENV:=             PATH='${TARGET_PATH}' \
-                        BUILD_CC=${HOSTCC} \
+                        BUILD_CC=${CC_FOR_BUILD} \
                         CFLAGS="$(TARGET_CFLAGS)" \
                         CC=${REAL_GNU_TARGET_NAME}-gcc \
                         CXX=${REAL_GNU_TARGET_NAME}-g++ \

toolchain/kernel-headers/Makefile

@@ -7,10 +7,10 @@ include $(TOPDIR)/mk/linux.mk
 include ${TOPDIR}/mk/buildhlp.mk
 
 $(WRKBUILD)/.headers:
-	$(MAKE) -C $(WRKBUILD) HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \
 		headers_install
-	$(MAKE) -C $(WRKBUILD) HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(LINUX_HEADER_DIR) \
 		headers_install
 	# cryptodev.h from ocf-linux-20080917

toolchain/uClibc/Makefile

@@ -29,14 +29,14 @@ endif
 		PREFIX=$(STAGING_TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \
-		HOSTCC="$(HOSTCC)" \
+		HOSTCC="$(CC_FOR_BUILD)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		oldconfig
 	$(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \
 		PREFIX=$(STAGING_TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \
-		HOSTCC="$(HOSTCC)" \
+		HOSTCC="$(CC_FOR_BUILD)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_headers
 	touch $(WRKBUILD)/.configured
@@ -47,7 +47,7 @@ $(WRKBUILD)/.compiled:
 		PREFIX= \
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
-		HOSTCC="$(HOSTCC)" \
+		HOSTCC="$(CC_FOR_BUILD)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		all
 	touch $@

tools/adk/Makefile

@@ -3,17 +3,15 @@
 
 include $(TOPDIR)/rules.mk
 
-CCANDLD.c=	${HOSTCC} ${HOSTCFLAGS} ${HOSTCPPFLAGS} ${HOSTLDFLAGS}
-
-${TOOLS_DIR}/depmaker:
-	${CCANDLD.c} -Wall -o $@ depmaker.c
+install: ${TOOLS_DIR}/depmaker ${TOOLS_DIR}/pkgrebuild ${TOOLS_DIR}/dkgetsz
 
-${TOOLS_DIR}/pkgrebuild:
-	${CCANDLD.c} -Wall -o $@ pkgrebuild.c strmap.c
+${TOOLS_DIR}/depmaker: depmaker.c
+	${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ depmaker.c
 
-${TOOLS_DIR}/dkgetsz:
-	${CCANDLD.c} -Wall -o $@ dkgetsz.c
+${TOOLS_DIR}/pkgrebuild: pkgrebuild.c strmap.c
+	${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ pkgrebuild.c strmap.c
 
-install: ${TOOLS_DIR}/depmaker ${TOOLS_DIR}/pkgrebuild ${TOOLS_DIR}/dkgetsz
+${TOOLS_DIR}/dkgetsz: dkgetsz.c
+	${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ dkgetsz.c
 
 include $(TOPDIR)/mk/tools.mk

tools/cpio/Makefile

@@ -3,6 +3,8 @@
 
 include $(TOPDIR)/rules.mk
 
+install: ${TOOLS_DIR}/cpio
+
 SRCS+=		\
 		src/ib_open.c \
 		src/ib_close.c \
@@ -28,8 +30,6 @@ SRCS+=		\
 		src/cpio.c
 
 ${TOOLS_DIR}/cpio: ${SRCS}
-	${HOSTCC} ${HOSTCFLAGS} -D_GNU_SOURCE -Isrc -o $@ $^
-
-install: ${TOOLS_DIR}/cpio
+	${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -D_GNU_SOURCE -Isrc -o $@ $^
 
 include $(TOPDIR)/mk/tools.mk

tools/mkcrypt/Makefile

@@ -3,9 +3,9 @@
 
 include $(TOPDIR)/rules.mk
 
-${TOOLS_DIR}/mkcrypt:
-	$(HOSTCC) ${HOSTCFLAGS} -o $@ mkcrypt.c
-
 install: ${TOOLS_DIR}/mkcrypt
 
+${TOOLS_DIR}/mkcrypt:
+	$(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o $@ mkcrypt.c
+
 include $(TOPDIR)/mk/tools.mk