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

Config.in

@@ -91,6 +91,9 @@ source "package/Config.in.auto.global"
 source "package/Config.in.auto"
 endmenu
 
+config ADK_USE_KERNEL_MINICONFIG
+	boolean
+
 choice
 prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
@@ -107,6 +110,10 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
+config ADK_KERNEL_VERSION_3_12_6
+	prompt "3.12.6"
+	boolean
+
 config ADK_KERNEL_VERSION_3_11_10
 	prompt "3.11.10"
 	boolean
@@ -119,6 +126,7 @@ endchoice
 
 config ADK_KERNEL_VERSION
 	string
+	default "3.12.6" if ADK_KERNEL_VERSION_3_12_6
 	default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
 	default "3.4.71" if ADK_KERNEL_VERSION_3_4_71
 	help

Makefile

@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 _UNLIMIT=	__limit=$$(ulimit -dH 2>/dev/null); \
-		test -n "$$__limit" && ulimit -dS $$__limit;
+		test -n "$$__limit" && ulimit -Sd $$__limit;
 
 all: checkreloc .prereq_done
 	@${_UNLIMIT} ${GMAKE_INV} all

README

@@ -23,7 +23,6 @@ Before you can start you need to install some tools:
 - ncurses5 headers
 - zlib headers
 - perl
-- bc
 - xargs
 
 There is a check for the required versions of these tools in advance, though.

TODO

@@ -1,7 +1,6 @@
+- add grsec kernel patch
+- microblaze: add cfgfs partition to dts, add partition to spartan dts
 - use host-tools infrastructure for openjdk7
-- remove openjdk6
 - evaluate libguestfs for image creation
-- add grsec kernel patch
 - check for gcc and SSP again
-- port full blown perl
 - port w3m

jtools/Makefile

@@ -4,13 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 TARGETS:=
-ifneq ($(ADK_PACKAGE_OPENJDK),)
 # jikes is for ant
-TARGETS+=fastjar gcj ecj jikes classpath jamvm ant openjdk qemu
-endif
 ifneq ($(ADK_PACKAGE_OPENJDK7),)
-# jikes is for ant
-TARGETS+=fastjar gcj ecj jikes classpath jamvm ant openjdk7
+TARGETS:=fastjar gcj ecj jikes classpath jamvm ant openjdk7
 endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))

jtools/openjdk/Makefile

@@ -1,96 +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:=		openjdk
-PKG_VERSION:=		6
-PKG_EXTRAVER:=		b22-28_feb_2011
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		2d2bbbb0f9b81f1fec41ec730da8a933 \
-			fd3f35e8a8a2ef9a64c035ed66cea06d \
-			ef7a8b3624ea904bf584bc46d79b5e75 \
-			bc95c133620bd68c161cac9891592901 \
-			91adfd41e6f001add4f92ae31216b1e3 \
-			d526d0848c88607ce4e3a0a4edb75d50
-PKG_DESCR:=		OpenJDK Java VM
-PKG_SECTION:=		lang
-PKG_URL:=		http://openjdk.org/
-PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
-			http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
-			http://icedtea.classpath.org/download/drops/ \
-			http://icedtea.classpath.org/download/source/
-
-# autotools infrastructure for OpenJDK
-ICEDTEA_NAME:=		icedtea6
-ICEDTEA_VERSION:=	1.10
-
-# bootstrap JARs
-XALAN_NAME=		xalan-j
-XALAN_VERSION=		2_7_0
-
-# override generic extraction
-EXTRACT_OVERRIDE:=	1
-DISTFILES:=		openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
-			$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \
-			jaxp144_01.zip \
-			jdk6-jaf-b20.zip \
-			jdk6-jaxws-b20.zip \
-			${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
-
-WRKDIST=		${WRKDIR}
-WRKSRC=			${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
-
-include ../rules.mk
-
-OPENJDK_NATIVE_ENV+=	JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar"
-OPENJDK_NATIVE_ENV+=	DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_NATIVE_ENV+=	LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_NATIVE_ENV+=	ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj PATH=$$PATH:$(STAGING_JAVA_HOST_DIR)/usr/bin
-OPENJDK_NATIVE_ENV+=	BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip"
-
-install: ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java
-
-do-extract:
-$(WRKDIST)/.extract: $(WRKDIST)/.extract_done
-	cd ${WRKDIST}; mkdir openjdk-$(PKG_VERSION); \
-		tar xzf $(TOPDIR)/dl/openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C openjdk-$(PKG_VERSION)
-	cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
-	cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
-	mkdir -p ${WRKBUILD}/drops
-	cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops
-	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/openjdk.patch
-	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch
-	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch
-	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/linux3.patch
-	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/disable-backtrace.patch
-	touch $@
-
-$(WRKDIST)/.configured: ${WRKDIST}/.extract
-	cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-	export ${OPENJDK_NATIVE_ENV}; ./configure \
-		--enable-bootstrap \
-		--enable-zero \
-		--disable-openjdk-cross-compilation \
-		--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
-		--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
-		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \
-		--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
-		--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
-		--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar \
-		--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
-		--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
-		--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
-		--without-rhino \
-		--disable-docs
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	export ${OPENJDK_NATIVE_ENV}; $(MAKE) -C $(WRKBUILD)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java: $(WRKBUILD)/.compiled
-	$(CP) $(WRKSRC)/openjdk.build/j2sdk-image $(STAGING_JAVA_HOST_DIR)/bootstrap-jdk
-	touch $@
-
-include ${TOPDIR}/mk/pkg-bottom.mk

jtools/openjdk/patches/disable-backtrace.patch

@@ -1,24 +0,0 @@
-
- uClibc does not have backtrace support right now. Disable it for now.
-
---- openjdk-6.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-02-28 17:06:50.000000000 +0100
-+++ openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-08-08 10:45:01.445330729 +0200
-@@ -27,9 +27,6 @@
- #include <X11/Xutil.h>
- #include <X11/Xos.h>
- #include <X11/Xatom.h>
--#ifdef __linux__
--#include <execinfo.h>
--#endif
- 
- #include <jvm.h>
- #include <jni.h>
-@@ -689,7 +686,7 @@
-     return ret;
- }
- 
--#ifdef __linux__
-+#if 0
- void print_stack(void)
- {
-   void *array[10];

jtools/openjdk/patches/iconv.patch

@@ -1,36 +0,0 @@
-
- add required linker flags.
-
---- openjdk-6.orig/jdk/make/java/instrument/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/instrument/Makefile	2011-04-11 23:14:27.571411016 +0200
-@@ -123,6 +123,8 @@
- # We don't want to link against -ljava
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- #
- # Add to ambient vpath so we pick up the library files
- #
---- openjdk-6.orig/jdk/make/java/npt/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ openjdk-6/jdk/make/java/npt/Makefile	2011-04-11 23:14:07.017670197 +0200
-@@ -65,6 +65,8 @@
- # We don't want to link against -ljava
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- # Add -export options to explicitly spell exported symbols
- ifeq ($(PLATFORM), windows)
-   OTHER_LCF += -export:nptInitialize -export:nptTerminate
---- openjdk-6.orig/jdk/make/sun/splashscreen/Makefile	2011-02-28 17:06:12.000000000 +0100
-+++ openjdk-6/jdk/make/sun/splashscreen/Makefile	2011-04-11 23:15:07.221411030 +0200
-@@ -55,6 +55,8 @@
- 
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- #
- # C Flags
- #

jtools/openjdk/patches/linux3.patch

@@ -1,11 +0,0 @@
---- openjdk-6.orig/hotspot/make/linux/Makefile	2011-02-28 17:03:13.000000000 +0100
-+++ openjdk-6/hotspot/make/linux/Makefile	2012-03-27 22:44:07.897199377 +0200
-@@ -230,7 +230,7 @@
- # Solaris 2.5.1, 2.6).
- # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
- 
--SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
-+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3.0% 3.1% 3.2% 3.3%
- OS_VERSION := $(shell uname -r)
- EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
- 

jtools/openjdk/patches/openjdk.patch

@@ -1,37 +0,0 @@
-
-use precompiled ecj.
-
---- openjdk-6.orig/Makefile	2011-02-28 17:02:07.000000000 +0100
-+++ openjdk-6/Makefile	2011-04-06 19:47:19.261818496 +0200
-@@ -25,9 +25,7 @@
- 
- BUILD_PARENT_DIRECTORY=.
- 
--ifndef TOPDIR
--  TOPDIR:=.
--endif
-+TOPDIR:=.
- 
- ifndef JDK_TOPDIR
-   JDK_TOPDIR=$(TOPDIR)/jdk
---- icedtea6-1.10.orig/Makefile.in	2011-03-02 20:48:45.161291458 +0100
-+++ icedtea6-1.10/Makefile.in	2011-04-06 20:10:40.581819545 +0200
-@@ -1643,10 +1643,14 @@
- 
- stamps/native-ecj.stamp: 
- 	mkdir -p stamps ; \
--	if test "x$(GCJ)" != "xno"; then \
--	  $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
--	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
--	fi ; \
-+	if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
-+		ln -s "${ADK_ECJ}" native-ecj; \
-+	else \
-+		if test "x$(GCJ)" != "xno"; then \
-+		  $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-+		    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
-+		fi ; \
-+	fi; \
- 	touch stamps/native-ecj.stamp
- 
- clean-native-ecj:

jtools/openjdk/patches/remove-libnsl.patch

@@ -1,72 +0,0 @@
-
- remove libnsl from linking.
-
---- openjdk-6.orig/jdk/make/java/hpi/hpi_common.gmk	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/hpi/hpi_common.gmk	2011-04-10 20:05:01.417672476 +0200
-@@ -86,5 +86,5 @@
- # Things that must be linked in.
- #
- ifneq ($(PLATFORM), windows)
--OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
-+OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl
- endif
---- openjdk-6.orig/jdk/make/java/java/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/java/Makefile	2011-04-10 20:05:20.637673621 +0200
-@@ -205,7 +205,7 @@
- OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
- 		       -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
- else
--OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
-+OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \
- 		-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
- endif
- 
---- openjdk-6.orig/jdk/make/java/net/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/net/Makefile	2011-04-10 20:05:39.537672169 +0200
-@@ -97,7 +97,7 @@
-   # Will not compile at warning level 3 if warnings are fatal
-   COMPILER_WARNINGS_FATAL=false
- else
--  OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
-+  OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB)
- endif
- ifeq ($(PLATFORM), linux)
-   OTHER_LDLIBS += -lpthread
---- openjdk-6.orig/jdk/make/jpda/transport/socket/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ openjdk-6/jdk/make/jpda/transport/socket/Makefile	2011-04-10 20:06:06.037672449 +0200
-@@ -42,11 +42,11 @@
- endif
- 
- ifeq ($(PLATFORM), linux)
--  OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
-+  OTHER_LDLIBS += $(LIBSOCKET) -lpthread
- endif
- 
- ifeq ($(PLATFORM), solaris)
--  OTHER_LDLIBS += -lnsl $(LIBSOCKET)
-+  OTHER_LDLIBS += $(LIBSOCKET)
- endif
- 
- ifeq ($(PLATFORM), windows)
---- openjdk-6.orig/jdk/make/java/java_hprof_demo/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/java_hprof_demo/Makefile	2011-04-10 20:28:43.287672398 +0200
-@@ -83,7 +83,7 @@
- ifeq ($(PLATFORM), windows)
-   OTHER_LDLIBS += wsock32.lib winmm.lib
- else
--  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
-+  OTHER_LDLIBS += $(LIBSOCKET) -ldl
- endif
- 
- #
---- openjdk-6.orig/jdk/make/mkdemo/jvmti/hprof/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile	2011-04-11 10:23:11.538911604 +0200
-@@ -42,7 +42,7 @@
-   OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
- endif
- ifeq ($(PLATFORM), linux)
--  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread
-+  OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread
- endif
- 
- #

mk/build.mk

@@ -18,6 +18,7 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_SIMPLE_NETWORK_CONFIG=n \
 			ADK_USE_CCACHE=n \
 			ADK_TOOLCHAIN_GDB=n \
+			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_E2FSCK_STATIC=n \
 			ADK_PACKAGE_KEXECINIT=n \
 			ADK_PACKAGE_INSTALLER=n \
@@ -25,16 +26,13 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
 			ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \
-			ADK_PACKAGE_OPENJDK=n \
 			ADK_PACKAGE_OPENJDK7=n \
 			ADK_PACKAGE_CLASSPATH=n \
 			ADK_PACKAGE_GRUB=n \
-			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_CRYPTINIT=n \
 			ADK_PACKAGE_PAM=n \
 			ADK_PACKAGE_VIRTINST=n \
 			ADK_PACKAGE_URLGRABBER=n \
-			ADK_PACKAGE_PERL=n \
 			ADK_PACKAGE_LIBSSP=n \
 			ADK_PACKAGE_OPENAFS=n \
 			ADK_PKG_XORG=n \
@@ -100,7 +98,7 @@ POSTCONFIG=		-@\
 			touch .rebuild.busybox;\
 			rebuild=1;\
 		fi; \
-		for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE;do \
+		for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE ADK_TARGET_QEMU_MICROBLAZE_MODEL;do \
 			if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
 				touch .rebuild.base-files;\
 				rebuild=1;\

mk/image.mk

@@ -119,6 +119,7 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_FS}-kernel
 INITRAMFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
 ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
