fix conflict

mk/build.mk

@@ -14,7 +14,7 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_STATIC=n \
 			ADK_LOCALES=n \
 			ADK_MAKE_PARALLEL=y \
-			ADK_MAKE_JOBS=1 \
+			ADK_MAKE_JOBS=4 \
 			ADK_USE_CCACHE=n \
 			ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER=n \
 			ADK_PACKAGE_GRUB=n \
@@ -555,11 +555,11 @@ bulkallmod:
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \
-		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
+		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system >.exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
 	      done; \
-	    if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
+	    if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \
 	  done <${TOPDIR}/target/arch.lst ;\
 	done
 

mk/modules.mk

@@ -940,8 +940,6 @@ $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
 ,10))
 
 $(eval $(call KMOD_template,CRYPTO_LZO,crypto-lzo,\
-    $(MODULES_DIR)/kernel/lib/lzo/lzo_compress \
-    $(MODULES_DIR)/kernel/lib/lzo/lzo_decompress \
     $(MODULES_DIR)/kernel/crypto/lzo \
 ,10))
 

package/apr/Makefile

@@ -44,7 +44,7 @@ else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
-post-build:
+pre-build:
 	# we need to patch paths to get apr-util compiling
 	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \
 		${WRKBUILD}/apr-1-config

package/cluster-glue/Makefile

@@ -14,6 +14,7 @@ PKG_URL:=		http://www.linux-ha.org/wiki/Cluster_Glue
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_CLUSTER_GLUE:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_HOST_DEPENDS:=	!darwin
 
 include $(TOPDIR)/mk/package.mk
 

package/dnsmasq/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dnsmasq
-PKG_VERSION:=		2.55
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		b093d7c6bc7f97ae6fd35d048529232a
+PKG_VERSION:=		2.57
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d10faeb409717eae94718d7716ca63a4
 PKG_DESCR:=		A lightweight DNS and DHCP server
 PKG_SECTION:=		dns
 PKG_URL:=		http://thekelleys.org.uk/dnsmasq/
@@ -20,7 +20,7 @@ CONFIG_STYLE:=		manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnsmasq ${IDIR_DNSMASQ}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnsmasq ${IDIR_DNSMASQ}/usr/sbin
 	${INSTALL_DATA} ./files/dnsmasq.conf ${IDIR_DNSMASQ}/etc/dnsmasq.conf
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/dropbear/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dropbear
-PKG_VERSION:=		0.52
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		1c69ec674481d7745452f68f2ea5597e
+PKG_VERSION:=		0.53.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		6b8d901859d9b8a18e2f6bfe0a892a03
 PKG_DESCR:=		SSH 2 server/client designed for embedded systems
 PKG_SECTION:=		net/security
 PKG_URL:=		http://matt.ucc.asn.au/dropbear/

package/dropbear/patches/patch-Makefile_in

@@ -0,0 +1,23 @@
+--- dropbear-0.53.1.orig/Makefile.in	2011-03-02 14:23:34.000000000 +0100
++++ dropbear-0.53.1/Makefile.in	2011-08-02 20:34:28.000000000 +0200
+@@ -28,7 +28,7 @@ COMMONOBJS=dbutil.o buffer.o \
+ 		queue.o \
+ 		atomicio.o compat.o  fake-rfc2553.o 
+ 
+-SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \
++SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \
+ 		svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \
+ 		svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\
+ 		svr-tcpfwd.o svr-authpam.o
+@@ -75,9 +75,8 @@ AR=@AR@
+ RANLIB=@RANLIB@
+ STRIP=@STRIP@
+ INSTALL=@INSTALL@
+-CPPFLAGS=@CPPFLAGS@
+-CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
+-LIBS+=@LIBS@
++CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)
++LIBS+=@LIBS@ @CRYPTLIB@
+ LDFLAGS=@LDFLAGS@
+ 
+ EXEEXT=@EXEEXT@

package/dropbear/patches/patch-cli-runopts_c