+ROOTFSJFFS2=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-jffs2.img
 ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
 ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
 ROOTFSISO=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
@@ -126,6 +127,7 @@ else
 TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel
 INITRAMFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
 ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
+ROOTFSJFFS2=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-jffs2.img
 ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
 ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
 ROOTFSISO=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
@@ -161,41 +163,76 @@ ${BIN_DIR}/${INITRAMFS}: ${BIN_DIR}/${INITRAMFS}_list
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
 	${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \
-		${BUILD_DIR}/root.squashfs \
+		${BUILD_DIR}/root.squashfs -comp xz \
 		-nopad -noappend -root-owned $(MAKE_TRACE)
 
+${BIN_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
+	${STAGING_HOST_DIR}/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \
+		--pad=$(ADK_TARGET_MTD_SIZE) -o ${BIN_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
+
 createinitramfs: ${BIN_DIR}/${INITRAMFS}_list
 	${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \
 		${LINUX_DIR}/.config
 	( \
 		echo "CONFIG_BLK_DEV_INITRD=y"; \
 		echo 'CONFIG_INITRAMFS_SOURCE="${BIN_DIR}/${INITRAMFS}_list"'; \
-		echo 'CONFIG_INITRAMFS_COMPRESSION_NONE is not set' >> ${LINUX_DIR}/.config; \
+		echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set' >> ${LINUX_DIR}/.config; \
+		echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> ${LINUX_DIR}/.config; \
+		echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> ${LINUX_DIR}/.config; \
 	) >> ${LINUX_DIR}/.config
 ifeq ($(ADK_KERNEL_COMP_XZ),y)
+		echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_XZ=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_XZ=y" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_X86=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_POWERPC=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_IA64=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_ARM=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_ARMTHUMB=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_SPARC=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_TEST=n" >> ${LINUX_DIR}/.config
 endif
 ifeq ($(ADK_KERNEL_COMP_LZMA),y)
+		echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_LZMA=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_LZMA=y" >> ${LINUX_DIR}/.config
 endif
 ifeq ($(ADK_KERNEL_COMP_LZO),y)
+		echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_LZO=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_LZO=y" >> ${LINUX_DIR}/.config
 endif
 ifeq ($(ADK_KERNEL_COMP_GZIP),y)
+		echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_GZIP=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_GZIP=y" >> ${LINUX_DIR}/.config
 endif
 ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
+		echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
 endif
 	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null
-	echo N | \
-	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} oldconfig $(MAKE_TRACE) 
 	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
 

mk/kernel-build.mk

@@ -35,8 +35,13 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK
 $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure
 	-for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done
+ifeq ($(ADK_USE_KERNEL_MINICONFIG),y)
+	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config
+	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
+else
 	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config
 	echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE)
+endif
 	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/.config
 

mk/kernel-vars.mk

@@ -5,7 +5,8 @@ KERNEL_MAKE_OPTS:=	-C "${LINUX_DIR}" V=1
 ifneq ($(ADK_NATIVE),y)
 KERNEL_MAKE_OPTS+=	CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
 			CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \
-			HOSTCFLAGS='${CFLAGS_FOR_BUILD}'
+			HOSTCFLAGS='${CFLAGS_FOR_BUILD}' \
+			CONFIG_SHELL='${SHELL}'
 endif
 ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y)
 ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \
@@ -23,4 +24,5 @@ ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \
 			-DBCM47XX_OVERRIDE_CFESIZE=0x40000
 endif
 
-KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}' PATH="$$PATH:${TOOLS_DIR}"
+KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}' \
+			PATH="${TOOLS_DIR}:$$PATH"

mk/kernel-ver.mk

@@ -4,6 +4,12 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
+ifeq ($(ADK_KERNEL_VERSION_3_12_6),y)
+KERNEL_VERSION:=	3.12.6
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
+KERNEL_RELEASE:=	1
+KERNEL_MD5SUM:=		ab2fcc368e20d804e77970196154fb9e
+endif
 ifeq ($(ADK_KERNEL_VERSION_3_11_10),y)
 KERNEL_VERSION:=	3.11.10
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)

mk/modules.mk

@@ -108,20 +108,36 @@ $(eval $(call KMOD_template,P54_USB,p54-usb,\
 
 $(eval $(call KMOD_template,RT2X00,rt2x00,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \
-	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \
 ,17))
 
+$(eval $(call KMOD_template,RT2X00_LIB_PCI,rt2x00pci,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \
+,18))
+
+$(eval $(call KMOD_template,RT2X00_LIB_USB,rt2x00usb,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00usb \
+,18))
+
 $(eval $(call KMOD_template,RT2400PCI,rt2400pci,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2400pci \
-,20, kmod-leds-class kmod-rt2x00))
+,20, kmod-leds-class kmod-rt2x00 rt2x00pci))
 
 $(eval $(call KMOD_template,RT2500PCI,rt2500pci,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2500pci \
-,20, kmod-leds-class kmod-rt2x00))
+,20, kmod-leds-class kmod-rt2x00 kmod-rt2x00pci))
+
+$(eval $(call KMOD_template,RT2800USB,rt2800usb,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2800lib \
+	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2800usb \
+,20, kmod-rt2x00 kmod-rt2x00usb))
 
 $(eval $(call KMOD_template,RT61PCI,rt61pci,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt61pci \
-,20, kmod-leds-class kmod-rt2x00))
+,20, kmod-leds-class kmod-rt2x00 rt2x00pci))
+
+$(eval $(call KMOD_template,RTL8192CU,rtl8192cu,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/rtl8192cu/8192cu \
+,20))
 
 #
 # Networking

mk/pkg-bottom.mk

@@ -151,7 +151,8 @@ endif
 	done
 	@for a in ${WRKINST}/usr/lib/pkgconfig/*.pc; do \
 		[[ -e $$a ]] || continue; \
-		sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \
+		sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," \
+		    -e "s,^prefix = .*,prefix = ${STAGING_TARGET_DIR}/usr," $$a > \
 		${STAGING_DIR}/usr/lib/pkgconfig/$$(basename $$a); \
 	done
 ifeq (,$(filter noremove,${PKG_OPTS}))
@@ -180,7 +181,7 @@ ifneq (,$(filter dev,${PKG_OPTS}))
 	done
 endif
 	@-cd ${WRKINST}; \
-	    if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \
+	    if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" ];then \
 	    find lib \( -name lib\*.so\* -o -name lib\*.a \) \
 	    	-exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
 		' fix this!' >&2 \; -quit 2>/dev/null; fi;\

mk/rootfs.mk

@@ -9,6 +9,7 @@ endif
 endef
 
 ifeq ($(ADK_HARDWARE_QEMU),y)
+MTDDEV:=	root=/dev/mtdblock0
 ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
 ROOTFS:=	root=/dev/sda1
 endif
@@ -50,6 +51,7 @@ $(eval $(call rootfs_template,initramfs,INITRAMFS))
 $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
 $(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS)))
 $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3))
+$(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2))
 $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init))
 $(eval $(call rootfs_template,encrypted,ENCRYPTED))
 $(eval $(call rootfs_template,iso,ISO))

mk/vars.mk

@@ -136,7 +136,6 @@ FLAGS_FOR_BUILD=	${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
 PATCH=			${BASH} $(SCRIPT_DIR)/patch.sh
 SED:=			sed -i -e
 LINUX_DIR:=		$(BUILD_DIR)/linux
-LINUX_HEADER_DIR:=	$(STAGING_DIR)/linux-header
 KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} KERNELVERSION="2.6" \
 			KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \
 			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \

package/DirectFB/Makefile

@@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		DirectFB
 PKG_VERSION:=		1.6.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_EXTRAVER:=		1.6-0
 PKG_MD5SUM:=		641e8e999c017770da647f9b5b890906
 PKG_DESCR:=		Thin graphic library for the Linux framebuffer devices
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libpng libjpeg libfreetype
-PKG_BUILDDEP:=		libpng jpeg freetype
+PKG_DEPENDS:=		libpng libjpeg-turbo libfreetype
+PKG_BUILDDEP:=		libpng libjpeg-turbo freetype
 PKG_URL:=		http://www.directfb.org/
 PKG_SITES:=		http://directfb.org/downloads/Core/DirectFB-1.6/
 PKG_LIBNAME:=		directfb

package/DirectFB/patches/patch-lib_direct_os_linux_glibc_system_c

@@ -0,0 +1,19 @@
+--- DirectFB-1.6.3.orig/lib/direct/os/linux/glibc/system.c	2013-01-18 15:57:11.000000000 +0100
++++ DirectFB-1.6.3/lib/direct/os/linux/glibc/system.c	2013-12-21 12:48:06.000000000 +0100
+@@ -33,6 +33,7 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <sys/syscall.h>
+ 
+ #include <linux/unistd.h>
+ 
+@@ -107,7 +108,7 @@ direct_tgkill( int tgid, int tid, int si
+ void
+ direct_trap( const char *domain, int sig )
+ {
+-     sigval_t val;
++     union sigval val;
+ 
+      D_LOG( Direct_Trap, VERBOSE, "Raising signal %d from %s...\n", sig, domain );
+ 

package/ImageMagick/Makefile

@@ -10,7 +10,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		8134257e3fbb43cc06fb32a6d725d3d0
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		multimedia
-PKG_BUILDDEP:=		libpng jpeg libtiff fontconfig libiconv-tiny libtool e2fsprogs
+PKG_BUILDDEP:=		libpng libjpeg-turbo libtiff fontconfig libiconv-tiny libtool e2fsprogs
 PKG_BUILDDEP+=		pango
 PKG_URL:=		http://www.imagemagick.org/
 PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/

package/MesaLib/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		MesaLib
 PKG_VERSION:=		9.2.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		df801a975045150790e10e2ccf32193f
 PKG_DESCR:=		MESA 3D graphics library
 PKG_SECTION:=		libs

package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h

@@ -0,0 +1,11 @@
+--- Mesa-9.2.2.orig/src/gallium/include/pipe/p_config.h	2013-10-18 00:26:23.000000000 +0200
++++ Mesa-9.2.2/src/gallium/include/pipe/p_config.h	2014-01-06 12:26:04.042469119 +0100
+@@ -126,7 +126,7 @@
+  * Endian detection.
+  */
+ 
+-#ifdef __GLIBC__
++#ifdef __linux__
+ #include <endian.h>
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN

package/alsa-lib/patches/patch-libtool

@@ -0,0 +1,177 @@
+--- alsa-lib-1.0.27.2.orig/libtool	2013-07-08 14:32:53.000000000 +0200
++++ alsa-lib-1.0.27.2/libtool	2013-12-30 17:42:30.000000000 +0100
+@@ -1,8 +1,8 @@
+-#! /bin/sh
++#! /bin/bash
+ 
+ # libtool - Provide generalized library-building support services.
+ # Generated automatically by config.status (alsa-lib) 1.0.27.2
+-# Libtool was configured on host alsa.alsa-project.org:
++# Libtool was configured on host helium:
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+@@ -40,7 +40,7 @@ available_tags=""
+ # ### BEGIN LIBTOOL CONFIG
+ 
+ # Whether or not to build static libraries.
+-build_old_libs=no
++build_old_libs=yes
+ 
+ # Which release of libtool.m4 was used?
+ macro_version=2.4.2
+@@ -56,7 +56,7 @@ pic_mode=default
+ fast_install=yes
+ 
+ # Shell to use when invoking shell scripts.
+-SHELL="/bin/sh"
++SHELL="/bin/bash"
+ 
+ # An echo program that protects backslashes.
+ ECHO="printf %s\\n"
+@@ -65,38 +65,38 @@ ECHO="printf %s\\n"
+ PATH_SEPARATOR=":"
+ 
+ # The host system.
+-host_alias=
+-host=x86_64-unknown-linux-gnu
++host_alias=i686-openadk-linux
++host=i686-openadk-linux-gnu
+ host_os=linux-gnu
+ 
+ # The build system.
+-build_alias=
+-build=x86_64-unknown-linux-gnu
++build_alias=x86_64-linux-gnu
++build=x86_64-pc-linux-gnu
+ build_os=linux-gnu
+ 
+ # A sed program that does not truncate output.
+-SED="/usr/bin/sed"
++SED="/home/wbx/ibmx40/scripts/sed"
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+ Xsed="$SED -e 1s/^X//"
+ 
+ # A grep program that handles long lines.
+-GREP="/usr/bin/grep"
++GREP="/bin/grep"
+ 
+ # An ERE matcher.
+-EGREP="/usr/bin/grep -E"
++EGREP="/bin/grep -E"
+ 
+ # A literal string matcher.
+-FGREP="/usr/bin/grep -F"
++FGREP="/bin/grep -F"
+ 
+ # A BSD- or MS-compatible name lister.
+-NM="/usr/bin/nm -B"
++NM="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-nm"
+ 
+ # Whether we need soft or hard links.
+ LN_S="ln -s"
+ 
+ # What is the maximum length of a command?
+-max_cmd_len=1572864
++max_cmd_len=3458764513820540925
+ 
+ # Object file suffix (normally "o").
+ objext=o
+@@ -120,7 +120,7 @@ to_host_file_cmd=func_convert_file_noop
+ to_tool_file_cmd=func_convert_file_noop
+ 
+ # An object symbol dumper.
+-OBJDUMP="objdump"
++OBJDUMP="i686-openadk-linux-objdump"
+ 
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method="pass_all"
+@@ -141,7 +141,7 @@ DLLTOOL="false"
+ sharedlib_from_linklib_cmd="printf %s\\n"
+ 
+ # The archiver.
+-AR="ar"
++AR="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ar"
+ 
+ # Flags to create an archive.
+ AR_FLAGS="cru"
+@@ -150,10 +150,10 @@ AR_FLAGS="cru"
+ archiver_list_spec="@"
+ 
+ # A symbol stripping program.
+-STRIP="strip"
++STRIP="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip"
+ 
+ # Commands used to install an old-style archive.
+-RANLIB="ranlib"
++RANLIB="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ranlib"
+ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib"
+ old_postuninstall_cmds=""
+ 
+@@ -161,10 +161,10 @@ old_postuninstall_cmds=""
+ lock_old_archive_extraction=no
+ 
+ # A C compiler.
+-LTCC="gcc"
++LTCC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc"
+ 
+ # LTCC compiler flags.
+-LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe -D_GNU_SOURCE"
++LTCFLAGS="-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -fno-unwind-tables -fno-asynchronous-unwind-tables -g3 -D_GNU_SOURCE"
+ 
+ # Take the output of nm and produce a listing of raw symbols and C names.
+ global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
+@@ -272,27 +272,27 @@ finish_eval=""
+ hardcode_into_libs=yes
+ 
+ # Compile-time system search path for libraries.
+-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.7.2 /usr/lib64 /lib64 "
++sys_lib_search_path_spec="/home/wbx/ibmx40/host_i686_musl_musl/lib/gcc/i686-openadk-linux-musl/4.7.3 /home/wbx/ibmx40/host_i686_musl_musl/i686-openadk-linux-musl/lib /home/wbx/ibmx40/target_i686_musl_musl/lib /home/wbx/ibmx40/target_i686_musl_musl/usr/lib "
+ 
+ # Run-time system search path for libraries.
+-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/mysql /usr/lib64/qt-3.3/lib "
++sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu "
+ 
+ # Whether dlopen is supported.
+ dlopen_support=yes
+ 
+ # Whether dlopen of programs is supported.
+-dlopen_self=yes
++dlopen_self=unknown
+ 
+ # Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=yes
++dlopen_self_static=unknown
+ 
+ # Commands to strip libraries.
+-old_striplib="strip --strip-debug"
+-striplib="strip --strip-unneeded"
++old_striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-debug"
++striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-unneeded"
+ 
+ 
+ # The linker used to build libraries.
+-LD="/usr/bin/ld -m elf_x86_64"
++LD="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ld"
+ 
+ # How to create reloadable object files.
+ reload_flag=" -r"
+@@ -302,7 +302,7 @@ reload_cmds="\$LD\$reload_flag -o \$outp
+ old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
+ 
+ # A language specific compiler.
+-CC="gcc"
++CC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc"
+ 
+ # Is the compiler the GNU compiler?
+ with_gcc=yes
+@@ -317,7 +317,7 @@ pic_flag=" -fPIC -DPIC"
+ wl="-Wl,"
+ 
+ # Compiler flag to prevent dynamic linking.
+-link_static_flag=""
++link_static_flag="-static"
+ 
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o="yes"

package/alsa-lib/patches/patch-utils_alsa_pc_in

@@ -0,0 +1,12 @@
+--- alsa-lib-1.0.27.2.orig/utils/alsa.pc.in	2013-07-08 14:31:36.000000000 +0200
++++ alsa-lib-1.0.27.2/utils/alsa.pc.in	2014-01-01 17:07:29.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=${prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: alsa
+ Description: Advanced Linux Sound Architecture (ALSA) - Library

package/asterisk/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
 PKG_VERSION:=		1.8.20.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		99204257de80a42c4e287fc93dfe714a
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		phone
@@ -18,6 +18,7 @@ PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
 PKG_ARCH_DEPENDS:=	!cris
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 PKG_SUBPKGS:=		ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
 PKG_SUBPKGS+=		ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM
@@ -101,7 +102,7 @@ endif
 
 INSTALL_STYLE:=		manual
 
-TARGET_LDFLAGS+=	-lm
+TARGET_LDFLAGS+=	-lm -ltinfo
 MAKE_ENV=		ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TARGET_LDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \

package/base-files/Makefile

@@ -72,10 +72,7 @@ endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC64),y)
 	$(SED) 's#ttyS#hvc#g' $(IDIR_BASE_FILES)/etc/inittab
 endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZE),y)