@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dropbear-0.52.orig/cli-runopts.c	2008-11-11 15:09:02.000000000 +0100
-+++ dropbear-0.52/cli-runopts.c	2009-03-19 19:20:16.000000000 +0100
-@@ -271,6 +271,10 @@ void cli_getopts(int argc, char ** argv)
+--- dropbear-0.53.1.orig/cli-runopts.c	2011-03-02 14:23:35.000000000 +0100
++++ dropbear-0.53.1/cli-runopts.c	2011-08-02 20:03:12.000000000 +0200
+@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv)
  					debug_trace = 1;
  					break;
  #endif
@@ -12,7 +12,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  				case 'F':
  				case 'e':
  				case 'c':
-@@ -282,7 +286,6 @@ void cli_getopts(int argc, char ** argv)
+@@ -298,7 +302,6 @@ void cli_getopts(int argc, char ** argv)
  #ifndef ENABLE_CLI_LOCALTCPFWD
  				case 'L':
  #endif

package/dropbear/patches/patch-options_h

@@ -1,20 +1,8 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dropbear-0.52.orig/options.h	2008-11-11 15:13:50.000000000 +0100
-+++ dropbear-0.52/options.h	2010-03-14 23:30:26.277667006 +0100
-@@ -10,6 +10,11 @@
-  * parts are to allow for commandline -DDROPBEAR_XXX options etc.
-  ******************************************************************/
- 
-+#if !defined(DROPBEAR_CLIENT) && !defined(DROPBEAR_SERVER)
-+#define DROPBEAR_SERVER
-+#define DROPBEAR_CLIENT
-+#endif
-+
- #ifndef DROPBEAR_DEFPORT
- #define DROPBEAR_DEFPORT "22"
+--- dropbear-0.53.1.orig/options.h	2011-03-02 14:23:36.000000000 +0100
++++ dropbear-0.53.1/options.h	2011-08-02 20:03:13.000000000 +0200
+@@ -144,7 +144,7 @@ much traffic. */
  #endif
-@@ -129,7 +134,7 @@ etc) slower (perhaps by 50%). Recommende
- /* #define DSS_PROTOK */
  
  /* Whether to do reverse DNS lookups. */
 -#define DO_HOST_LOOKUP
@@ -22,11 +10,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  /* Whether to print the message of the day (MOTD). This doesn't add much code
   * size */
-@@ -220,7 +225,7 @@ etc) slower (perhaps by 50%). Recommende
+@@ -236,7 +236,7 @@ much traffic. */
  /* The command to invoke for xauth when using X11 forwarding.
   * "-q" for quiet */
  #ifndef XAUTH_COMMAND
--#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
+-#define XAUTH_COMMAND "/usr/bin/X11/xauth -q"
 +#define XAUTH_COMMAND "/usr/bin/xauth -q"
  #endif
  

package/dropbear/patches/patch-svr-main_c

@@ -1,15 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-
- * bzero is obsolete, use memset
-
---- dropbear-0.52.orig/svr-main.c	2008-11-11 15:09:03.000000000 +0100
-+++ dropbear-0.52/svr-main.c	2009-05-23 16:13:30.569366604 +0200
-@@ -133,7 +133,7 @@ void main_noinetd() {
- 	for (i = 0; i < MAX_UNAUTH_CLIENTS; i++) {
- 		childpipes[i] = -1;
- 	}
--	bzero(preauth_addrs, sizeof(preauth_addrs));
-+	memset(preauth_addrs, 0, sizeof(preauth_addrs));
- 	
- 	/* Set up the listening sockets */
- 	listensockcount = listensockets(listensocks, MAX_LISTEN_ADDR, &maxsock);

package/firefox/Makefile

@@ -19,8 +19,9 @@ PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips native
+PKG_ARCH_DEPENDS:=	x86 x86_64 native
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
+PKG_SYSTEM_DEPENDS:=	ibm-x40
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
 WRKDIST=		${WRKDIR}/mozilla-release
@@ -78,6 +79,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-mathml \
 			--disable-jemalloc \
 			--disable-crashreporter \
+			--disable-libjpeg-turbo \
 			--disable-elf-hack
 
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)

package/firefox/patches/patch-xpcom_ds_nsMathUtils_h