-	$(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab
-endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL),y)
+ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y)
 	$(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab
 endif
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab

package/base-files/src/etc/mdev.conf

@@ -10,11 +10,9 @@ rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
 device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper
 tun 0:0 660 >net/tun
 fb0 root:video 660
-audio root:audio 660 >snd/audio
-dsp root:audio 660 >snd/dsp
-timer root:audio 660 >snd/timer
-controlC0 root:audio 660 >snd/controlC0
-pcmC0D0c root:audio 660 >snd/pcmC0D0c
-pcmC0D0p root:audio 660 >snd/pcmC0D0p
+snd/timer root:audio 660
+snd/controlC0 root:audio 660
+snd/pcmC0D0c root:audio 660
+snd/pcmC0D0p root:audio 660
 msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr)
 .* 0:0 644 @/lib/mdev/init

package/bcm2835-firmware/Makefile

@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bcm2835-firmware
-# actually 5113ce63be622e50c1b3ec309798e5d091d219ac from 12.10.2013
-PKG_VERSION:=		0.4
+# actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014
+PKG_VERSION:=		0.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e7f4caa11f26d5af07ae45128b2ac328
+PKG_MD5SUM:=		0de84bd4fe70b7767026aef5313dd868
 PKG_DESCR:=		firmware for raspberry pi (bcm2835)
 PKG_SECTION:=		base
 PKG_SITES:=		http://openadk.org/distfiles/

package/bcm2835-vc/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		bcm2835-vc
 # actually f65a4eef05ee436976f9be219d3db841d3d6b8ec from 05.10.2013
 PKG_VERSION:=		0.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		027d42d1ba803fabdc6bc4ec78d52e67
 PKG_DESCR:=		vc tools for raspberry pi (bcm2835)
 PKG_SECTION:=		base
@@ -27,7 +27,7 @@ do-configure:
 
 bcm2835-vc-install:
 	$(INSTALL_DIR) ${IDIR_BCM2835_VC}/opt/vc/{bin,lib}
-	$(CP) ${WRKINST}/opt/vc/lib/* ${IDIR_BCM2835_VC}/opt/vc/lib
+	$(CP) ${WRKINST}/opt/vc/lib/*so* ${IDIR_BCM2835_VC}/opt/vc/lib
 	$(CP) ${WRKINST}/opt/vc/bin/* ${IDIR_BCM2835_VC}/opt/vc/bin
 	# required for xbmc
 	(cd ${IDIR_BCM2835_VC}/opt/vc/lib && ln -sf libEGL.so libEGL.so.1)

package/binutils/Makefile

@@ -41,9 +41,11 @@ CONFIGURE_ARGS+=	--disable-werror \
 else
 CONFIGURE_ARGS+=	--disable-werror
 endif
+# disable honour cflags stuff
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-pre-build:
-	@-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
+post-build:
+	$(CP) ${WRKBUILD}/libiberty/libiberty.a $(STAGING_TARGET_DIR)/usr/lib
 
 libbfd-install:
 	${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib

package/bluez-firmware/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1cc3cefad872e937e05de5a0a2b390dd
 PKG_DESCR:=		Bluez firmware for BCM2033
-PKG_SECTION:=		bluetooth
+PKG_SECTION:=		misc
 PKG_DEPENDS:=		kmod-bt bluez
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://bluez.sourceforge.net/download/

package/bluez/Makefile

@@ -4,47 +4,34 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.101
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		fb42cb7038c380eb0e2fa208987c96ad
+PKG_VERSION:=		5.12
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		981b34c2ae7e2ed2e25a167d8a902a25
 PKG_DESCR:=		bluetooth applications
-PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bt libbluetooth
+PKG_SECTION:=		misc	
+PKG_DEPENDS:=		kmod-bt glib dbus libreadline
+PKG_BUILDDEP:=		autotool glib dbus readline
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
-PKG_LIBNAME:=		libbluetooth
 PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		BLUEZ LIBBLUETOOTH
-PKGSC_LIBBLUETOOTH:=	libs
-PKGSD_LIBBLUETOOTH:=	bluetooth libraries
-PKGSS_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
-PKGSB_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
-
 PKG_ARCH_DEPENDS:=	!avr32
 
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=              libmix
-endif
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBLUETOOTH,libbluetooth,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBBLUETOOTH},${PKGSD_LIBBLUETOOTH},${PKGSC_LIBBLUETOOTH},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
 ifeq ($(ADK_STATIC),y)
 XAKE_FLAGS+=		CCLD="$(TARGET_CC) -all-static -pthread"
 endif
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+=	-lncurses
 CONFIGURE_ENV+=		ac_cv_prog_cc_pie=no
 CONFIGURE_ARGS+=	--enable-tools \
-			--enable-alsa \
-			--enable-usb \
-			--enable-bccmd \
-			--enable-hidd \
-			--enable-pand \
-			--enable-dund \
-			--enable-netlink \
+			--disable-udev \
+			--disable-systemd \
+			--disable-obex \
 			--disable-pie \
 			--disable-cups
 
@@ -52,16 +39,10 @@ bluez-install:
 	${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin
-	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/* ${IDIR_BLUEZ}/usr/sbin
 	${INSTALL_DIR} ${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/main.conf \
 		${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/bluetooth.conf \
 		$(IDIR_BLUEZ)/etc/dbus-1/system.d
 
-libbluetooth-install:
-	${INSTALL_DIR} ${IDIR_LIBBLUETOOTH}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_LIBBLUETOOTH}/usr/lib
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/bluez/patches/patch-Makefile_am

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/Makefile.am	2013-12-10 07:59:06.000000000 +0100
++++ bluez-5.12/Makefile.am	2013-12-21 20:18:52.000000000 +0100
+@@ -245,6 +245,7 @@ unit_tests += unit/test-sdp
+ 
+ unit_test_sdp_SOURCES = unit/test-sdp.c \
+ 				src/shared/util.h src/shared/util.c \
++				src/log.h src/log.c \
+ 				src/sdpd.h src/sdpd-database.c \
+ 				src/sdpd-service.c src/sdpd-request.c
+ unit_test_sdp_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@

package/bluez/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- bluez-5.12.orig/Makefile.in	2013-12-10 07:59:32.000000000 +0100
++++ bluez-5.12/Makefile.in	2013-12-21 20:02:59.000000000 +0100
+@@ -157,7 +157,7 @@ DIST_COMMON = README $(am__configure_dep
+ @ANDROID_TRUE@	android/bluetoothd android/haltest
+ @ANDROID_TRUE@am__append_30 = android/libhal-internal.la
+ @HID2HCI_TRUE@am__append_31 = $(rules_DATA)
+-TESTS = $(am__EXEEXT_8)
++TESTS = 
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \

package/bluez/patches/patch-plugins_wiimote_c

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/plugins/wiimote.c	2013-12-10 07:59:06.000000000 +0100
++++ bluez-5.12/plugins/wiimote.c	2013-12-21 19:29:22.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include <stdbool.h>
+ 
+ #include <bluetooth/bluetooth.h>
++#include <fcntl.h>
+ #include <glib.h>
+ 
+ #include "plugin.h"

package/bluez/patches/patch-profiles_network_bnep_c

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/profiles/network/bnep.c	2013-12-10 07:59:06.000000000 +0100
++++ bluez-5.12/profiles/network/bnep.c	2013-12-21 19:31:52.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/types.h>
+ #include <sys/wait.h>
+ #include <net/if.h>
+ #include <linux/sockios.h>

package/bluez/patches/patch-tools_bccmd_c

@@ -1,6 +1,6 @@
---- bluez-4.92.orig/tools/bccmd.c	2010-11-30 15:50:48.000000000 +0100
-+++ bluez-4.92/tools/bccmd.c	2011-05-17 18:19:30.856601139 +0200
-@@ -1183,6 +1183,7 @@ int main(int argc, char *argv[])
+--- bluez-5.12.orig/tools/bccmd.c	2013-09-16 10:36:07.000000000 +0200
++++ bluez-5.12/tools/bccmd.c	2013-12-21 19:19:21.000000000 +0100
+@@ -1159,6 +1159,7 @@ int main(int argc, char *argv[])
  			case 115200: bcsp_rate = B115200; break;
  			case 230400: bcsp_rate = B230400; break;
  			case 460800: bcsp_rate = B460800; break;
@@ -8,7 +8,7 @@
  			case 500000: bcsp_rate = B500000; break;
  			case 576000: bcsp_rate = B576000; break;
  			case 921600: bcsp_rate = B921600; break;
-@@ -1202,6 +1203,7 @@ int main(int argc, char *argv[])
+@@ -1178,6 +1179,7 @@ int main(int argc, char *argv[])
  #ifdef B4000000
  			case 4000000: bcsp_rate = B4000000; break;
  #endif

package/bluez/patches/patch-tools_csr_usb_c

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/tools/csr_usb.c	2013-09-16 10:36:07.000000000 +0200
++++ bluez-5.12/tools/csr_usb.c	2013-12-21 19:22:48.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>

package/bluez/patches/patch-tools_hciattach_c

@@ -1,6 +1,6 @@
---- bluez-4.92.orig/tools/hciattach.c	2010-11-30 15:50:48.000000000 +0100
-+++ bluez-4.92/tools/hciattach.c	2011-05-17 18:18:20.776610031 +0200
-@@ -107,6 +107,7 @@ static int uart_speed(int s)
+--- bluez-5.12.orig/tools/hciattach.c	2012-12-24 18:46:55.000000000 +0100
++++ bluez-5.12/tools/hciattach.c	2013-12-21 19:19:21.000000000 +0100
+@@ -101,6 +101,7 @@ static int uart_speed(int s)
  		return B230400;
  	case 460800:
  		return B460800;
@@ -8,7 +8,7 @@
  	case 500000:
  		return B500000;
  	case 576000:
-@@ -137,6 +138,7 @@ static int uart_speed(int s)
+@@ -135,6 +136,7 @@ static int uart_speed(int s)
  	case 4000000:
  		return B4000000;
  #endif

package/bluez/patches/patch-tools_hciconfig_c

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/tools/hciconfig.c	2013-10-15 15:41:07.000000000 +0200
++++ bluez-5.12/tools/hciconfig.c	2013-12-21 19:26:45.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <fcntl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>

package/bluez/patches/patch-unit_test-sdp_c

@@ -0,0 +1,15 @@
+--- bluez-5.12.orig/unit/test-sdp.c	2013-10-15 15:41:07.000000000 +0200
++++ bluez-5.12/unit/test-sdp.c	2013-12-21 20:23:50.000000000 +0100
+@@ -128,12 +128,6 @@ static void sdp_debug(const char *str, v
+ 	g_print("%s%s\n", prefix, str);
+ }
+ 
+-void btd_debug(const char *format, ...);
+-
+-void btd_debug(const char *format, ...)
+-{
+-}
+-
+ static void context_quit(struct context *context)
+ {
+ 	g_main_loop_quit(context->main_loop);

package/boost/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
-PKG_VERSION:=		1.54.0
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		efbfbff5a85a9330951f243d0a46e4b9
+PKG_VERSION:=		1.55.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		93780777cfbf999a600f62883bd54b17
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.boost.org/
@@ -15,8 +15,8 @@ PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!avr32 !m68k
 
-DISTFILES:=		boost_1_54_0.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}_1_54_0
+DISTFILES:=		boost_1_55_0.tar.gz
+WRKDIST=		${WRKDIR}/${PKG_NAME}_1_55_0
 
 PKG_FLAVOURS_BOOST:=	date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave
 
@@ -126,7 +126,10 @@ endif
 	( cd ${WRKBUILD}; \
 		${BJAM_PATH} \
 			-sBUILD=release \
+			-d 2 \
 			target-os=linux \
+			architecture=$(CPU_ARCH) \
+			binary-format=elf \
 			toolset=gcc-${GPP_VERSION} \
 			--build-type=minimal \
 			--layout=versioned \

package/boost/patches/patch-boost_cstdint_hpp

@@ -1,14 +0,0 @@
---- boost_1_54_0.orig/boost/cstdint.hpp	2013-03-09 23:55:05.000000000 +0100
-+++ boost_1_54_0/boost/cstdint.hpp	2013-09-19 16:46:42.000000000 +0200
-@@ -41,7 +41,10 @@
- // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
- // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
- //
--#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
-+#if defined(BOOST_HAS_STDINT_H)                                 \
-+  && (!defined(__GLIBC__)                                       \
-+      || defined(__GLIBC_HAVE_LONG_LONG)                        \
-+      || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
- 
- // The following #include is an implementation artifact; not part of interface.
- # ifdef __hpux

package/bridge-utils/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bridge-utils
 PKG_VERSION:=		1.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		ec7b381160b340648dede58c31bb2238
 PKG_DESCR:=		Ethernet bridging tools
 PKG_SECTION:=		bridge

package/bridge-utils/patches/patch-brctl_brctl_c

@@ -0,0 +1,13 @@
+--- bridge-utils-1.5.orig/brctl/brctl.c	2011-03-29 02:52:54.000000000 +0200
++++ bridge-utils-1.5/brctl/brctl.c	2013-12-27 20:58:33.000000000 +0100
+@@ -19,8 +19,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <getopt.h>
++#include <sys/types.h>
+ 
+ #include "libbridge.h"
+ #include "config.h"

package/bridge-utils/patches/patch-brctl_brctl_cmd_c

@@ -0,0 +1,10 @@
+--- bridge-utils-1.5.orig/brctl/brctl_cmd.c	2011-03-29 02:52:54.000000000 +0200
++++ bridge-utils-1.5/brctl/brctl_cmd.c	2013-12-27 20:59:48.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include <errno.h>
+ #include <asm/param.h>
+ #include "libbridge.h"

package/bridge-utils/patches/patch-brctl_brctl_disp_c

@@ -0,0 +1,10 @@
+--- bridge-utils-1.5.orig/brctl/brctl_disp.c	2011-03-29 02:52:54.000000000 +0200
++++ bridge-utils-1.5/brctl/brctl_disp.c	2013-12-27 21:00:22.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ 
+ #include "libbridge.h"
+ #include "brctl.h"

package/bridge-utils/patches/patch-libbridge_libbridge_h

@@ -1,9 +1,10 @@
 --- bridge-utils-1.5.orig/libbridge/libbridge.h	2011-03-29 02:52:54.000000000 +0200
-+++ bridge-utils-1.5/libbridge/libbridge.h	2013-07-12 14:38:31.000000000 +0200
-@@ -20,6 +20,7 @@
++++ bridge-utils-1.5/libbridge/libbridge.h	2013-12-27 21:01:15.000000000 +0100
+@@ -20,6 +20,8 @@
  #define _LIBBRIDGE_H
  
  #include <sys/socket.h>
++#include <sys/types.h>
 +#include <netinet/in.h>
  #include <linux/if.h>
  #include <linux/if_bridge.h>

package/bzip2/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		00b516f4704d4a7cb50a1d97e6e8e15b
 PKG_DESCR:=		bzip2 compression utility
 PKG_SECTION:=		archive
+PKG_BUILDDEP:=		bzip2-host
 PKG_DEPENDS:=		libbz2
 PKG_URL:=		http://www.bzip.org/
 PKG_SITES:=		http://www.bzip.org/${PKG_VERSION}/
@@ -23,17 +24,32 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
 endif
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2},${PKG_OPTS}))
 
+HOST_STYLE:=		manual
 MAKE_FILE:=		Makefile-libbz2_so
 CONFIG_STYLE:=		manual
 TARGET_CFLAGS+=		-fPIC
 XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
 INSTALL_STYLE:=		manual
 
+host-build:
+	(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+		PREFIX=${HOST_WRKINST}/usr ${HOST_ALL_TARGET})
+
+bzip2-hostinstall:
+	${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/lib
+	${INSTALL_DIR} $(STAGING_HOST_DIR)/usr/include
+	$(CP) ${WRKBUILD}/libbz2.so* \
+		${STAGING_HOST_DIR}/usr/lib
+	(cd ${STAGING_HOST_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
+	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_HOST_DIR)/usr/include
+
 libbz2-install:
 	${INSTALL_DIR} ${IDIR_LIBBZ2}/usr/lib
 	$(CP) ${WRKBUILD}/libbz2.so* \
@@ -49,4 +65,5 @@ bzip2-install:
 	${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/bzip2-shared ${IDIR_BZIP2}/usr/bin/bzip2
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/bzip2/patches/patch-Makefile-libbz2_so

@@ -1,15 +1,24 @@
 --- bzip2-1.0.6.orig/Makefile-libbz2_so	2010-09-11 01:07:52.000000000 +0200
-+++ bzip2-1.0.6/Makefile-libbz2_so	2013-07-30 14:15:29.000000000 +0200
-@@ -22,9 +22,10 @@
- 
- 
- SHELL=/bin/sh
--CC=gcc
-+CC?=gcc
++++ bzip2-1.0.6/Makefile-libbz2_so	2014-01-10 21:37:37.000000000 +0100
+@@ -25,6 +25,12 @@ SHELL=/bin/sh
+ CC=gcc
  BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS?=
-+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
+ CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++OS=$(shell uname)
++ifeq ($(OS),Darwin)
++LDOPT=-install_name
++else 
++LDOPT=-soname
++endif
  
  OBJS= blocksort.o  \
        huffman.o    \
+@@ -35,7 +41,7 @@ OBJS= blocksort.o  \
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
++	$(CC) -shared -Wl,$(LDOPT) -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.6 libbz2.so.1.0

package/cfgfs/Makefile

@@ -15,7 +15,7 @@ PKG_CFLINE_CFGFS:=	select BUSYBOX_DIFF@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
-PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
+PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS && !ADK_TARGET_ROOTFS_JFFS2 && !ADK_TARGET_ROOTFS_SQUASHFS
 PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE)
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}

package/cifs-utils/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cifs-utils
 PKG_VERSION:=		6.1
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		f83ef48ab1154aa74dd4cf1c1202bf04
 PKG_DESCR:=		CIFS utilities
 PKG_SECTION:=		net/fs
@@ -29,6 +29,7 @@ CONFIGURE_ARGS+=	--disable-cifsupcall \
 			--disable-cifsidmap \
 			--disable-cifsacl \
 			--disable-pie \
+			--without-libcap \
 			--disable-systemd
 
 cifs-utils-install:

package/comgt/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		comgt
 PKG_VERSION:=		0.32
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		db2452680c3d953631299e331daf49ef
 PKG_DESCR:=		3G/GPRS datacard control tool
 PKG_SECTION:=		utils

package/comgt/patches/patch-comgt_c

@@ -0,0 +1,47 @@
+--- comgt.0.32.orig/comgt.c	2006-10-20 16:49:46.000000000 +0200
++++ comgt.0.32/comgt.c	2013-12-28 19:40:28.000000000 +0100
+@@ -30,7 +30,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
+@@ -81,7 +81,7 @@ char token[MAXTOKEN];   /* For gettoken(
+ char scriptfile[MAXPATH]; /* Script file name */
+ char scriptfilepath[MAXPATH]; /* temp storage for full path */
+ BOOL verbose=0; /* Log actions */
+-struct termio cons, stbuf, svbuf;  /* termios: svbuf=before, stbuf=while */
++struct termios cons, stbuf, svbuf;  /* termios: svbuf=before, stbuf=while */
+ int comfd=0; /* Communication file descriptor.  Defaults to stdin. */
+ char msg[STRINGL]; /* Massage messages here */
+ int preturn,returns[MAXGOSUBS];
+@@ -926,7 +926,7 @@ void setcom(void) {
+ }
+ 
+ void doset(void) {
+-  struct termio console;
++  struct termios console;
+   int a,b;
+   gettoken();
+   if(strcmp(token,"echo")==0) {
+@@ -1281,7 +1281,7 @@ void opengt(void) {
+   parity=stbuf.c_cflag & (PARENB | PARODD);
+   stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR );
+   stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET);
+-  stbuf.c_lflag &= ~(ICANON | XCASE | ECHO | ECHOE | ECHONL);
++  stbuf.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL);
+   stbuf.c_lflag &= ~(ECHO | ECHOE);
+   stbuf.c_cc[VMIN] = 1;
+   stbuf.c_cc[VTIME] = 0;
+@@ -1336,7 +1336,7 @@ void opendevice(void) {
+   parity=stbuf.c_cflag & (PARENB | PARODD);
+   stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR );
+   stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET);
+-  stbuf.c_lflag &= ~(ICANON | XCASE | ECHO | ECHOE | ECHONL);
++  stbuf.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL);
+   stbuf.c_lflag &= ~(ECHO | ECHOE);
+   stbuf.c_cc[VMIN] = 1;
+   stbuf.c_cc[VTIME] = 0;

package/conntrack-tools/Makefile