@@ -0,0 +1,11 @@
+--- mozilla-release.orig/xpcom/ds/nsMathUtils.h	2011-07-08 03:15:44.000000000 +0200
++++ mozilla-release/xpcom/ds/nsMathUtils.h	2011-08-01 14:40:58.343424403 +0200
+@@ -170,7 +170,7 @@ inline NS_HIDDEN_(bool) NS_finite(double
+     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
+     return !!_finite(d);
+ #else
+-    return finite(d);
++    return isfinite(d);
+ #endif
+ }
+ 

package/llvm/Makefile

@@ -13,6 +13,7 @@ PKG_URL:=		http://llvm.org/
 PKG_SITES:=		http://llvm.org/releases/2.9/
 
 PKG_CFLINE_LLVM:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_HOST_DEPENDS:=	!darwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tgz
 

package/mksh/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mksh
-PKG_VERSION:=		39c
+PKG_VERSION:=		40b
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0c3cd172b47eefcdf9a302baa42f5092
+PKG_MD5SUM:=		afb08b65272ace550ec59b26a876a7de
 PKG_DESCR:=		MirBSD Korn Shell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.mirbsd.org/

package/openjdk/Makefile

@@ -24,7 +24,8 @@ PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 			http://icedtea.classpath.org/download/drops/ \
 			http://icedtea.classpath.org/download/source/
 
-#PKG_CFLINE_OPENJDK:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+PKG_CFLINE_OPENJDK:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+PKG_HOST_DEPENDS:=	!darwin !cygwin !openbsd !netbsd !freebsd
 
 # autotools infrastructure for OpenJDK
 ICEDTEA_NAME:=		icedtea6

package/openssh/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
-PKG_VERSION:=		5.6p1
+PKG_VERSION:=		5.8p2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e6ee52e47c768bf0ec42a232b5d18fb0
+PKG_MD5SUM:=		0541579adf9d55abb15ef927048d372e
 PKG_DESCR:=		OpenSSH
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		zlib libopenssl libpthread

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

@@ -1,14 +0,0 @@
-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/pacemaker/Makefile

@@ -14,6 +14,7 @@ PKG_URL:=		http://www.clusterlabs.org/
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_PACEMAKER:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_HOST_DEPENDS:=	!darwin
 
 include $(TOPDIR)/mk/package.mk
 

package/pcrepp/Makefile