@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		libtirpc libnetfilter_queue libnetfilter_conntrack libnetfilter_
 PKG_URL:=		http://conntrack-tools.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/conntrack-tools/files/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_ARCH_DEPENDS:=	!avr32
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2

package/cryptsetup/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cryptsetup
-PKG_VERSION:=		1.3.1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		1f5b5a9d538e8a3c191fb7dd85b9b013
+PKG_VERSION:=		1.6.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a7aeb549a543eeac433eadfb6bc67837
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt

package/cryptsetup/patches/patch-lib_libdevmapper_c

@@ -0,0 +1,10 @@
+--- cryptsetup-1.6.3.orig/lib/libdevmapper.c	2013-11-14 08:31:44.000000000 +0100
++++ cryptsetup-1.6.3/lib/libdevmapper.c	2014-01-08 10:15:32.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <linux/fs.h>
+ #include <uuid/uuid.h>
+ #include <sys/utsname.h>
++#include <sys/stat.h>
+ 
+ #include "internal.h"
+ 

package/cryptsetup/patches/patch-ltmain_sh

@@ -1,6 +1,6 @@
---- cryptsetup-1.3.1.orig/ltmain.sh	2011-04-18 13:06:09.000000000 +0200
-+++ cryptsetup-1.3.1/ltmain.sh	2011-07-18 13:28:01.000000000 +0200
-@@ -5840,7 +5840,7 @@ func_mode_link ()
+--- cryptsetup-1.6.3.orig/ltmain.sh	2013-12-08 18:15:38.000000000 +0100
++++ cryptsetup-1.6.3/ltmain.sh	2014-01-08 01:18:38.000000000 +0100
+@@ -5853,7 +5853,7 @@ func_mode_link ()
        # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
        -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \

package/ctorrent/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ctorrent
 PKG_VERSION:=		dnh3.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
 PKG_DESCR:=		console-based BitTorrent client
 PKG_SECTION:=		p2p

package/ctorrent/patches/patch-compat_c

@@ -0,0 +1,13 @@
+--- ctorrent-dnh3.3.2.orig/compat.c	2008-06-15 02:00:19.000000000 +0200
++++ ctorrent-dnh3.3.2/compat.c	2014-01-02 18:21:09.000000000 +0100
+@@ -67,8 +67,8 @@ int snprintf(char *str, size_t size, con
+ char *strnstr(const char *haystack, const char *needle, size_t haystacklen)
+ {
+   char *p;
+-  ssize_t plen;
+-  ssize_t len = strlen(needle);
++  size_t plen;
++  size_t len = strlen(needle);
+ 
+   if( *needle == '\0' )
+     return (char *)haystack;

package/cutter/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cutter
 PKG_VERSION:=		1.03
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		50093db9b64277643969ee75b83ebbd1
 PKG_DESCR:=		Abort TCP/IP connections routed over a firewall
 PKG_SECTION:=		firewall

package/cutter/patches/patch-cutter_c

@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- cutter-1.03.orig/cutter.c	2005-04-30 09:01:03.000000000 +0200
-+++ cutter-1.03/cutter.c	2011-08-24 18:49:58.830478484 +0200
++++ cutter-1.03/cutter.c	2013-12-24 12:14:44.000000000 +0100
 @@ -35,6 +35,10 @@
   * 		improvment.
   */
@@ -12,7 +12,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  #include <string.h>
  #include <stdio.h>
  #include <unistd.h>
-@@ -297,7 +301,7 @@ int send_rst(
+@@ -50,7 +54,9 @@
+ #include <linux/if_ether.h>
+ #include <fcntl.h>
+ #include <netpacket/packet.h>
++#if defined(__GLIBC__)
+ #include <net/ethernet.h>     /* the L2 protocols */
++#endif
+ #include <linux/sockios.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+@@ -297,7 +303,7 @@ int send_rst(
  	pheader.placeholder=0;
  	pheader.protocol=IPPROTO_TCP;
  	pheader.tcp_length=htons(TCPHDR);
@@ -21,7 +31,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	tpack.tcp.check=in_cksum((unsigned short *)&pheader,TCPHDR+12);
  
  	/*
-@@ -419,7 +423,7 @@ int send_rst(
+@@ -419,7 +425,7 @@ int send_rst(
  			pheader.placeholder=0;
  			pheader.protocol=IPPROTO_TCP;
  			pheader.tcp_length=htons(TCPHDR);

package/daq/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		daq
 PKG_VERSION:=		2.0.0
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		a00855a153647df76d47f1ea454f74ae
 PKG_DESCR:=		daq
 PKG_SECTION:=		libs
@@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 AUTOTOOL_STYLE:=	autoreconf
+CONFIGURE_ARGS+=	--disable-ipfw-module
 
 daq-install:
 	$(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq

package/davfs2/Makefile

@@ -4,15 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		davfs2
-PKG_VERSION:=		1.4.6
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		c9e8aeb15daeba4b6283b40bb640e908
+PKG_VERSION:=		1.4.7
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c75f9d7d260e7364362b89beba2b3186
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		fuse-utils kmod-fuse-fs neon
 PKG_BUILDDEP:=		libiconv-tiny neon fuse
 PKG_URL:=		http://savannah.nongnu.org/projects/davfs2/
-PKG_SITES:=		http://www.very-clever.com/download/nongnu/davfs2/
+PKG_SITES:=		http://download.savannah.gnu.org/releases/davfs2/
+
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/davfs2/patches/patch-src_cache_c

@@ -1,6 +1,14 @@
---- davfs2-1.4.6.orig/src/cache.c	2009-11-15 11:15:17.000000000 +0100
-+++ davfs2-1.4.6/src/cache.c	2010-12-27 22:02:47.000000000 +0100
-@@ -55,7 +55,6 @@
+--- davfs2-1.4.7.orig/src/cache.c	2012-07-19 13:26:00.000000000 +0200
++++ davfs2-1.4.7/src/cache.c	2014-01-01 20:01:21.000000000 +0100
+@@ -24,7 +24,6 @@
+ #include <dirent.h>
+ #endif
+ #include <errno.h>
+-#include <error.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+@@ -55,7 +54,6 @@
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif

package/davfs2/patches/patch-src_coda_h

@@ -0,0 +1,15 @@
+--- davfs2-1.4.7.orig/src/coda.h	2009-04-14 21:54:57.000000000 +0200
++++ davfs2-1.4.7/src/coda.h	2014-01-01 20:12:52.000000000 +0100
+@@ -57,6 +57,12 @@ typedef int		     int32_t;
+ typedef unsigned int	   u_int32_t;
+ #endif
+ 
++typedef unsigned long u_long;
++typedef unsigned int u_int;
++typedef unsigned short u_short;
++typedef unsigned long long u_quad_t;
++#include <sys/types.h>
++
+ 
+ /*
+  * Cfs constants

package/davfs2/patches/patch-src_dav_fuse_c

@@ -1,10 +1,11 @@
---- davfs2-1.4.6.orig/src/dav_fuse.c	2010-02-16 20:29:49.000000000 +0100
-+++ davfs2-1.4.6/src/dav_fuse.c	2010-12-27 22:02:24.000000000 +0100
-@@ -33,6 +33,7 @@
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
+--- davfs2-1.4.7.orig/src/dav_fuse.c	2012-07-19 13:18:51.000000000 +0200
++++ davfs2-1.4.7/src/dav_fuse.c	2014-01-01 20:02:55.000000000 +0100
+@@ -48,6 +48,8 @@
+ #include <sys/stat.h>
  #endif
-+#include <stdlib.h>
- #include <string.h>
- #ifdef HAVE_SYSLOG_H
- #include <syslog.h>
+ 
++#include <sys/select.h>
++
+ #include "defaults.h"
+ #include "mount_davfs.h"
+ #include "cache.h"

package/davfs2/patches/patch-src_kernel_interface_c

@@ -0,0 +1,10 @@
+--- davfs2-1.4.7.orig/src/kernel_interface.c	2012-07-19 12:58:48.000000000 +0200
++++ davfs2-1.4.7/src/kernel_interface.c	2014-01-01 20:01:11.000000000 +0100
+@@ -20,7 +20,6 @@
+ 
+ #include "config.h"
+ 
+-#include <error.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif

package/davfs2/patches/patch-src_mount_davfs_c

@@ -1,6 +1,16 @@
---- davfs2-1.4.6.orig/src/mount_davfs.c	2010-01-21 19:50:15.000000000 +0100
-+++ davfs2-1.4.6/src/mount_davfs.c	2010-05-29 21:10:23.041613426 +0200
-@@ -29,7 +29,6 @@
+--- davfs2-1.4.7.orig/src/mount_davfs.c	2012-07-19 13:35:11.000000000 +0200
++++ davfs2-1.4.7/src/mount_davfs.c	2014-01-01 20:14:21.000000000 +0100
+@@ -20,16 +20,15 @@
+ 
+ #include "config.h"
+ 
++#include <paths.h>
+ #ifdef HAVE_ARGZ_H
+ #include <argz.h>
+ #endif
+ #include <ctype.h>
+ #include <errno.h>
+-#include <error.h>
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
@@ -8,15 +18,15 @@
  #include <getopt.h>
  #include <grp.h>
  #ifdef HAVE_LIBINTL_H
-@@ -677,6 +676,7 @@ check_double_mounts(dav_args *args)
+@@ -674,6 +673,7 @@ check_double_mounts(dav_args *args)
  static void
  check_fstab(const dav_args *args)
  {
 +#if 0
      dav_args *n_args = new_args();
      n_args->mopts = DAV_USER_MOPTS;
- 
-@@ -733,6 +733,7 @@ check_fstab(const dav_args *args)
+     setfsent();
+@@ -737,6 +737,7 @@ check_fstab(const dav_args *args)
  
      endfsent();
      delete_args(n_args);
@@ -24,7 +34,7 @@
  }
  
  
-@@ -754,7 +755,7 @@ check_mountpoint(dav_args *args)
+@@ -758,7 +759,7 @@ check_mountpoint(dav_args *args)
      struct passwd *pw;
  
      if (*mpoint != '/') {
@@ -33,7 +43,7 @@
          if (!mp)
              error(EXIT_FAILURE, 0,
                    _("can't evaluate path of mount point %s"), mpoint);
-@@ -1824,6 +1825,7 @@ new_args(void)
+@@ -1793,6 +1794,7 @@ new_args(void)
  static void
  log_dbg_cmdline(char *argv[])
  {
@@ -41,8 +51,8 @@
      size_t len;
      char *cmdline;
      if (argz_create(argv, &cmdline, &len) == 0) {
-@@ -1831,6 +1833,7 @@ log_dbg_cmdline(char *argv[])
-         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), cmdline);
+@@ -1800,6 +1802,7 @@ log_dbg_cmdline(char *argv[])
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "%s", cmdline);
          free(cmdline);
      }
 +    */

package/davfs2/patches/patch-src_webdav_c

@@ -1,6 +1,14 @@
---- davfs2-1.4.6.orig/src/webdav.c	2010-02-16 20:29:59.000000000 +0100
-+++ davfs2-1.4.6/src/webdav.c	2010-05-30 09:52:01.161613627 +0200
-@@ -52,6 +52,8 @@
+--- davfs2-1.4.7.orig/src/webdav.c	2012-07-19 13:27:51.000000000 +0200
++++ davfs2-1.4.7/src/webdav.c	2014-01-01 20:14:54.000000000 +0100
+@@ -21,7 +21,6 @@
+ #include "config.h"
+ 
+ #include <errno.h>
+-#include <error.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+@@ -52,6 +51,8 @@
  #include <sys/stat.h>
  #endif
  
@@ -9,7 +17,7 @@
  #include <ne_alloc.h>
  #include <ne_auth.h>
  #include <ne_basic.h>
-@@ -1918,6 +1920,7 @@ quota_result(void *userdata, const ne_ur
+@@ -1921,6 +1922,7 @@ quota_result(void *userdata, const ne_ur
  static int
  ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert)
  {
@@ -17,7 +25,7 @@
      char *issuer = ne_ssl_readable_dname(ne_ssl_cert_issuer(cert));
      char *subject = ne_ssl_readable_dname(ne_ssl_cert_subject(cert));
      char *digest = ne_calloc(NE_SSL_DIGESTLEN);
-@@ -1964,8 +1967,13 @@ ssl_verify(void *userdata, int failures,
+@@ -1967,8 +1969,13 @@ ssl_verify(void *userdata, int failures,
              len = getline(&s, &n, stdin);
              if (len < 0)
                  abort();

package/dbus-glib/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dbus-glib
-PKG_VERSION:=		0.86
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		cd0ab148fb0c786fc88be49d19971f50
+PKG_VERSION:=		0.100.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ad0920c7e3aad669163bb59171cf138e
 PKG_DESCR:=		DBUS glib bindings
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		dbus glib

package/deco/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		deco
 PKG_VERSION:=		39
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f77f60e8be0cae1f814cba1ef61bf4d0
 PKG_DESCR:=		Text-based, full featured file manager
 PKG_SECTION:=		misc
@@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DECO,deco,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
 INSTALL_STYLE:=		manual
 
 do-install:

package/dhcp-forwarder/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dhcp-forwarder
-PKG_VERSION:=		0.9
+PKG_VERSION:=		0.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		63630db269ac17523ad085b67277b1c3
+PKG_MD5SUM:=		97b5f3ddbdee5c1f6756321c15907138
 PKG_DESCR:=		DHCP relay agent
 PKG_SECTION:=		dhcp
 PKG_URL:=		http://www.nongnu.org/dhcp-fwd/

package/dhcp-forwarder/patches/patch-src_parser_c

@@ -0,0 +1,10 @@
+--- dhcp-forwarder-0.10.orig/src/parser.c	2012-04-30 12:57:35.000000000 +0200
++++ dhcp-forwarder-0.10/src/parser.c	2013-12-30 19:16:07.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include <fcntl.h>
+ #include <netinet/in.h>
+ #include <sys/mman.h>
++#include <sys/stat.h>
+ 
+ #include "parser.h"
+ #include "cfg.h"

package/digitemp/Makefile

@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		libusb libusb-compat
 PKG_URL:=		http://www.digitemp.com/software/linux/
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk

package/dillo/Makefile

@@ -9,9 +9,9 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		726cd0b7a18c5e25f4d80ebeffe7607e
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libfltk libxi libpng zlib libjpeg
+PKG_DEPENDS:=		libfltk libxi libpng zlib libjpeg-turbo
 PKG_DEPENDS+=		libstdcxx libpthread libgcc libopenssl
-PKG_BUILDDEP:=		fltk libXi libiconv-tiny jpeg libpng zlib openssl
+PKG_BUILDDEP:=		fltk libXi libiconv-tiny libjpeg-turbo libpng zlib openssl
 PKG_URL:=		http://www.dillo.org/
 PKG_SITES:=		http://www.dillo.org/download/
 PKG_NEED_CXX:=		1
@@ -25,8 +25,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_DIR)/usr/bin/png-config
-TARGET_LDFLAGS+=	-liconv -lpng15
+CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config
+TARGET_LDFLAGS+=	-liconv
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 CONFIGURE_ARGS+=	--enable-ssl
 

package/drbd/Makefile

@@ -4,14 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		drbd
-PKG_VERSION:=		8.4.1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		3af0cc49ee0b5005ea108c5ba92aa755
+PKG_VERSION:=		8.4.4
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		b51815343c1a9151e2936b3b97520388
 PKG_DESCR:=		DRBD admin tools
 PKG_SECTION:=		fs
 PKG_URL:=		http://www.drbd.org/
 PKG_SITES:=		http://oss.linbit.com/drbd/8.4/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DRBD,drbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -31,7 +33,7 @@ post-install:
 	$(INSTALL_DIR) $(IDIR_DRBD)/usr/sbin
 	$(CP) $(WRKINST)/usr/lib/drbd/* \
 		$(IDIR_DRBD)/usr/lib/drbd/
-	$(INSTALL_BIN) $(WRKINST)/sbin/drbd* \
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/drbd* \
 		$(IDIR_DRBD)/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/drbd/patches/patch-drbd_drbd_buildtag_c

@@ -1,11 +0,0 @@
---- drbd-8.4.1.orig/drbd/drbd_buildtag.c	2011-12-20 12:43:15.000000000 +0100
-+++ drbd-8.4.1/drbd/drbd_buildtag.c	2012-07-24 23:03:27.000000000 +0200
-@@ -3,5 +3,5 @@
- const char *drbd_buildtag(void)
- {
- 	return "GIT-hash: 91b4c048c1a0e06777b5f65d312b38d47abaea80"
--		" build by phil@fat-tyre, 2011-12-20 12:43:15";
--}
-+		" build by wbx@neon, 2012-07-24 23:03:27";
-+}
-\ No newline at end of file

package/dsniff/Makefile

@@ -15,6 +15,7 @@ PKG_URL:=		http://www.monkey.org/~dugsong/dsniff/
 PKG_SITES:=		http://www.monkey.org/~dugsong/dsniff/beta/
 
 PKG_ARCH_DEPENDS:=	!arm
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-2.4
 

package/eglibc/Makefile

@@ -42,7 +42,7 @@ eglibc-static-install:
 eglibc-dev-install:
 	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_EGLIBC_DEV)/usr/lib
 	# install linker script
-	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+	cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
 ifeq ($(ADK_TARGET_ABI_O32),y)
 ifeq ($(ADK_big),y)
 	$(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so

package/eglibc/files/libc.so.arm

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-littlearm)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.3 ) )

package/esound/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		esound
 PKG_VERSION:=		0.2.41
-PKG_RELEASE:=		6
+PKG_RELEASE:=		8
 PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
 PKG_DESCR:=		Enlightened Sound Daemon
 PKG_SECTION:=		multimedia

package/esound/patches/patch-esddsp_c

@@ -0,0 +1,38 @@
+--- esound-0.2.41.orig/esddsp.c	2008-11-18 21:35:19.000000000 +0100
++++ esound-0.2.41/esddsp.c	2013-12-23 16:08:43.000000000 +0100
+@@ -264,7 +264,7 @@ open_wrapper (int (*func) (const char *,
+ }
+ 
+ int
+-open (const char *pathname, int flags, ...)
++esd_open (const char *pathname, int flags, ...)
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+@@ -291,7 +291,7 @@ open (const char *pathname, int flags, .
+ }
+ 
+ int
+-open64 (const char *pathname, int flags, ...)
++esd_open64 (const char *pathname, int flags, ...)
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+@@ -355,7 +355,7 @@ fopen_wrapper (FILE * (*func) (const cha
+ }
+ 
+ FILE *
+-fopen (const char *path, const char *mode)
++esd_fopen (const char *path, const char *mode)
+ {
+   static FILE * (*func) (const char *, const char *) = NULL;
+ 
+@@ -375,7 +375,7 @@ fopen (const char *path, const char *mod
+ }
+ 
+ FILE *
+-fopen64 (const char *path, const char *mode)
++esd_fopen64 (const char *path, const char *mode)
+ {
+   static FILE * (*func) (const char *, const char *) = NULL;
+ 

package/ether-wake/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		A Wake-On-LAN (WOL) client
 PKG_SECTION:=		net
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk

package/fbset/Makefile

@@ -11,6 +11,8 @@ PKG_DESCR:=		framebuffer utility
 PKG_SECTION:=		utils
 PKG_SITES:=		http://users.telenet.be/geertu/Linux/fbdev/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/firefox/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		24.0
+PKG_VERSION:=		26.0
 PKG_RELEASE:=		2
-PKG_MD5SUM:=		06a4c0fe8d3a979aea2fce8d0fdbf328
+PKG_MD5SUM:=		91ce51cc6474f1269484e5327643a59c
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi
@@ -15,7 +15,7 @@ PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf li
 PKG_DEPENDS+=		harfbuzz mesalib libvpx libbz2 ca-certificates libevent
 PKG_BUILDDEP:=		alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
 PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
-PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent python2-host yasm-host
+PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent bzip2-host python2-host yasm-host
 PKG_BUILDDEP+=		zip-host
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/

package/firefox/patches/patch-configure

@@ -0,0 +1,30 @@
+--- mozilla-release.orig/configure	2013-12-05 17:08:46.000000000 +0100
++++ mozilla-release/configure	2014-01-06 18:17:43.008094174 +0100
+@@ -9787,27 +9787,6 @@ if test -z "$GNU_CC"; then
+     esac
+ fi
+ 
+-if test "$GNU_CC" -a -n "$DEVELOPER_OPTIONS"; then
+-            if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then
+-        GOLD=$($CC -print-prog-name=ld.gold)
+-        case "$GOLD" in
+-        /*)
+-            ;;
+-        *)
+-            GOLD=$(which $GOLD)
+-            ;;
+-        esac
+-        if test -n "$GOLD"; then
+-            mkdir -p $_objdir/build/unix/gold
+-            ln -s "$GOLD" $_objdir/build/unix/gold/ld
+-            if $CC -B $_objdir/build/unix/gold -Wl,--version 2>&1 | grep -q "GNU gold"; then
+-                LDFLAGS="$LDFLAGS -B $_objdir/build/unix/gold"
+-            else
+-                rm -rf $_objdir/build/unix/gold
+-            fi
+-        fi
+-    fi
+-fi
+ 
+ if test "$GNU_CC"; then
+     if test -z "$DEVELOPER_OPTIONS"; then

package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp

@@ -0,0 +1,10 @@
+--- mozilla-release.orig/gfx/layers/BufferUnrotate.cpp	2013-12-05 17:07:31.000000000 +0100
++++ mozilla-release/gfx/layers/BufferUnrotate.cpp	2014-01-06 21:27:39.000000000 +0100
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight,
+                     int aByteStride, int aXBoundary, int aYBoundary)

package/firefox/patches/patch-ipc_chromium_src_base_file_util_h

@@ -1,23 +1,10 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util.h	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util.h	2013-10-23 16:28:38.000000000 +0200
-@@ -16,7 +16,11 @@
+--- mozilla-release.orig/ipc/chromium/src/base/file_util.h	2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/ipc/chromium/src/base/file_util.h	2014-01-02 15:01:42.000000000 +0100
+@@ -16,7 +16,6 @@
  #include <sys/stat.h>
  #elif defined(OS_POSIX) 
  #include <sys/types.h>
-+#ifndef __GLIBC__
-+#define NO_FTS
-+#else
- #include <fts.h>
-+#endif
+-#include <fts.h>
  #include <sys/stat.h>
  #endif
  
-@@ -466,7 +470,7 @@ class FileEnumerator {
- #if defined(OS_WIN)
-   WIN32_FIND_DATA find_data_;
-   HANDLE find_handle_;
--#elif defined(ANDROID)
-+#elif defined(NO_FTS)
-   void *fts_;
- #elif defined(OS_POSIX)
-   FTS* fts_;

package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc

@@ -1,5 +1,5 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc	2013-10-23 16:28:38.000000000 +0200
+--- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc	2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc	2014-01-02 14:53:44.000000000 +0100
 @@ -8,13 +8,16 @@
  #include <errno.h>
  #include <fcntl.h>
@@ -19,7 +19,7 @@
  #include <sys/mman.h>
  #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
  #include <sys/stat.h>
-@@ -121,7 +124,7 @@ bool Delete(const FilePath& path, bool r
+@@ -67,7 +70,7 @@ bool Delete(const FilePath& path, bool r
    if (!recursive)
      return (rmdir(path_str) == 0);
  
@@ -28,7 +28,7 @@
    // XXX Need ftsless impl for bionic
    return false;
  #else
-@@ -194,7 +197,7 @@ bool CopyDirectory(const FilePath& from_
+@@ -140,7 +143,7 @@ bool CopyDirectory(const FilePath& from_
      return false;
    }
  
@@ -37,7 +37,7 @@
    // XXX Need ftsless impl for bionic
    return false;
  #else
-@@ -415,7 +418,7 @@ bool CreateNewTempDirectory(const FilePa
+@@ -333,7 +336,7 @@ bool CreateNewTempDirectory(const FilePa
      return false;
    tmpdir = tmpdir.Append(kTempFileName);
    std::string tmpdir_string = tmpdir.value();
@@ -46,30 +46,3 @@
    char* dtemp = NULL;
  #else
    // this should be OK since mkdtemp just replaces characters in place
-@@ -613,7 +616,7 @@ FileEnumerator::FileEnumerator(const Fil
- }
- 
- FileEnumerator::~FileEnumerator() {
--#ifndef ANDROID
-+#ifndef NO_FTS
-   if (fts_)
-     fts_close(fts_);
- #endif
-@@ -625,7 +628,7 @@ void FileEnumerator::GetFindInfo(FindInf
-   if (!is_in_find_op_)
-     return;
- 
--#ifndef ANDROID
-+#ifndef NO_FTS
-   memcpy(&(info->stat), fts_ent_->fts_statp, sizeof(info->stat));
-   info->filename.assign(fts_ent_->fts_name);
- #endif
-@@ -636,7 +639,7 @@ void FileEnumerator::GetFindInfo(FindInf
- // large directories with many files this can be quite deep.
- // TODO(erikkay) - get rid of this recursive pattern
- FilePath FileEnumerator::Next() {
--#ifdef ANDROID
-+#ifdef NO_FTS
-   return FilePath();
- #else
-   if (!is_in_find_op_) {

package/firefox/patches/patch-js_src_Makefile_in

@@ -1,6 +1,6 @@
---- mozilla-release.orig/js/src/Makefile.in	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/js/src/Makefile.in	2013-10-14 12:36:25.000000000 +0200
-@@ -112,7 +112,7 @@ ifdef JS_HAS_CTYPES
+--- mozilla-release.orig/js/src/Makefile.in	2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/js/src/Makefile.in	2014-01-02 14:53:44.000000000 +0100
+@@ -103,7 +103,7 @@ ifdef JS_HAS_CTYPES
  VPATH += $(srcdir)/ctypes
  
  ifdef MOZ_NATIVE_FFI

package/firefox/patches/patch-js_src_configure

@@ -0,0 +1,31 @@
+--- mozilla-release.orig/js/src/configure	2013-12-05 17:08:46.000000000 +0100
++++ mozilla-release/js/src/configure	2014-01-07 19:30:38.660353287 +0100
+@@ -8652,28 +8652,6 @@ if test -z "$GNU_CC"; then
+     esac
+ fi
+ 
+-if test "$GNU_CC" -a -n "$DEVELOPER_OPTIONS"; then
+-            if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then
+-        GOLD=$($CC -print-prog-name=ld.gold)
+-        case "$GOLD" in
+-        /*)
+-            ;;
+-        *)
+-            GOLD=$(which $GOLD)
+-            ;;
+-        esac
+-        if test -n "$GOLD"; then
+-            mkdir -p $_objdir/build/unix/gold
+-            ln -s "$GOLD" $_objdir/build/unix/gold/ld
+-            if $CC -B $_objdir/build/unix/gold -Wl,--version 2>&1 | grep -q "GNU gold"; then
+-                LDFLAGS="$LDFLAGS -B $_objdir/build/unix/gold"
+-            else
+-                rm -rf $_objdir/build/unix/gold
+-            fi
+-        fi
+-    fi
+-fi
+-
+ if test "$GNU_CC"; then
+     if test -z "$DEVELOPER_OPTIONS"; then
+         CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"

package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c

@@ -1,11 +1,33 @@
---- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-09-11 01:15:16.000000000 +0200
-+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-10 13:18:17.000000000 +0100
-@@ -59,7 +59,7 @@ static char *RCSSTRING __UNUSED__="$Id:
+--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2014-01-03 13:06:22.000000000 +0100
+@@ -53,7 +53,9 @@ static char *RCSSTRING __UNUSED__="$Id:
+ #undef __unused
+ #include <linux/sysctl.h>
+ #endif
++#if defined(__GLIBC__)
+ #include <net/if.h>
++#endif
+ #ifndef LINUX
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>
+@@ -61,14 +63,17 @@ static char *RCSSTRING __UNUSED__="$Id:
  #include <net/if_dl.h>
  #include <net/if_types.h>
  #include <sys/sockio.h>
 -#else
-+#elif __GLIBC__
++#elif defined(__GLIBC__)
+ #include <linux/sockios.h>
  #include <linux/if.h>
+ #include <linux/kernel.h>
+ #include <linux/wireless.h>
+-#ifndef ANDROID
+ #include <linux/ethtool.h>
+-#endif
++#else
++#include <linux/sockios.h>
++#include <linux/kernel.h>
++#include <linux/wireless.h>
++#include <linux/ethtool.h>
  #endif
  #include <net/route.h>
+ 

package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h

@@ -0,0 +1,12 @@
+--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/stun.h	2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h	2014-01-03 17:19:05.000000000 +0100
+@@ -39,7 +39,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #else
+ #include <sys/param.h>
+ #include <sys/socket.h>
++#if defined(__GLIBC__)
+ #include <net/if.h>
++#endif
+ #ifndef LINUX
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>

package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc

@@ -1,23 +1,23 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-09-11 01:15:18.000000000 +0200
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-10-15 12:21:59.000000000 +0200
-@@ -38,11 +38,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-12-05 17:07:50.000000000 +0100
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2014-01-02 14:58:37.000000000 +0100
+@@ -36,11 +36,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
      WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
                   "Available number of cores:%d", number_of_cores_);
  
 -#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
--    number_of_cores_ = get_nprocs();
+-    number_of_cores_ = static_cast<uint32_t>(sysconf(_SC_NPROCESSORS_ONLN));
 -    WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
 -                 "Available number of cores:%d", number_of_cores_);
 -
  #elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
      int name[] = {
        CTL_HW,
-@@ -63,8 +58,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+@@ -61,8 +56,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
                     "Failed to get number of cores");
        number_of_cores_ = 1;
      }
 -#elif defined(_SC_NPROCESSORS_ONLN)
--    _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN);
+-    number_of_cores_ = sysconf(_SC_NPROCESSORS_ONLN);
  #else
      WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1,
                   "No function to get number of cores");

package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp

@@ -1,8 +1,8 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-09-11 01:15:18.000000000 +0200
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-10-15 16:05:38.000000000 +0200
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-12-05 17:07:50.000000000 +0100
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2014-01-02 14:53:44.000000000 +0100
 @@ -21,6 +21,11 @@ Scott McMurray
- #include "constants.hpp"
- #include <cstring>
+ #include <vector>
+ #include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
  
 +#include <features.h>
 +#if defined(__UCLIBC__)

package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py

@@ -0,0 +1,11 @@
+--- mozilla-release.orig/python/mozbuild/mozbuild/backend/recursivemake.py	2013-12-05 17:07:53.000000000 +0100
++++ mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py	2014-01-04 17:58:26.000000000 +0100
+@@ -421,7 +421,7 @@ class RecursiveMakeBackend(CommonBackend
+     def _handle_idl_manager(self, manager):
+         build_files = self._purge_manifests['xpidl']
+ 
+-        for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
++        for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done',
+             'xpt/.mkdir.done'):
+             build_files.add(p)
+