@@ -19,15 +19,15 @@ PKG_CXX:=		pcrepp
 PKG_CFLINE_PCREPP:=	depends on ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC
 
 DISTFILES:=		pcre++-${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/pcre++-${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PCREPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-extract:
-	mv ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}/pcre++-${PKG_VERSION} ${WRKBUILD}
-
 post-install:
-	${CP} ${WRKINST}/* ${WRKINST}/../pkg-${PKG_NAME}
+	$(INSTALL_DIR) $(IDIR_PCREPP)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libpcre++.so* \
+		$(IDIR_PCREPP)/usr/lib
 	
 include ${TOPDIR}/mk/pkg-bottom.mk

package/pcrepp/patches/patch-Makefile_in

@@ -1,6 +1,6 @@
---- pcrepp-0.9.5.orig/Makefile.in	2011-05-13 10:25:39.126696935 +0200
-+++ pcrepp-0.9.5/Makefile.in	2011-05-13 10:18:08.619616044 +0200
-@@ -77,7 +77,7 @@
+--- pcre++-0.9.5.orig/Makefile.in	2004-08-25 01:38:03.000000000 +0200
++++ pcre++-0.9.5/Makefile.in	2011-08-05 07:28:46.000000000 +0200
+@@ -77,7 +77,7 @@ RANLIB = @RANLIB@
  STRIP = @STRIP@
  VERSION = @VERSION@
  

package/pcrepp/patches/patch-configure

@@ -0,0 +1,20 @@
+--- pcre++-0.9.5.orig/configure	2004-08-25 01:38:03.000000000 +0200
++++ pcre++-0.9.5/configure	2011-08-05 07:30:53.000000000 +0200
+@@ -8612,7 +8612,7 @@ if test "x$with_pcre_include" = "x"; the
+ 			CPPFLAGS="$CPPFLAGS -I/include"
+ 			;;
+ 	*-*-linux*)
+-			CPPFLAGS="$CPPFLAGS `pcre-config --cflags` -I/usr/include -I/usr/local/include"
++			CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
+ 			;;
+ 	*-*-freebsd*)
+ 			CPPFLAGS="$CPPFLAGS `pcre-config --cflags` -I/usr/local/include"
+@@ -8621,7 +8621,7 @@ if test "x$with_pcre_include" = "x"; the
+ 			CPPFLAGS="$CPPFLAGS `pcre-config --cflags` -I$prefix/include -I/usr/local/include"
+ 			;;
+ 	*)
+-			CPPFLAGS="-I/usr/include -I/usr/local/include"
++			CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
+ 			;;
+    esac
+ fi

package/qemu/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		qemu
-PKG_VERSION:=		0.14.0
+PKG_VERSION:=		0.14.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f9d145d5c09de9f0984ffe9bd1229970
+PKG_MD5SUM:=		b6c713a8db638e173af53a62d5178640
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		zlib libsdl
@@ -23,7 +23,6 @@ $(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIG_STYLE:=		minimal
 CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
-			--disable-user \
 			--prefix=/usr \
 			--sysconfdir=/etc \
 			--bindir=/usr/bin

package/resource-agents/Makefile

@@ -13,6 +13,7 @@ PKG_URL:=		https://github.com/ClusterLabs/resource-agents
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_RESOURCE_AGENTS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_HOST_DEPENDS:=	!darwin
 
 include $(TOPDIR)/mk/package.mk
 

target/config/Config.in

@@ -230,6 +230,9 @@ config ADK_CPU_I686
 config ADK_CPU_GEODE
 	boolean
 
+config ADK_CPU_PPC
+	boolean
+
 config ADK_CPU_PENTIUM_M
 	boolean
 
@@ -257,6 +260,7 @@ config ADK_TARGET_CPU_ARCH
 	default "arm" if ADK_LINUX_ARM && ADK_little
 	default "armeb" if ADK_LINUX_ARM && ADK_big
 	default "sparc" if ADK_LINUX_SPARC
+	default "powerpc" if ADK_CPU_PPC
 
 config ADK_TARGET_ABI_CFLAGS
 	string

target/linux/config/Config.in.bluetooth

@@ -78,7 +78,7 @@ config ADK_KPACKAGE_KMOD_BT_HIDP
 	  Interface Device Profile.
 
 config ADK_KPACKAGE_KMOD_BT_HCIBTUSB
-	prompt "kmod-bt-hci-usb............ HCI USB driver"
+	prompt "kmod-bt-hcibtusb.......... HCI USB driver"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -89,7 +89,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIBTUSB
 	  USB interface.
 
 config ADK_KPACKAGE_KMOD_BT_HCIUART
-	prompt "kmod-bt-hci-uart........... HCI UART driver"
+	prompt "kmod-bt-hciuart........... HCI UART driver"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -101,13 +101,13 @@ config ADK_KPACKAGE_KMOD_BT_HCIUART
 	  adapter and BrainBoxes Bluetooth PC Card.
 
 config ADK_KPACKAGE_KMOD_BT_HCIBCM203X
-	prompt "kmod-bt-hci-bcm203x........ HCI BCM203x USB driver"
+	prompt "kmod-bt-hcibcm203x........ HCI BCM203x USB driver"
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_FW_LOADER
 	select ADK_KPACKAGE_KMOD_BT_HCIBTUSB
 	depends on ADK_KPACKAGE_KMOD_BT
-	depends on ADK_LINUX_X86 || ADK_LINUX_X86_64
+	depends on ADK_TARGET_WITH_USB
 	help
 	  Bluetooth HCI BCM203x USB driver.
 	  This driver provides the firmware loading mechanism for the Broadcom

target/linux/config/Config.in.misc

@@ -111,6 +111,7 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6
 	prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support"
 	tristate
 	depends on ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KERNEL_MISC_DEVICES
  	default n
  	help
  

target/linux/config/Config.in.nls

@@ -2,30 +2,16 @@ menu "Native Language support"
 
 config ADK_KERNEL_NLS
 	boolean
-	default y if ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	default y if ADK_TARGET_SYSTEM_FOXBOARD_LX416
-	default n
+	default y
 
 config ADK_KERNEL_NLS_DEFAULT
 	string
 	default "iso8859-1"
 
-config ADK_KPACKAGE_KMOD_NLS
-	prompt "kmod-nls.......................... Base native language support"
-	tristate
-	depends on !ADK_KERNEL_NLS
-	default n
-	help
-	  The base Native Language Support. A number of filesystems
-	  depend on it (e.g. FAT, JOLIET, NT, BEOS filesystems), as well
-	  as the ability of some filesystems to use native languages
-	  (NCP, SMB).
-
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437
 	prompt   "kmod-nls-codepage-437........... Codepage 437 (United States, Canada)"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored
@@ -40,7 +26,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_737
 	prompt   "kmod-nls-codepage-737........... Codepage 737 (Greek)"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored
@@ -55,7 +40,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_775
 	prompt   "kmod-nls-codepage-775........... Codepage 775 (Baltic Rim)"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored
@@ -71,7 +55,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
 	prompt   "kmod-nls-codepage-850........... Codepage 850 (Western European Languages)"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -88,7 +71,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_852
         prompt   "kmod-nls-codepage-852........... Codepage 852 (Eastern European Languages)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -106,7 +88,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_855
         prompt   "kmod-nls-codepage-855........... Codepage 855 (Cyrillic)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -120,7 +101,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_857
         prompt   "kmod-nls-codepage-857........... Codepage 857 (Turkish)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -134,7 +114,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_860
         prompt   "kmod-nls-codepage-860........... Codepage 860 (Portuguese)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -148,7 +127,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_861
         prompt   "kmod-nls-codepage-861........... Codepage 861 (Icelandic)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -162,7 +140,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_862
         prompt   "kmod-nls-codepage-862........... Codepage 862 (Hebrew)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -176,7 +153,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_863
         prompt   "kmod-nls-codepage-863........... Codepage 863 (French Canadian)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -191,7 +167,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_864
         prompt   "kmod-nls-codepage-864........... Codepage 864 (Arabic)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -205,7 +180,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_865
         prompt   "kmod-nls-codepage-865........... Codepage 865 (Norwegian, Danish)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -220,7 +194,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_866
         prompt   "kmod-nls-codepage-866........... Codepage 866 (Cyrillic/Russian)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -235,7 +208,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_869
         prompt   "kmod-nls-codepage-869........... Codepage 869 (Greek)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -249,7 +221,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_874
         prompt   "kmod-nls-codepage-874........... Codepage 874 (Thai)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -263,7 +234,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_932
         prompt   "kmod-nls-codepage-932........... Codepage 932 (Japanese)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -279,7 +249,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_936
         prompt   "kmod-nls-codepage-936........... Codepage 936 (Simplified Chinese)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -294,7 +263,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_949
         prompt   "kmod-nls-codepage-949........... Codepage 949 (Korean)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -308,7 +276,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_950
         prompt   "kmod-nls-codepage-950........... Codepage 950 (Traditional Chinese)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -323,7 +290,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1250
         prompt   "kmod-nls-codepage-1250.......... Codepage 1250 (Slavic/Central European)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CDROMs
@@ -337,7 +303,6 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1251
         prompt   "kmod-nls-codepage-1251.......... Codepage 1251 (Bulgarian, Belarusian)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -352,7 +317,6 @@ config ADK_KPACKAGE_KMOD_NLS_ASCII
 	prompt   "kmod-nls-ascii.................. ASCII (United States)"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  An ASCII NLS module is needed if you want to override the
 	  DEFAULT NLS with this very basic charset and don't want any
@@ -362,7 +326,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_1
 	prompt   "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin-1; Western European Languages)"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -377,7 +340,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_2
         prompt   "kmod-nls-iso8859-2.............. NLS ISO 8859-2 (Latin-2; Central European Languages)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -391,7 +353,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_3
         prompt   "kmod-nls-iso8859-3.............. NLS ISO 8859-3 (Latin-3; Esperanto, Galician, Maltese, Turkish)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -404,7 +365,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_4
         prompt   "kmod-nls-iso8859-4.............. NLS ISO 8859-4 (Latin-4; old Baltic charset)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -417,7 +377,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_5
         prompt   "kmod-nls-iso8859-5.............. NLS ISO 8859-5 (Cyrillic)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -431,7 +390,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_6
         prompt   "kmod-nls-iso8859-6.............. NLS ISO 8859-6 (Arabic)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -443,7 +401,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_7
         prompt   "kmod-nls-iso8859-7.............. NLS ISO 8859-7 (Greek)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -455,7 +412,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_8
         prompt   "kmod-nls-iso8859-8.............. NLS ISO 8859-8 (Hebrew)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -467,7 +423,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_9
         prompt   "kmod-nls-iso8859-9.............. NLS ISO 8859-9 (Latin-5; Turkish)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -480,7 +435,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_13
         prompt   "kmod-nls-iso8859-13............. NLS ISO 8859-13 (Latin-7; Baltic Rim)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -493,7 +447,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_14
         prompt   "kmod-nls-iso8859-14............. NLS ISO 8859-14 (Latin-8; Celtic)"
         tristate
         default n
-        select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
         help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -507,7 +460,6 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_15
 	prompt   "kmod-nls-iso8859-15............. NLS ISO 8859-15 (Latin-9; Western European Languages with Euro)"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -526,7 +478,6 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_R
 	prompt   "kmod-nls-koi8-r................. NLS KOI8-R (Cryllic for Russian and Bulgarian"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -538,7 +489,6 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_U
 	prompt   "kmod-nls-koi8-u................. NLS KOI8-U (Cyrillic for Russian, Bulgarian and Ukrainian"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -550,7 +500,6 @@ config ADK_KPACKAGE_KMOD_NLS_UTF8
 	prompt   "kmod-nls-utf8................... NLS UTF8"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs

target/mips/uclibc.config.big

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Version: 0.9.32-rc1
-# Mon Dec 27 23:04:46 2010
+# Version: 0.9.32
+# Mon Aug  1 15:10:02 2011
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -28,6 +28,7 @@ TARGET_mips=y
 # TARGET_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
+# TARGET_c6x is not set
 
 #
 # Target Architecture Features and Options
@@ -100,6 +101,7 @@ COMPAT_ATEXIT=y
 UCLIBC_SUSV3_LEGACY=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
 UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
@@ -208,6 +210,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
@@ -242,6 +245,7 @@ DOSTRIP=y
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
 # UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
 WARNINGS="-Wall"
 EXTRA_WARNINGS=y
 # DOMULTI is not set

target/mips/uclibc.config.little

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Version: 0.9.32-rc1
-# Fri Dec 31 11:58:18 2010
+# Version: 0.9.32
+# Mon Aug  1 15:09:09 2011
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -28,6 +28,7 @@ TARGET_mips=y
 # TARGET_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
+# TARGET_c6x is not set
 
 #
 # Target Architecture Features and Options
@@ -100,6 +101,7 @@ COMPAT_ATEXIT=y
 UCLIBC_SUSV3_LEGACY=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
 UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
@@ -208,6 +210,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
@@ -242,6 +245,7 @@ DOSTRIP=y
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
 # UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
 WARNINGS="-Wall"
 EXTRA_WARNINGS=y
 # DOMULTI is not set

target/ppc/sys-available/qemu-ppc

@@ -0,0 +1,13 @@
+config ADK_TARGET_SYSTEM_QEMU_PPC
+	bool "Qemu Emulator"
+	select ADK_ppc
+	select ADK_qemu_ppc
+	select ADK_CPU_PPC
+	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_PCI
+	select ADK_TARGET_WITH_HDD
+	help
+	 Support for Qemu Emulator (PPC).
+

target/x86/uclibc.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Version: 0.9.32-rc1
-# Mon Dec 27 22:42:21 2010
+# Version: 0.9.32
+# Thu Aug  4 13:48:06 2011
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -28,6 +28,7 @@ TARGET_i386=y
 # TARGET_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
+# TARGET_c6x is not set
 
 #
 # Target Architecture Features and Options
@@ -109,6 +110,7 @@ COMPAT_ATEXIT=y
 UCLIBC_SUSV3_LEGACY=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
 UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
@@ -217,6 +219,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
@@ -251,6 +254,7 @@ DOSTRIP=y
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
 # UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
 WARNINGS="-Wall"
 EXTRA_WARNINGS=y
 # DOMULTI is not set

target/x86_64/uclibc.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Version: 0.9.32-rc1
-# Mon Dec 27 23:00:03 2010
+# Version: 0.9.32
+# Thu Aug  4 13:48:45 2011
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -28,6 +28,7 @@
 # TARGET_vax is not set
 TARGET_x86_64=y
 # TARGET_xtensa is not set
+# TARGET_c6x is not set
 
 #
 # Target Architecture Features and Options
@@ -92,6 +93,7 @@ COMPAT_ATEXIT=y
 UCLIBC_SUSV3_LEGACY=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
 UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
@@ -200,6 +202,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
@@ -233,6 +236,7 @@ DOSTRIP=y
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
 # UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
 WARNINGS="-Wall"
 EXTRA_WARNINGS=y
 # DOMULTI is not set

tools/adk/pkgmaker.c

@@ -271,7 +271,7 @@ int main() {
 	char *pkg_name, *pkg_depends, *pkg_section, *pkg_descr, *pkg_url;
 	char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt, *pkg_multi;
 	char *pkg_need_cxx, *pkg_need_java, *pkgname;
-	char *pkg_host_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
+	char *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
 	char *packages, *pkg_name_u, *pkgs;
 	char *saveptr, *p_ptr, *s_ptr;
 	int result;
@@ -287,6 +287,7 @@ int main() {
 	pkg_choices = NULL;
 	pkg_subpkgs = NULL;
 	pkg_arch_depends = NULL;
+	pkg_system_depends = NULL;
 	pkg_host_depends = NULL;
 	pkg_cxx = NULL;
 	pkg_dflt = NULL;
@@ -397,6 +398,8 @@ int main() {
 						continue;
 					if ((parse_var(buf, "PKG_ARCH_DEPENDS", NULL, &pkg_arch_depends)) == 0)
 						continue;
+					if ((parse_var(buf, "PKG_SYSTEM_DEPENDS", NULL, &pkg_system_depends)) == 0)
+						continue;
 					if ((parse_var(buf, "PKG_DESCR", NULL, &pkg_descr)) == 0)
 						continue;
 					if ((parse_var(buf, "PKG_SECTION", NULL, &pkg_section)) == 0)
@@ -609,6 +612,23 @@ int main() {
 				}
 				memset(hkey, 0, MAXVAR);
 
+				/* create package target system dependency information */
+				if (pkg_system_depends != NULL) {
+					token = strtok(pkg_system_depends, " ");
+					fprintf(cfg, "\tdepends on ");
+					sp = "";
+					while (token != NULL) {
+						if(strncmp(token, "!", 1) == 0) {
+							fprintf(cfg, "%s!ADK_TARGET_SYSTEM%s", sp, toupperstr(token));
+							sp = " && ";
+						} else {
+							fprintf(cfg, "%sADK_TARGET_SYSTEM_%s", sp, toupperstr(token));
+							sp = " || ";
+						}
+						token = strtok(NULL, " ");
+					}
+					fprintf(cfg, "\n");
+				}
 				/* create package host dependency information */
 				if (pkg_host_depends != NULL) {
 					token = strtok(pkg_host_depends, " ");
@@ -880,6 +900,7 @@ int main() {
 			free(pkg_choices);
 			free(pkg_subpkgs);
 			free(pkg_arch_depends);
+			free(pkg_system_depends);
 			free(pkg_host_depends);
 			free(pkg_cxx);
 			free(pkg_dflt);
@@ -895,6 +916,7 @@ int main() {
 			pkg_choices = NULL;
 			pkg_subpkgs = NULL;
 			pkg_arch_depends = NULL;
+			pkg_system_depends = NULL;
 			pkg_host_depends = NULL;
 			pkg_cxx = NULL;
 			pkg_dflt = NULL;