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

Conflicts:
	TODO

TODO

@@ -9,12 +9,8 @@
 - toolchain in /usr , check gcj
 - rework startup, maybe use init.c, start gettys after bootup ready
 - more output for initscripts on bootup
+- try Preset Loops per Jiffy for faster bootup via lpj=
 - port uuterm
-- move tools to package host infrastructure, resolve dependency handling for host tools
-- finish miniconfig + cleanup
-- qemu-sh serial
-- choice qemu with graphic
-- x32 musl
 - hash-style=gnu for non-mips and non-musl
 - add fb full screen logo
 - port opkg with gpg signing

mk/build.mk

@@ -215,16 +215,11 @@ switch:
 		fi \
 	fi
 
-ifeq (${ADK_TARGET_KERNEL64},y)
-KERNEL_CFG:=kernel64.config
-else
-KERNEL_CFG:=kernel.config
-endif
-
 kernelconfig:
-	cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/${KERNEL_CFG} $(BUILD_DIR)/linux/.config
-	${KERNEL_MAKE_ENV} ${MAKE} ARCH=$(ARCH) ${KERNEL_MAKE_OPTS} -C $(BUILD_DIR)/linux menuconfig
-	cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET_ARCH)/${KERNEL_CFG}
+	${KERNEL_MAKE_ENV} ${MAKE} \
+		ARCH=$(ARCH) \
+		${KERNEL_MAKE_OPTS} \
+		-C $(BUILD_DIR)/linux menuconfig
 
 # create a new package from package/.template
 newpackage:
@@ -370,12 +365,6 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(PKG)" ];then \
-		grep "^config" target/config/Config.in \
-			|grep -i "$(PKG)" \
-			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/.defconfig; \
-	fi
 	@if [ ! -z "$(LIBC)" ];then \
 		grep "^config" target/config/Config.in \
 			|grep -i "$(LIBC)" \
@@ -434,12 +423,6 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 	fi
-	@if [ ! -z "$(PKG)" ];then \
-		grep "^config" target/config/Config.in \
-			|grep -i "$(PKG)" \
-			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(TOPDIR)/all.config; \
-	fi
 	@if [ ! -z "$(LIBC)" ];then \
 		grep "^config" target/config/Config.in \
 			|grep -i "$(LIBC)" \
@@ -487,7 +470,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
 # build all target architecture and libc combinations (toolchain only)
 bulktoolchain:
-	if [ -z "$(LIBC)" ];then \
+	@if [ -z "$(LIBC)" ];then \
 		libc="glibc uclibc musl"; \
 	else \
 		libc="$(LIBC)"; \
@@ -497,43 +480,46 @@ bulktoolchain:
 			mkdir -p ${TOPDIR}/firmware; \
 		    ( \
 			echo === building $$arch $$libc toolchain-$$arch on $$(date); \
-			tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \
+			tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##"); \
 			if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz ];then exit;fi; \
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; break;fi; \
-				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}*; \
+				if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \
+				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
+				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
+				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz host_* target_$${arch}_$${libc}$${abi}; \
 				$(GMAKE) cleantoolchain; \
 			rm .config; \
-		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}_build.log; \
+		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_build.log; \
 		    if [ -f .exit ];then break;fi \
 		done <${TOPDIR}/target/tarch.lst ;\
 		if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 	done
 
 test-framework:
-	if [ -z "$(LIBC)" ];then \
+	@if [ -z "$(LIBC)" ];then \
 		libc="glibc uclibc musl"; \
 	else \
 		libc="$(LIBC)"; \
 	fi; \
 	for libc in $$libc;do \
 		( \
-			for arch in arm microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \
-				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#"); \
+			for arch in arm armhf microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \
+				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##"); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
 				$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
 				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
+				if [ $$arch = "armhf" ];then qarch=arm; else qarch=$$arch;fi; \
 				if [ -d root ];then rm -rf root;fi; \
-				echo cp -a root_qemu_$${arch}_$${libc}$${abi} root; \
-				cp -a root_qemu_$${arch}_$${libc}$${abi} root; \
-				mkdir -p $(TOPDIR)/firmware/qemu/$$tarch; \
-				tar cJvf $(TOPDIR)/firmware/qemu/$$tarch/root.tar.xz root; \
-				cp $(TOPDIR)/firmware/qemu_$${arch}_$${libc}$${abi}/qemu-$${arch}-archive-kernel \
-					$(TOPDIR)/firmware/qemu/$$tarch/kernel; \
+				cp -a root_qemu_$${qarch}_$${libc}$${abi} root; \
+				mkdir -p $(TOPDIR)/firmware/qemu/$$arch; \
+				tar cJvf $(TOPDIR)/firmware/qemu/$$arch/root.tar.xz root; \
+				cp $(TOPDIR)/firmware/qemu_$${qarch}_$${libc}$${abi}/qemu-$${qarch}-archive-kernel \
+					$(TOPDIR)/firmware/qemu/$$arch/kernel; \
 				rm .config; \
 			done; \
 		) 2>&1 | tee $(TOPDIR)/firmware/test-framework-build.log; \

mk/image.mk

@@ -146,16 +146,6 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
 ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
 	$(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
 		${TARGET_DIR}/ >$@
-	( \
-		echo "nod /dev/console 0644 0 0 c 5 1"; \
-		echo "nod /dev/tty 0644 0 0 c 5 0"; \
-		for i in 0 1 2 3 4; do \
-			echo "nod /dev/tty$$i 0644 0 0 c 4 $$$$i"; \
-		done; \
-		echo "nod /dev/systty 0644 0 0 c 4 0"; \
-		echo "nod /dev/null 0644 0 0 c 1 3"; \
-		echo "nod /dev/ram 0655 0 0 b 1 1"; \
-	) >>$@
 
 ${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
 	${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \
@@ -171,7 +161,7 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
 		--pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
 
 createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
-	${SED} 's/.*CONFIG_\(RD_\|XZ_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \
+	${SED} 's/.*CONFIG_\(RD_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \
 		${LINUX_DIR}/.config
 	( \
 		echo "CONFIG_BLK_DEV_INITRD=y"; \

mk/kernel-build.mk

@@ -37,24 +37,19 @@ $(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) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/.config
 
 $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile
-	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE)
+	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/$(KERNEL_FILE)
 
 $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install
 	rm -rf $(LINUX_BUILD_DIR)/modules
-	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \
+	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} DEPMOD=true \
 		INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
 		LOCALVERSION="" \
 		modules_install $(MAKE_TRACE)

mk/kernel-vars.mk

@@ -1,27 +1,18 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-KERNEL_MAKE_OPTS:=	-C "${LINUX_DIR}" V=1 \
-			CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
-			CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \
-			HOSTCFLAGS='${CFLAGS_FOR_BUILD}' \
+KERNEL_MAKE_OPTS:=	V=1 \
+			ARCH=$(ARCH) \
+			CROSS_COMPILE="$(TARGET_CROSS)" \
+			CC="$(TARGET_CC)" \
+			HOSTCC="${CC_FOR_BUILD}" \
 			CONFIG_SHELL='${SHELL}'
 
-ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y)
-ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \
-			-DBCM47XX_OVERRIDE_NVRAMSIZE=0x10000 \
-			-DBCM47XX_OVERRIDE_CFESIZE=0x40000
-endif
-ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54GS},y)
-ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \
-			-DBCM47XX_OVERRIDE_NVRAMSIZE=0x20000 \
-			-DBCM47XX_OVERRIDE_CFESIZE=0x40000
-endif
-ifeq (${ADK_TARGET_BROADCOM_MODEL_ASUS_WL500GP},y)
-ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \
-			-DBCM47XX_OVERRIDE_NVRAMSIZE=0x20000 \
-			-DBCM47XX_OVERRIDE_CFESIZE=0x40000
+# regex for relocs needs pcre on Darwin
+ifeq ($(ADK_HOST_DARWIN),y)
+KERNEL_MAKE_OPTS+=	HOSTCFLAGS='$(CPPFLAGS_FOR_BUILD) ${CFLAGS_FOR_BUILD}' HOSTLDFLAGS='-lpcreposix'
+else
+KERNEL_MAKE_OPTS+=	HOSTCFLAGS='${CFLAGS_FOR_BUILD}'
 endif
 
-KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}' \
-			PATH="${STAGING_HOST_DIR}/usr/bin:$$PATH"
+KERNEL_MAKE_ENV+=	PATH="${STAGING_HOST_DIR}/usr/bin:$$PATH"

mk/mirrors.mk

@@ -15,12 +15,19 @@ MASTER_SITE_KERNEL?=	\
 	http://www.kernel.org/pub/linux/ \
 
 MASTER_SITE_XORG?=	\
-	http://www.x.org/releases/X11R7.7/src/everything/ \
-	http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \
-	http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \
+	http://www.x.org/releases/individual/xserver/ \
+	http://www.x.org/releases/individual/proto/ \
+	http://www.x.org/releases/individual/app/ \
+	http://www.x.org/releases/individual/xcb/ \
+	http://www.x.org/releases/individual/lib/ \
+	http://www.x.org/releases/individual/driver/ \
+	http://www.x.org/releases/individual/util/ \
 	http://xorg.freedesktop.org/releases/individual/app/ \
 	http://xorg.freedesktop.org/releases/individual/lib/ \
 	http://xorg.freedesktop.org/releases/individual/driver/ \
+	http://www.x.org/releases/X11R7.7/src/everything/ \
+	http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \
+	http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \
 	
 MASTER_SITE_GNU?=	\
 	http://ftp.gnu.org/gnu/ \

mk/modules.mk

@@ -1175,20 +1175,21 @@ $(eval $(call KMOD_template,SND,snd,\
 	$(MODULES_DIR)/kernel/sound/core/snd \
 	$(MODULES_DIR)/kernel/sound/core/snd-timer \
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
+,40))
+
+$(eval $(call KMOD_template,SND_PCM_DMAENGINE,snd-pcm-dmaengine,\
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \
+,41))
+
+$(eval $(call KMOD_template,SND_COMPRESS,snd-compress,\
 	$(MODULES_DIR)/kernel/sound/core/snd-compress \
-,40))
+,41))
 
 $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
 	$(MODULES_DIR)/kernel/sound/core/snd-hwdep \
 	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
 ,42))
 
-$(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\
-	$(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \
-	$(MODULES_DIR)/kernel/sound/core/oss/snd-pcm-oss \
-,45))
-
 $(eval $(call KMOD_template,SND_AC97_CODEC,snd-ac97-codec,\
 	$(MODULES_DIR)/kernel/sound/ac97_bus \
 	$(MODULES_DIR)/kernel/sound/pci/ac97/snd-ac97-codec \

mk/rootfs.mk

@@ -10,9 +10,6 @@ endef
 
 ifeq ($(ADK_HARDWARE_QEMU),y)
 MTDDEV:=	root=/dev/mtdblock0
-ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
-ROOTFS:=	root=/dev/sda1
-endif
 ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
 ROOTFS:=	root=/dev/vda1
 endif

package/MesaLib/Makefile

@@ -4,17 +4,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		MesaLib
-PKG_VERSION:=		9.2.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		df801a975045150790e10e2ccf32193f
+PKG_VERSION:=		10.1.0
+PKG_SUBVER:=		10.1
+PKG_RELEASE:=		3
+PKG_MD5SUM:=		08e796ec7122aa299d32d4f67a254315
 PKG_DESCR:=		MESA 3D graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libxdamage libxfixes libdrm libxxf86vm libexpat
 PKG_DEPENDS+=		libxml2 libxml2-python
-PKG_BUILDDEP:=		autotool python2 libxml2 libXdamage libXfixes libXxf86vm libdrm
-PKG_BUILDDEP+=		dri2proto glproto expat libXext
+PKG_BUILDDEP:=		autotool python2 libxml2 libXdamage libXfixes
+PKG_BUILDDEP+=		libXxf86vm libdrm dri2proto glproto expat libXext
+PKG_BUILDDEP+=		eudev dri3proto presentproto xcb-proto libxcb
+PKG_BUILDDEP+=		libxshmfence
 PKG_URL:=		http://www.mesa3d.org/
-PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/
+PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/${PKG_SUBVER}/
 PKG_NEED_CXX:=		1
 PKG_LIBNAME:=		mesalib
 PKG_OPTS:=		dev
@@ -58,6 +61,8 @@ mesalib-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
 	$(CP) $(WRKINST)/usr/lib/libGL*.so* \
 		$(IDIR_MESALIB)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libglapi.so* \
+		$(IDIR_MESALIB)/usr/lib
 	${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \
 		${IDIR_MESALIB}/usr/lib/dri/
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)

package/MesaLib/patches/patch-configure_ac

@@ -1,6 +1,6 @@
---- Mesa-9.2.2.orig/configure.ac	2013-10-19 01:36:09.000000000 +0200
-+++ Mesa-9.2.2/configure.ac	2013-12-01 14:08:00.000000000 +0100
-@@ -69,7 +69,7 @@ AC_PATH_PROG([PERL], [perl])
+--- Mesa-10.1.0.orig/configure.ac	2014-02-27 02:56:39.000000000 +0100
++++ Mesa-10.1.0/configure.ac	2014-03-14 21:36:14.000000000 +0100
+@@ -65,7 +65,7 @@ AC_PATH_PROG([PERL], [perl])
  
  AC_CHECK_PROG(INDENT, indent, indent, cat)
  if test "x$INDENT" != "xcat"; then

package/MesaLib/patches/patch-include_c11_threads_posix_h

@@ -0,0 +1,11 @@
+--- Mesa-10.1.0.orig/include/c11/threads_posix.h	2014-02-27 02:56:39.000000000 +0100
++++ Mesa-10.1.0/include/c11/threads_posix.h	2014-03-14 21:54:55.000000000 +0100
+@@ -176,7 +176,7 @@ mtx_init(mtx_t *mtx, int type)
+         return thrd_error;
+     pthread_mutexattr_init(&attr);
+     if ((type & mtx_recursive) != 0) {
+-#if defined(__linux__) || defined(__linux)
++#if defined(__GLIBC__)
+         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+ #else
+         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);

package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h

@@ -1,6 +1,6 @@
---- 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 @@
+--- Mesa-10.1.0.orig/src/gallium/include/pipe/p_config.h	2014-02-27 02:56:39.000000000 +0100
++++ Mesa-10.1.0/src/gallium/include/pipe/p_config.h	2014-03-14 21:36:14.000000000 +0100
+@@ -130,7 +130,7 @@
   * Endian detection.
   */
  

package/MesaLib/patches/patch-src_mesa_main_querymatrix_c

@@ -1,6 +1,6 @@
---- Mesa-9.2.2.orig/src/mesa/main/querymatrix.c	2013-04-08 20:21:04.000000000 +0200
-+++ Mesa-9.2.2/src/mesa/main/querymatrix.c	2013-10-24 17:06:31.000000000 +0200
-@@ -74,7 +74,7 @@ fpclassify(double x)
+--- Mesa-10.1.0.orig/src/mesa/main/querymatrix.c	2014-02-27 02:56:40.000000000 +0100
++++ Mesa-10.1.0/src/mesa/main/querymatrix.c	2014-03-14 21:36:14.000000000 +0100
+@@ -76,7 +76,7 @@ fpclassify(double x)
  #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
       defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
       (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \

package/adk-test-tools/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		adk-test-tools
 PKG_VERSION:=		0.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		3
 PKG_DESCR:=		helper tools and scripts for adk-test-framework
 PKG_SECTION:=		misc
 PKG_URL:=		http://openadk.org/

package/adk-test-tools/files/test.init

@@ -4,8 +4,9 @@
 [[ $1 = autostart ]] || exit 0
 echo "Starting test script ..."
 if [ -x /run.sh ];then
-	exec /run.sh
+	/run.sh
+	quit
 else
 	echo "no run.sh found"
+	quit
 fi
-quit

package/arpd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
 PKG_DESCR:=		Generates ARP responses for IP address ranges
 PKG_SECTION:=		route

package/arpd/patches/patch-arpd_c

@@ -1,5 +1,5 @@
 --- arpd.orig/arpd.c	2003-02-09 05:20:40.000000000 +0100
-+++ arpd/arpd.c	2007-01-21 00:39:05.000000000 +0100
++++ arpd/arpd.c	2014-03-16 08:11:53.000000000 +0100
 @@ -70,7 +70,7 @@ static int			 arpd_sig;
  static void
  usage(void)
@@ -74,10 +74,21 @@
  			    addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
  			
  			/* This address is claimed */
-@@ -465,14 +469,14 @@ main(int argc, char *argv[])
+@@ -445,9 +449,6 @@ arpd_recv(int fd, short type, void *ev)
+ void
+ terminate_handler(int sig)
+ {
+-	extern int event_gotsig;
+-
+-	event_gotsig = 1;
+ 	arpd_sig = sig;
+ }
+ 
+@@ -464,15 +465,14 @@ int
+ main(int argc, char *argv[])
  {
  	struct event recv_ev;
- 	extern int (*event_sigcb)(void);
+-	extern int (*event_sigcb)(void);
 -	char *dev;
 +	char *dev, *and_pcap_exp;
  	int c, debug;
@@ -91,7 +102,7 @@
  		switch (c) {
  		case 'd':
  			debug = 1;
-@@ -480,6 +484,9 @@ main(int argc, char *argv[])
+@@ -480,6 +480,9 @@ main(int argc, char *argv[])
  		case 'i':
  			dev = optarg;
  			break;
@@ -101,7 +112,7 @@
  		default:
  			usage();
  			break;
-@@ -489,9 +496,9 @@ main(int argc, char *argv[])
+@@ -489,9 +492,9 @@ main(int argc, char *argv[])
  	argv += optind;
  
  	if (argc == 0)
@@ -113,3 +124,11 @@
  	
  	if ((fp = fopen(PIDFILE, "w")) == NULL)
  		err(1, "fopen");
+@@ -524,7 +527,6 @@ main(int argc, char *argv[])
+ 		perror("signal");
+ 		return (-1);
+ 	}
+-	event_sigcb = arpd_signal;
+ 	
+ 	event_dispatch();
+ 

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		70
+PKG_RELEASE:=		72
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host

package/base-files/src/etc/fstab

@@ -6,3 +6,5 @@ devpts          /dev/pts       devpts   defaults,gid=5,mode=620   0      0
 tmpfs           /dev/shm       tmpfs    mode=0777         0      0
 tmpfs           /tmp           tmpfs    mode=1777         0      0
 sysfs           /sys           sysfs    defaults          0      0
+# example for cifs
+#//192.168.1.1/music     /music/test        cifs    ro,password=linux123,username=adk,iocharset=utf8,sec=ntlm     0       0

package/base-files/src/etc/init.d/boot

@@ -4,6 +4,10 @@
 
 . /etc/functions.sh
 
+if [ -f /proc/sys/kernel/printk ];then
+	echo 0 > /proc/sys/kernel/printk
+fi
+
 # remount /dev with smaller size
 mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 
@@ -15,7 +19,6 @@ mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
 # start mdev dynamic device node management
 echo >/dev/mdev.seq
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
-mdev -s
 
 # seed some random
 cat /etc/.rnd >/dev/urandom 2>&1

package/base-files/src/etc/init.d/fs

@@ -1,20 +1,53 @@
 #!/bin/sh
-#INIT 60
+#INIT 20
 [[ $1 = autostart ]] || exit 0
 
-# mount net filesystems (nfs/cifs)
-grep nfs /proc/filesystems  >/dev/null 2>&1
+# activate swap
+[ -x /sbin/swapon ] && { swapon -a; }
+
+# activate any logical volumes
+[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
+
+# filesystem checks
+[ -x /sbin/fsck.ext2 ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep ext2|awk '{ print $1}');do fsck.ext2 $i;done;
+}
+[ -x /sbin/fsck.ext3 ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep ext3|awk '{ print $1}');do fsck.ext3 $i;done;
+}
+[ -x /sbin/fsck.ext4 ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep ext4|awk '{ print $1}');do fsck.ext4 $i;done;
+}
+[ -x /sbin/fsck.xfs ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep xfs|awk '{ print $1}');do xfs_repair $i;done;
+}
+# local filesystems
+grep ext2 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep -v "^#" /etc/fstab |grep ext2 >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext2
+	fi
+fi
+grep ext3 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep -v "^#" /etc/fstab |grep ext3 >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext3
+	fi
+fi
+grep ext4 /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab| grep nfs >/dev/null 2>&1
+	grep -v "^#" /etc/fstab |grep ext4 >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		mount -a -t nfs
+		mount -a -t ext4
 	fi
 fi
-grep cifs /proc/filesystems  >/dev/null 2>&1
+grep xfs /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1
+	grep -v "^#" /etc/fstab |grep xfs >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		mount -a -t cifs
+		mount -a -t xfs
 	fi
 fi
 exit 0

package/base-files/src/etc/init.d/fsnet

@@ -1,53 +1,20 @@
 #!/bin/sh
-#INIT 20
+#INIT 60
 [[ $1 = autostart ]] || exit 0
 
-# activate swap
-[ -x /sbin/swapon ] && { swapon -a; }
-
-# activate any logical volumes
-[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
-
-# filesystem checks
-[ -x /sbin/fsck.ext2 ] && {
-	for i in $(grep -v "^#" /etc/fstab|grep ext2|awk '{ print $1}');do fsck.ext2 $i;done;
-}
-[ -x /sbin/fsck.ext3 ] && {
-	for i in $(grep -v "^#" /etc/fstab|grep ext3|awk '{ print $1}');do fsck.ext3 $i;done;
-}
-[ -x /sbin/fsck.ext4 ] && {
-	for i in $(grep -v "^#" /etc/fstab|grep ext4|awk '{ print $1}');do fsck.ext4 $i;done;
-}
-[ -x /sbin/fsck.xfs ] && {
-	for i in $(grep -v "^#" /etc/fstab|grep xfs|awk '{ print $1}');do xfs_repair $i;done;
-}
-# local filesystems
-grep ext2 /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab |grep ext2 >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t ext2
-	fi
-fi
-grep ext3 /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab |grep ext3 >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t ext3
-	fi
-fi
-grep ext4 /proc/filesystems  >/dev/null 2>&1
+# mount net filesystems (nfs/cifs)
+grep nfs /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab |grep ext4 >/dev/null 2>&1
+	grep -v "^#" /etc/fstab| grep nfs >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		mount -a -t ext4
+		mount -a -t nfs
 	fi
 fi
-grep xfs /proc/filesystems  >/dev/null 2>&1
+grep cifs /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab |grep xfs >/dev/null 2>&1
+	grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		mount -a -t xfs
+		mount -a -t cifs
 	fi
 fi
 exit 0

package/base-files/src/etc/init.d/rcK

@@ -4,15 +4,6 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -rnk2 | \
 	    while read line; do
-		shebang=$(sed -n '1s/^#![	 ]*//p' ${line%%:*})
-		case $shebang in
-		*[\	\ ]*) shebang=\'$(echo X"$shebang" | sed \
-		    -e 's/^X//' -e "s/'/'\\\\''/g" \
-		    -e 's/^\([^	 ][^	 ]*\)[	 ]*$/\1/' \
-		    -e 's/^\([^	 ][^	 ]*\)[	 ][	 ]*\(..*\)$/\1 \2/' \
-		    -e 's/^\([^ ][^ ]*\) /\1'\'' '\''/')\' ;;
-		esac
-		${shebang:-/bin/sh} ${line%%:*} autostop 2>&1
+		sh ${line%%:*} autostop
 	done
-	test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
 } | logger -s -p 6 -t ''

package/base-files/src/etc/init.d/rcS

@@ -3,13 +3,13 @@
 if [ -f /proc/sys/kernel/printk ];then
 	echo 0 > /proc/sys/kernel/printk
 fi
+ln -s /proc/self/fd/2 /dev/stderr
 echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-ln -s /proc/self/fd/2 /dev/stderr
 {
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -nk2 | \
 	    while read line; do
 		sh ${line%%:*} autostart
 	    done
-} | tee /dev/stderr |logger -p 6 -t ''
+} |tee /dev/stderr |logger -p 6 -t ''

package/base-files/src/etc/profile

@@ -12,3 +12,5 @@ cat /etc/banner 2>&-
 alias l='ls -lF'
 alias la='ls -A'
 alias ll='ls -alF'
+alias ro='mount -o remount,ro /'
+alias rw='mount -o remount,rw /'

package/base-files/src/etc/rc.shutdown

@@ -1,2 +0,0 @@
-#!/bin/sh
-# add code for shutdown routine

package/base-files/src/init

@@ -1,7 +0,0 @@
-#!/bin/sh
-# devtmpfs does not get automounted for initramfs
-/bin/mount -t devtmpfs devtmpfs /dev
-exec 0</dev/console
-exec 1>/dev/console
-exec 2>/dev/console
-exec /sbin/init $*

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

@@ -572,7 +572,7 @@ config BUSYBOX_FEATURE_MOUNT_NFS
 
 config BUSYBOX_FEATURE_MOUNT_CIFS
 	bool "Support mounting CIFS/SMB file systems"
-	default y
+	default n
 	depends on BUSYBOX_MOUNT
 	help
 	  Enable support for samba mounts.

package/cfgfs/Makefile

@@ -16,7 +16,7 @@ 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 && !ADK_TARGET_ROOTFS_JFFS2 && !ADK_TARGET_ROOTFS_SQUASHFS
-PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE)
+PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE || ADK_PKG_TEST)
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1

package/dri2proto/Makefile

@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dri2proto
-PKG_VERSION:=		2.6
+PKG_VERSION:=		2.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		873142af5db695537cfe05e01d13541f
-PKG_DESCR:=		DRI protocol headers
+PKG_MD5SUM:=		19ea18f63d8ae8053c9fa84b60365b77
+PKG_DESCR:=		DRI2 protocol headers
 PKG_SECTION:=		devel
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=              dev devonly

package/dri3proto/Makefile

@@ -0,0 +1,19 @@
+# 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:=		dri3proto
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		25e84a49a076862277ee12aebd49ff5f
+PKG_DESCR:=		DRI protocol headers
+PKG_SECTION:=		devel
+PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=              dev devonly
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DRI3PROTO,dri3proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/gdb/Makefile

@@ -11,8 +11,6 @@ PKG_DEPENDS:=		libthread-db libncurses libexpat libgcc zlib
 PKG_BUILDDEP:=		ncurses readline libiconv-tiny expat zlib
 PKG_NOPARALLEL:=	1
 
-PKG_ARCH_DEPENDS:=	!m68k
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/glib/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
 PKG_VERSION:=		2.38.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_EXTRAVER:=		2.38
 PKG_MD5SUM:=		26d1d08e478fc48c181ca8be44f5b69f
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
@@ -44,6 +44,7 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			ac_cv_func_posix_getgrgid_r=yes
 
 HOST_CONFIGURE_ARGS+=	--disable-fam \
+			--enable-static \
 			--disable-compile-warnings
 
 glib-install:

package/glproto/Makefile

@@ -4,11 +4,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		glproto
-PKG_VERSION:=		1.4.15
+PKG_VERSION:=		1.4.17
 PKG_RELEASE:=		1
 PKG_DESCR:=		OpenGL headers
 PKG_SECTION:=		devel
-PKG_MD5SUM:=		be7c4e3c289db480b9e1238c03637eb7
+PKG_MD5SUM:=		d69554c1b51a83f2c6976a640819911b
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 

package/gpsd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpsd
 PKG_VERSION:=		3.10
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		fc5b03aae38b9b5b6880b31924d0ace3
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		misc

package/gpsd/patches/patch-gpsmon_c

@@ -0,0 +1,13 @@
+--- gpsd-3.10.orig/gpsmon.c	2013-11-21 09:57:44.000000000 +0100
++++ gpsd-3.10/gpsmon.c	2014-03-16 09:08:34.000000000 +0100
+@@ -505,6 +505,10 @@ static /*@null@*/ char *curses_get_comma
+     static char line[80];
+     int c;
+ 
++#ifndef __GLIBC__
++#define CTRL(x)     (x&037)
++#endif
++
+     c = wgetch(cmdwin);
+     if (c == CTRL('L')) {
+ 	(void)clearok(stdscr, true);

package/inputproto/Makefile

@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		inputproto
-PKG_VERSION:=		2.2
+PKG_VERSION:=		2.3
 PKG_RELEASE:=		1
 PKG_DESCR:=		X Input Extension headers
 PKG_SECTION:=		devel
 PKG_BUILDDEP:=		inputproto-host
-PKG_MD5SUM:=		e0047823230413e67d74e92af77fbe58
+PKG_MD5SUM:=		5ea366d32a9a78d6204a47ea35d9dc5c
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 

package/iptables/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		iptables
 PKG_VERSION:=		1.4.21
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		536d048c8e8eeebcd9757d0863ebb0c0
 PKG_DESCR:=		The netfilter firewalling software
 PKG_SECTION:=		firewall

package/iptables/patches/patch-include_linux_netfilter_xt_osf_h

@@ -1,12 +0,0 @@
---- iptables-1.4.20.orig/include/linux/netfilter/xt_osf.h	2013-08-06 17:48:43.000000000 +0200
-+++ iptables-1.4.20/include/linux/netfilter/xt_osf.h	2013-09-04 11:34:30.000000000 +0200
-@@ -21,6 +21,9 @@
- #define _XT_OSF_H
- 
- #include <linux/types.h>
-+#if !defined(__GLIBC__)
-+#include <linux/tcp.h>
-+#endif
- 
- #define MAXGENRELEN		32
- 

package/libdrm/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libdrm
-PKG_VERSION:=		2.4.44
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		205fbaedfab827a874265420d38547f0
+PKG_VERSION:=		2.4.52
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		cb3547ccb435be6d80df68840da6b2ee
 PKG_DESCR:=		DRM library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		libpthread-stubs cairo libpciaccess

package/libssh/Makefile

@@ -4,17 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libssh
-PKG_VERSION:=		0.5.3
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		9ad01838d3b89d98e900e0f6260a88cc
+PKG_VERSION:=		0.6.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		66cf16e77f60913b4d54f18c92cdbf71
 PKG_DESCR:=		SSH library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl zlib
 PKG_BUILDDEP:=		cmake-host openssl zlib
 PKG_URL:=		http://www.libssh.org/
-PKG_SITES:=		http://www.libssh.org/files/0.5/
+PKG_SITES:=		https://red.libssh.org/attachments/download/87/
 PKG_OPTS:=		dev
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))

package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake

@@ -1,6 +1,6 @@
---- libssh-0.5.3.orig/cmake/Modules/DefineCompilerFlags.cmake	2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/cmake/Modules/DefineCompilerFlags.cmake	2013-12-17 13:20:04.073723090 +0100
-@@ -20,11 +20,6 @@ if (UNIX AND NOT WIN32)
+--- libssh-0.6.3.orig/cmake/Modules/DefineCompilerFlags.cmake	2014-02-06 10:20:57.000000000 +0100
++++ libssh-0.6.3/cmake/Modules/DefineCompilerFlags.cmake	2014-03-14 09:10:56.621673326 +0100
+@@ -21,11 +21,6 @@ if (UNIX AND NOT WIN32)
              set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
          endif (WITH_FPIC)
  
@@ -9,6 +9,6 @@
 -            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
 -        endif (WITH_STACK_PROTECTOR)
 -
-         check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
-         if (WITH_FORTIFY_SOURCE)
-             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+         if (CMAKE_BUILD_TYPE)
+             string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+             if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel))

package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake

@@ -1,5 +1,5 @@
---- libssh-0.5.3.orig/cmake/Modules/FindZLIB.cmake	2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/cmake/Modules/FindZLIB.cmake	2014-01-11 12:11:52.000000000 +0100
+--- libssh-0.6.3.orig/cmake/Modules/FindZLIB.cmake	2013-12-21 18:37:12.000000000 +0100
++++ libssh-0.6.3/cmake/Modules/FindZLIB.cmake	2014-03-14 09:07:03.296701809 +0100
 @@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
          NAMES
              zlib.h
@@ -13,9 +13,9 @@
      )
      mark_as_advanced(ZLIB_INCLUDE_DIR)
  
-@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
-             zlib
+@@ -99,12 +99,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
              zlib1
+             zlibd
          PATHS
 +            ${ZLIB_ROOT_DIR}/lib
              /usr/local/lib

package/libssh/patches/patch-include_libssh_libssh_h

@@ -1,6 +1,6 @@
---- libssh-0.5.3.orig/include/libssh/libssh.h	2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/include/libssh/libssh.h	2014-01-11 12:04:00.000000000 +0100
-@@ -57,6 +57,7 @@
+--- libssh-0.6.3.orig/include/libssh/libssh.h	2014-03-04 13:20:48.000000000 +0100
++++ libssh-0.6.3/include/libssh/libssh.h	2014-03-14 09:07:03.304701842 +0100
+@@ -56,6 +56,7 @@
    typedef unsigned long long uint64_t;
    typedef int mode_t;
  #else /* _MSC_VER */

package/libthread_db/Makefile

@@ -19,8 +19,6 @@ PKG_SECTION:=		libs
 
 PKG_CFLINE_LIBTHREAD_DB:=depends on ADK_PACKAGE_GDB || ADK_PACKAGE_GDBSERVER
 
-PKG_ARCH_DEPENDS:=	!m68k
-
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk

package/libxcb/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libxcb
-PKG_VERSION:=		1.9.1
+PKG_VERSION:=		1.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		324c76024a73dba8a902638696ba87de
+PKG_MD5SUM:=		a484793fbfb974b09d54fa1ebf44b2e4
 PKG_DESCR:=		X11 keyboard library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXau-host libpthread-stubs-host xcb-proto-host

package/libxshmfence/Makefile

@@ -0,0 +1,23 @@
+# 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:=		libxshmfence
+PKG_VERSION:=		1.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		323bb06c70765a2395df1d9c7ec3d14a
+PKG_DESCR:=		X11 xshmfence library
+PKG_SECTION:=		x11/libs
+PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXSHMFENCE,libxshmfence,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libxshmfence-install:
+	${INSTALL_DIR} ${IDIR_LIBXSHMFENCE}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libxshmfence.so* ${IDIR_LIBXSHMFENCE}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/mpd/Makefile

@@ -16,8 +16,6 @@ PKG_URL:=		http://www.musicpd.org/
 PKG_SITES:=		http://www.musicpd.org/download/mpd/0.18/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!m68k
-
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_FLAVOURS_MPD:=	WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR

package/ncurses/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ncurses
 PKG_VERSION:=		5.9
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		8cb9c412e5f2d96bc6f459aa8c6282a1
 PKG_DESCR:=		a terminal handling library
 PKG_SECTION:=		libs
@@ -81,18 +81,13 @@ libncurses-install:
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib{tinfo,form,menu,ncurses,panel}.so* \
 	    ${IDIR_LIBNCURSES}/usr/lib
-	for ti in rxvt rxvt-unicode; do \
-		TERMINFO=${WRKINST}/usr/share/terminfo \
-		PATH=$(HOST_PATH) \
-		tic$(EXEEXT) -x ./files/$$ti.ti; \
-	done
 ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y)
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share
 	${CP} ${WRKINST}/usr/share/terminfo ${IDIR_LIBNCURSES}/usr/share/
 else
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/
 	for f in ansi dumb linux screen vt100 vt102 \
-	    rxvt rxvt-unicode vt220 xterm xterm-color xterm-xfree86; do \
+	    vt220 xterm xterm-color xterm-xfree86; do \
 		${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \
 		${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \
 		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \

package/olsrd/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		olsrd
-PKG_VERSION:=		0.6.0
+PKG_VERSION:=		0.6.6.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		84e9295457cab50539f776118939b343
+PKG_MD5SUM:=		65181a5280391d69411908c186fd0c1f
 PKG_DESCR:=		Optimized Link State Routing protocol
 PKG_SECTION:=		wifi
 PKG_URL:=		http://www.olsr.org/
@@ -33,19 +33,17 @@ $(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 $(eval $(call PKG_mod_template,OLSRD_MOD_DYN_GW,dyn_gw))
 $(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo))
 $(eval $(call PKG_mod_template,OLSRD_MOD_NAMESERVICE,nameservice))
-$(eval $(call PKG_mod_template,OLSRD_MOD_TAS,tas))
 
 CONFIG_STYLE:=          manual
 
-TARGET_CFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC -D_GNU_SOURCE
 ALL_TARGET+=		libs
 INSTALL_TARGET+=	install_libs
-MAKE_ENV+=		OS="linux" NODEBUG=1 STRIP="true" OFLAGS="${TARGET_CFLAGS}"
+MAKE_ENV+=		OS="linux" DEBUG=0 STRIP="true" OFLAGS="${TARGET_CFLAGS}" prefix="/usr"
 
 post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} ${IDIR_OLSRD}/usr/sbin ${IDIR_OLSRD}/etc

package/olsrd/patches/patch-Makefile

@@ -1,11 +0,0 @@
---- olsrd-0.6.0.orig/Makefile	2010-05-13 12:52:55.000000000 +0200
-+++ olsrd-0.6.0/Makefile	2010-10-10 14:34:11.000000000 +0200
-@@ -144,7 +144,7 @@ rpm:
- 
- # This is quite ugly but at least it works
- ifeq ($(OS),linux)
--SUBDIRS = $(notdir $(shell find lib -maxdepth 2 -name Makefile -not -path lib/Makefile -printf "%h\n"|sort))
-+SUBDIRS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo mini nameservice pgraph quagga secure tas txtinfo
- else
- ifeq ($(OS),win32)
- SUBDIRS := dot_draw httpinfo mini pgraph secure txtinfo

package/olsrd/patches/patch-make_Makefile_linux

@@ -1,23 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- olsrd-0.6.0.orig/make/Makefile.linux	2010-03-31 19:03:53.000000000 +0200
-+++ olsrd-0.6.0/make/Makefile.linux	2010-10-10 14:34:11.000000000 +0200
-@@ -4,7 +4,7 @@
- 
- ARCH := $(shell uname -m)
- DESTDIR ?=
--LIBDIR =	$(DESTDIR)$(shell if [ "$(ARCH)" = "x86_64" -a -d "/usr/lib64" ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
-+LIBDIR =	$(DESTDIR)/usr/lib
- 
- SRCS += 	$(wildcard src/linux/*.c src/unix/*.c)
- HDRS +=		$(wildcard src/linux/*.h src/unix/*.h)
-@@ -13,8 +13,8 @@ CPPFLAGS += 	-Dlinux -DLINUX_NETLINK_ROU
- LIBS +=		
- 
- PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
--INSTALL_LIB =	install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
--		/sbin/ldconfig -n $(LIBDIR)
-+INSTALL_LIB =	install -d -m 755 $(LIBDIR); \
-+		install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME);
- 
- ifdef OLSRD_PLUGIN
- GENERATE_PIC = true

package/olsrd/patches/patch-src_unix_ifnet_c

@@ -1,13 +0,0 @@
---- olsrd-0.6.0.orig/src/unix/ifnet.c	2010-04-22 17:11:11.000000000 +0200
-+++ olsrd-0.6.0/src/unix/ifnet.c	2010-10-10 14:34:54.000000000 +0200
-@@ -547,10 +547,8 @@ chk_if_up(struct olsr_if *iface, int deb
-   struct ifreq ifr;
-   union olsr_ip_addr null_addr;
-   size_t name_size;
--#ifdef linux
-   int precedence = IPTOS_PREC(olsr_cnf->tos);
-   int tos_bits = IPTOS_TOS(olsr_cnf->tos);
--#endif
- 
-   if (iface->host_emul)
-     return -1;

package/openvpn/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		openvpn
 PKG_VERSION:=		2.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		06e5f93dbf13f2c19647ca15ffc23ac1
 PKG_DESCR:=		Open Source VPN solution using SSL
 PKG_SECTION:=		net/security
@@ -14,9 +14,7 @@ PKG_DEPENDS:=		kmod-tun ip
 PKG_URL:=		http://openvpn.net/
 PKG_SITES:=		http://swupdate.openvpn.org/community/releases/
 
-PKG_FLAVOURS_OPENVPN:=	WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS SERVER CLIENT
-PKGFD_SERVER:=		deliver server example configuration
-PKGFD_CLIENT:=		deliver client example configuration
+PKG_FLAVOURS_OPENVPN:=	WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS
 PKGFD_WITH_LZO:=	enable LZO compression support
 PKGFS_WITH_LZO:=	liblzo
 PKGFB_WITH_LZO:=	liblzo
@@ -77,13 +75,7 @@ CONFIGURE_ARGS+=	--disable-plugins \
 openvpn-install:
 	${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
-ifeq ($(ADK_PACKAGE_OPENVPN_SERVER),y)
-	$(CP) ./files/server.conf $(IDIR_OPENVPN)/etc/openvpn/
-	echo "/etc/openvpn/server.conf" > ./files/openvpn.conffiles
-endif
-ifeq ($(ADK_PACKAGE_OPENVPN_CLIENT),y)
-	$(CP) ./files/client.conf $(IDIR_OPENVPN)/etc/openvpn/
-	echo "/etc/openvpn/client.conf" > ./files/openvpn.conffiles
-endif
+	$(CP) ./files/server.conf $(IDIR_OPENVPN)/etc/openvpn/server.conf.example
+	$(CP) ./files/client.conf $(IDIR_OPENVPN)/etc/openvpn/client.conf.example
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/orbit2/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		ORBit2
 PKG_VERSION:=		2.14.19
 PKG_EXTRAVER:=		2.14
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		87c69c56c6d0bdafa4de5e18ae115cc9
 PKG_DESCR:=		a CORBA 2.4-compliant Object Request Broker
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		gettext-tiny glib-host libIDL-host libIDL
+PKG_BUILDDEP:=		gettext-tiny glib-host libIDL-host glib libIDL
 PKG_URL:=		http://projects.gnome.org/ORBit2/
 PKG_SITES:=		ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
 PKG_LIBNAME:=		orbit2
@@ -21,8 +21,10 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CFLAGS_FOR_BUILD+=	$(shell PATH=$(HOST_PATH) libIDL-config-2 --cflags)
-LDFLAGS_FOR_BUILD+=	$(shell PATH=$(HOST_PATH) libIDL-config-2 --libs)
-LDFLAGS_FOR_BUILD+=	-lgmodule-2.0
+LDFLAGS_FOR_BUILD+=	-static
+LIBS_FOR_BUILD:=	$(shell PATH=$(HOST_PATH) libIDL-config-2 --libs)
+LIBS_FOR_BUILD+=	-lgmodule-2.0 -ldl -lpthread -lrt -lglib-2.0
+XAKE_FLAGS+=		LIBS_FOR_BUILD="${LIBS_FOR_BUILD}"
 CONFIGURE_ENV+=		ac_cv_alignof_CORBA_octet=1 \
 			ac_cv_alignof_CORBA_boolean=1 \
 			ac_cv_alignof_CORBA_char=1 \

package/orbit2/patches/patch-src_idl-compiler_Makefile_in

@@ -1,5 +1,5 @@
 --- ORBit2-2.14.19.orig/src/idl-compiler/Makefile.in	2010-09-28 11:39:39.000000000 +0200
-+++ ORBit2-2.14.19/src/idl-compiler/Makefile.in	2011-03-25 20:28:46.000000000 +0100
++++ ORBit2-2.14.19/src/idl-compiler/Makefile.in	2014-03-15 20:45:12.000000000 +0100
 @@ -66,15 +66,13 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
@@ -43,3 +43,12 @@
  
  orbit_idl_2_LDADD = \
  	$(ORBIT_IDL_LIBS)		\
+@@ -383,7 +380,7 @@ clean-binPROGRAMS:
+ 	rm -f $$list
+ orbit-idl-2$(EXEEXT): $(orbit_idl_2_OBJECTS) $(orbit_idl_2_DEPENDENCIES) 
+ 	@rm -f orbit-idl-2$(EXEEXT)
+-	$(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS)
++	$(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS) $(LIBS_FOR_BUILD)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)

package/parted/Makefile

@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		parted
 PKG_VERSION:=		3.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		5d89d64d94bcfefa9ce8f59f4b81bdcb
 PKG_DESCR:=		partition table editor
 PKG_SECTION:=		fs
-PKG_DEPENDS:=		libuuid libreadline libpthread libgcc
+PKG_DEPENDS:=		libblkid libuuid libreadline libpthread libgcc
 PKG_BUILDDEP:=		util-linux readline
 PKG_URL:=		http://www.gnu.org/software/parted/index.shtml
 PKG_SITES:=		${MASTER_SITE_GNU:=parted/}

package/presentproto/Makefile

@@ -0,0 +1,19 @@
+# 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:=		presentproto
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		57eaf4bb58e86476ec89cfb42d675961
+PKG_DESCR:=		present protocol headers
+PKG_SECTION:=		devel
+PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=              dev devonly
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PRESENTPROTO,presentproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/randrproto/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		randrproto
-PKG_VERSION:=		1.3.2
+PKG_VERSION:=		1.4.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b8fd2f75cf156c9f6e6771addd07ef59
+PKG_MD5SUM:=		af44f250b89783eb4967f1dc5b32ef68
 PKG_DESCR:=		Xrandr protcol headers
 PKG_SECTION:=		devel
 PKG_SITES:=		${MASTER_SITE_XORG}

package/xcb-proto/Makefile

@@ -4,11 +4,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xcb-proto
-PKG_VERSION:=		1.8
+PKG_VERSION:=		1.10
 PKG_RELEASE:=		1
 PKG_DESCR:=		XML-XCB protocol descriptions
 PKG_SECTION:=		devel
-PKG_MD5SUM:=		8d2cdb770129cef563088a90c5bec768
+PKG_MD5SUM:=		2b9dc6442156aba2bfb4133cb9d7cf46
 PKG_BUILDDEP:=		autotool bzip2-host python2-host xcb-proto-host
 PKG_SITES:=		http://xcb.freedesktop.org/dist/
 PKG_OPTS:=		dev devonly

package/xextproto/Makefile

@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xextproto
-PKG_VERSION:=		7.2.1
+PKG_VERSION:=		7.3.0
 PKG_RELEASE:=		1
 PKG_DESCR:=		X Protocol Extensions headers
 PKG_SECTION:=		devel
 PKG_BUILDDEP:=		xextproto-host
-PKG_MD5SUM:=		9062d689f422fad1b8774c967d730f09
+PKG_MD5SUM:=		37b700baa8c8ea7964702d948dd13821
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 

package/xf86-input-keyboard/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-input-keyboard
-PKG_VERSION:=		1.6.1
+PKG_VERSION:=		1.8.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c2188611990880f06f7d6c2a7672af1b
+PKG_MD5SUM:=		4f3e135e04939916f37f91a111c6f70b
 PKG_DESCR:=		X11 driver for keyboard
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server

package/xf86-input-mouse/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-input-mouse
-PKG_VERSION:=		1.7.2
+PKG_VERSION:=		1.9.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0f2f2dfb7b769544f04b3469803098a5
+PKG_MD5SUM:=		125402066940ef30737721243bb1b77e
 PKG_DESCR:=		X11 driver for mouse
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server

package/xf86-video-siliconmotion/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-siliconmotion
-PKG_VERSION:=		1.7.6
+PKG_VERSION:=		1.7.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b71859e15fc62563d346c7bccc0ef82e
+PKG_MD5SUM:=		94c44123d8d0a46a7f6bace8508763d8
 PKG_DESCR:=		X11 driver for Silicon Motion VGA chips
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server
@@ -21,6 +21,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_SILICONMOTION,xf86-video-siliconmotion,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--disable-xaa
+
 xf86-video-siliconmotion-install:
 	${INSTALL_DIR} ${IDIR_XF86_VIDEO_SILICONMOTION}/usr/lib/xorg/modules/drivers
 	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/siliconmotion_*.so \

package/xf86-video-siliconmotion/patches/patch-src_Makefile_in

@@ -0,0 +1,11 @@
+--- xf86-video-siliconmotion-1.7.7.orig/src/Makefile.in	2012-07-17 08:28:17.000000000 +0200
++++ xf86-video-siliconmotion-1.7.7/src/Makefile.in	2014-03-14 18:09:06.901850694 +0100
+@@ -288,7 +288,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(PCIACCESS_CFLAGS)
++AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
+ siliconmotion_drv_la_LTLIBRARIES = siliconmotion_drv.la
+ siliconmotion_drv_la_LDFLAGS = -module -avoid-version
+ siliconmotion_drv_ladir = @moduledir@/drivers

package/xf86-video-siliconmotion/patches/patch-src_smi_driver_c

@@ -0,0 +1,11 @@
+--- xf86-video-siliconmotion-1.7.7.orig/src/smi_driver.c	2012-07-17 06:53:21.000000000 +0200
++++ xf86-video-siliconmotion-1.7.7/src/smi_driver.c	2014-03-14 18:39:37.307139846 +0100
+@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   "Done writing mode.  Register dump:\n");
+     SMI_PrintRegs(pScrn);
+ 
+-    miInitializeBackingStore(pScreen);
+-
+ #ifdef HAVE_XMODES
+     xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset));
+ #endif

package/xf86-video-siliconmotion/patches/loongson.patch → package/xf86-video-siliconmotion/patches/patch-src_smi_video_c

@@ -1,7 +1,6 @@
-diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotion-1.7.4-loongson/src/smi_video.c
---- xf86-video-siliconmotion-1.7.4/src/smi_video.c	2010-02-25 08:33:07.000000000 +0100
-+++ xf86-video-siliconmotion-1.7.4-loongson/src/smi_video.c	2012-03-13 04:18:18.634989344 +0100
-@@ -276,6 +276,7 @@
+--- xf86-video-siliconmotion-1.7.7.orig/src/smi_video.c	2012-07-17 06:53:21.000000000 +0200
++++ xf86-video-siliconmotion-1.7.7/src/smi_video.c	2014-03-14 18:35:37.546382342 +0100
+@@ -275,6 +275,7 @@ static XF86ImageRec SMI_VideoImages[] =
      XVIMAGE_YUY2,
      XVIMAGE_YV12,
      XVIMAGE_I420,
@@ -9,7 +8,7 @@ diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotio
      {
  	FOURCC_RV15,			/* id				*/
  	XvRGB,				/* type				*/
-@@ -1464,6 +1465,117 @@
+@@ -1461,6 +1462,117 @@ SMI_QueryBestSize(
      LEAVE();
  }
  
@@ -127,7 +126,7 @@ diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotio
  
  static int
  SMI_PutImage(
-@@ -1592,7 +1704,7 @@
+@@ -1592,7 +1704,7 @@ SMI_PutImage(
  		offset3 = tmp;
  	    }
  	    nLines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;

package/xorg-server/Makefile

@@ -4,19 +4,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xorg-server
-PKG_VERSION:=		1.12.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		a95c896fbe8322c3c8d518a13eb74c7a
+PKG_VERSION:=		1.15.0
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		faf04f1213f9a476997a774254b3abce
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11/server
 PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile
 PKG_DEPENDS+=		libfontenc xkeyboard-config xkbcomp libxau libxaw
 PKG_DEPENDS+=		libxmu libxpm libxrender libxt libxxf86dga libxext
 PKG_DEPENDS+=		libxdmcp libxv libsm libice libx11 libxcb libgcc librt
+PKG_DEPENDS+=		libxshmfence libfreetype libfontenc
 PKG_BUILDDEP:=		libX11 randrproto renderproto fixesproto damageproto
 PKG_BUILDDEP+=		scrnsaverproto resourceproto fontsproto videoproto
 PKG_BUILDDEP+=		compositeproto evieext libxkbfile libXfont pixman
 PKG_BUILDDEP+=		libpciaccess openssl xf86dgaproto recordproto
+PKG_BUILDDEP+=		xineramaproto
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
@@ -28,7 +30,7 @@ PKG_ARCH_DEPENDS:=	!m68k
 PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib
 PKGFD_WITH_DRI:=		enable DRI/DRI2 support
-PKGFB_WITH_DRI:=		xf86driproto glproto dri2proto MesaLib
+PKGFB_WITH_DRI:=		xf86driproto glproto MesaLib
 PKGFD_WITH_KDRIVE:=		Build Kdrive Xfbdev server
 
 PKG_CHOICES_XORG_SERVER:=	WITH_GCRYPT WITH_CRYPTO
@@ -43,7 +45,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CPPFLAGS+=	-D_GNU_SOURCE
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t
 
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y)
 CONFIGURE_ARGS+=	 --with-sha1=libgcrypt
@@ -57,9 +59,10 @@ CONFIGURE_ENV+=		V=1
 CONFIGURE_ARGS+=	--enable-dga \
 			--enable-xorg \
 			--enable-xv \
-			--enable-xaa \
 			--enable-vgahw \
 			--enable-dpms \
+			--enable-xinerama \
+			--disable-docs \
 			--disable-aiglx \
 			--disable-config-hal \
 			--disable-config-udev \
@@ -68,7 +71,6 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--disable-xf86bigfont \
 			--disable-xf86vidmode \
 			--disable-xfake \
-			--disable-xinerama \
 			--disable-xnest \
 			--disable-xselinux \
 			--disable-xcsecurity \
@@ -85,9 +87,9 @@ CONFIGURE_ARGS+=	--disable-kdrive --disable-xfbdev
 endif
 
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
-CONFIGURE_ARGS+=	--enable-dri --enable-dri2 --enable-glx
+CONFIGURE_ARGS+=	--enable-dri --enable-dri2 --enable-dri3 --enable-glx
 else
-CONFIGURE_ARGS+=	--disable-dri --disable-dri2 --disable-glx
+CONFIGURE_ARGS+=	--disable-dri --disable-dri2 --disable-dri3 --disable-glx
 endif
 
 ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
@@ -116,10 +118,6 @@ endif
 ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y)
 	${CP} ./files/xorg.conf.sharp-zaurus \
 		$(IDIR_XORG_SERVER)/etc/X11/xorg.conf
-endif
-ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
-	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \
-		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
 endif
 	# add m4 file to host directory
 	$(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal

package/xorg-server/files/xorg.conf.lemote-yeelong

@@ -12,13 +12,10 @@ Section "Module"
        Load  "vgahw"
        Load  "fb"
        Load  "exa"
-       Load  "xaa"
        Load  "int10"
        Load  "ddc"
        Load  "i2c"
        Load  "vbe"
-       Disable "glx"
-       Disable "dri"
 EndSection
 
 Section "Device"
@@ -27,7 +24,7 @@ Section "Device"
        VendorName  "Silicon Motion, Inc."
        BoardName   "SM712 LynxEM+"
        BusID       "PCI:0:8:0"
-       Option      "AccelMethod"       "XAA"
+       Option      "AccelMethod"        "EXA"
        Option      "pci_burst"         "true"
        Option      "PanelSize"         "1024x600"
 EndSection

package/xorg-server/patches/patch-fb_fb_h

@@ -1,13 +0,0 @@
-	Fix for xf86-video-siliconmotion in 16bpp with XAA, see:
-	http://groups.google.com/group/loongson-dev/browse_thread/thread/570549e3d7894fef/5f04b3d9370adfd2
---- xorg-server-1.12.2.orig/fb/fb.h	2012-05-29 22:04:19.000000000 +0200
-+++ xorg-server-1.12.2/fb/fb.h	2013-04-30 10:33:00.000000000 +0200
-@@ -70,7 +70,7 @@
- #define FBPREFIX(x) fb##x
- #define WRITE(ptr, val) (*(ptr) = (val))
- #define READ(ptr) (*(ptr))
--#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size))
-+#define MEMCPY_WRAPPED(dst, src, size) memmove((dst), (src), (size))
- #define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size))
- 
- #endif

package/xorg-server/patches/patch-hw_kdrive_linux_linux_c

@@ -1,13 +0,0 @@
---- xorg-server-1.12.2.orig/hw/kdrive/linux/linux.c	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/kdrive/linux/linux.c	2013-12-22 20:10:03.000000000 +0100
-@@ -66,8 +66,8 @@ static void
- LinuxCheckChown(char *file)
- {
-     struct stat st;
--    __uid_t u;
--    __gid_t g;
-+    uid_t u;
-+    gid_t g;
- 
-     if (stat(file, &st) < 0)
-         return;

package/xorg-server/patches/patch-hw_xfree86_common_compiler_h

@@ -1,58 +1,13 @@
---- xorg-server-1.12.2.orig/hw/xfree86/common/compiler.h	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/common/compiler.h	2013-04-30 10:52:21.000000000 +0200
-@@ -710,26 +710,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b
- #define PORT_SIZE short
- #endif
- 
--_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
-+_X_EXPORT volatile unsigned char *ioBase;  /* Memory mapped I/O port area */
- 
- static __inline__ void
- outb(unsigned PORT_SIZE port, unsigned char val)
- {
--    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
-+    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) =
-         val;
- }
- 
- static __inline__ void
- outw(unsigned PORT_SIZE port, unsigned short val)
- {
--    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
-+    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) =
-         val;
- }
- 
- static __inline__ void
- outl(unsigned PORT_SIZE port, unsigned int val)
- {
--    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
-+    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
-         val;
+from alpinelinux
+
+--- xorg-server-1.15.0.orig/hw/xfree86/common/compiler.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/common/compiler.h	2014-03-14 23:25:52.000000000 +0100
+@@ -995,7 +995,7 @@ inl(unsigned short port)
+     return xf86ReadMmio32Le((void *) ioBase, port);
  }
  
-@@ -737,21 +737,21 @@ static __inline__ unsigned int
- inb(unsigned PORT_SIZE port)
- {
-     return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
--                                        IOPortBase);
-+                                        ioBase);
- }
- 
- static __inline__ unsigned int
- inw(unsigned PORT_SIZE port)
- {
-     return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
--                                         IOPortBase);
-+                                         ioBase);
- }
- 
- static __inline__ unsigned int
- inl(unsigned PORT_SIZE port)
- {
-     return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
--                                       IOPortBase);
-+                                       ioBase);
- }
+-#elif defined(__arm__) && defined(__linux__)
++#elif defined(__arm__) && defined(__GLIBC__)
  
- #if defined(__mips__)
+ /* for Linux on ARM, we use the LIBC inx/outx routines */
+ /* note that the appropriate setup via "ioperm" needs to be done */

package/xorg-server/patches/patch-hw_xfree86_dri_dri_h

@@ -1,11 +0,0 @@
---- xorg-server-1.7.5.orig/hw/xfree86/dri/dri.h	2009-08-11 06:00:23.000000000 +0200
-+++ xorg-server-1.7.5/hw/xfree86/dri/dri.h	2010-04-21 19:59:22.000000000 +0200
-@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- #include <pciaccess.h>
- 
- #include "scrnintstr.h"
--#include "xf86dri.h"
-+#include <X11/dri/xf86dri.h>
- 
- typedef int DRISyncType;
- 

package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h

@@ -1,11 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/dri/sarea.h	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/dri/sarea.h	2013-04-30 10:33:00.000000000 +0200
-@@ -41,6 +41,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 			0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX			0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX			0x10000 /* 64kB */
- #else

package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c

@@ -1,13 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_init.c	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_init.c	2013-04-30 10:33:00.000000000 +0200
-@@ -75,8 +75,8 @@ xf86OpenConsole(void)
-     struct vt_mode VT;
-     struct vt_stat vts;
-     MessageType from = X_PROBED;
--    char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
--    char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
-+    char *tty0[] = { "/dev/tty0", NULL };
-+    char *vcs[] = { "/dev/tty%d", NULL };
- 
-     if (serverGeneration == 1) {
- 

package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c

@@ -1,56 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_video.c	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_video.c	2013-04-30 10:49:01.000000000 +0200
-@@ -472,7 +472,7 @@ unmapVidMem(int ScreenNum, pointer Base,
- /* I/O Permissions section                                                 */
- /***************************************************************************/
- 
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- volatile unsigned char *ioBase = NULL;
- 
- #ifndef __NR_pciconfig_iobase
-@@ -484,7 +484,7 @@ volatile unsigned char *ioBase = NULL;
- Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
-     int fd;
-     unsigned int ioBase_phys;
- #endif
-@@ -492,8 +492,12 @@ xf86EnableIO(void)
-     if (ExtendedEnabled)
-         return TRUE;
- 
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
-+#ifdef __powerpc__
-     ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
-+#else
-+    ioBase_phys = 0x1fd00000;
-+#endif	
- 
-     fd = open("/dev/mem", O_RDWR);
-     if (ioBase == NULL) {
-@@ -511,7 +515,7 @@ xf86EnableIO(void)
- #endif
-     }
-     close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
-     if (ioperm(0, 1024, 1) || iopl(3)) {
-         if (errno == ENODEV)
-             ErrorF("xf86EnableIOPorts: no I/O ports found\n");
-@@ -537,10 +541,10 @@ xf86DisableIO(void)
- {
-     if (!ExtendedEnabled)
-         return;
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
-     munmap(ioBase, 0x20000);
-     ioBase = NULL;
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
-     iopl(0);
-     ioperm(0, 1024, 0);
- #endif

package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h

@@ -1,14 +1,16 @@
---- xorg-server-1.12.2.orig/hw/xfree86/os-support/xf86_OSlib.h	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/os-support/xf86_OSlib.h	2013-10-29 15:23:18.000000000 +0100
-@@ -178,11 +178,7 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/os-support/xf86_OSlib.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/os-support/xf86_OSlib.h	2014-03-14 22:59:25.000000000 +0100
+@@ -177,12 +177,8 @@
+ #include <stdlib.h>
  #include <sys/types.h>
  #include <assert.h>
- 
+-
 -#ifdef __linux__
 -#include <termio.h>
 -#else                           /* __GLIBC__ */
  #include <termios.h>
 -#endif
++
  #ifdef __sparc__
  #include <sys/param.h>
  #endif

package/xorg-server/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- xorg-server-1.12.2.orig/ltmain.sh	2012-05-29 22:06:05.000000000 +0200
-+++ xorg-server-1.12.2/ltmain.sh	2013-04-30 10:33:00.000000000 +0200
-@@ -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=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

package/xtrans/Makefile

@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xtrans
-PKG_VERSION:=		1.2.6
+PKG_VERSION:=		1.3.3
 PKG_RELEASE:=		1
 PKG_DESCR:=		X11 network protocol transport library
 PKG_SECTION:=		devel
 PKG_BUILDDEP:=		xtrans-host
-PKG_MD5SUM:=		b91dd22b77a350d129a81175cd8c58cc
+PKG_MD5SUM:=		c83d04cd878f1e51a44d132aa1d5b932
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 

scripts/install.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #-
-# Copyright © 2010, 2011
+# Copyright © 2010-2014
 #	Waldemar Brodkorb <wbx@openadk.org>
 #	Thorsten Glaser <tg@mirbsd.org>
 #
@@ -32,25 +32,14 @@
 # • create a cfgfs partition
 
 TOPDIR=$(pwd)
+HOST=$(gcc -dumpmachine)
 me=$0
 
 case :$PATH: in
-(*:$TOPDIR/bin/tools:*) ;;
-(*) export PATH=$PATH:$TOPDIR/bin/tools ;;
+(*:$TOPDIR/host_$HOST/usr/bin:*) ;;
+(*) export PATH=$PATH:$TOPDIR/host_$HOST/usr/bin ;;
 esac
 
-test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then
-	make package=mksh fetch || exit 1
-	df=$(cd package/mksh; TOPDIR="$TOPDIR" gmake show=DISTFILES)
-	mkdir -p build_mksh
-	gzip -dc dl/"$df" | (cd build_mksh; cpio -mid)
-	cd build_mksh/mksh
-	bash Build.sh -r -c lto || exit 1
-	cp mksh "$TOPDIR"/bin/tools/
-	cd "$TOPDIR"
-	rm -rf build_mksh
-fi
-
 test -n "$KSH_VERSION" || exec mksh "$me" "$@"
 if test -z "$KSH_VERSION"; then
 	echo >&2 Fatal error: could not run myself with mksh!

target/Makefile

@@ -6,12 +6,6 @@ include $(TOPDIR)/mk/rootfs.mk
 
 all: install
 
-ifeq (${ADK_TARGET_KERNEL64},y)
-KERNEL_CFG:=kernel64.config
-else
-KERNEL_CFG:=kernel.config
-endif
-
 ### Kernel .config Creation
 # The following target combines all kernel-related variables and
 # config files into a single one to be used as the final kernel
@@ -22,21 +16,19 @@ endif
 #    .kernelconfig.modules and set them to "m"
 # 2) fetch all enabled ADK_KERNEL_* vars into
 #    .kernelconfig.kernel (no conversion, as they are booleans)
-# 3) repeat 2) for the disabled ones and save them into
-#    .kernelconfig.nokernel (to overwrite defaults)
-# 4) get the device-specific static kernel config and place it into
+# 3) get the global and device-specific static kernel config and place it into
 #    .kernelconfig.board
-# 5) prepare for merging:
+# 4) prepare for merging:
 #    * if a variable is disabled in .kernelconfig.board and
 #      enabled in either of .kernelconfig.{modules,kernel},
 #      remove it from .kernelconfig.board
 #    * append ${FS_CMDLINE} to the kernel commandline inside
 #      .kernelconfig.board
-# 6) merge (cat) it all together into .kernelconfig.tmp
-# 7) check if .kernelconfig.tmp differs from the current one
+# 5) merge (cat) it all together into .kernelconfig.tmp
+# 6) check if .kernelconfig.tmp differs from the current one
 #    (.kernelconfig) at all, overwriting the current one
 #    only if it does (so the timestamp stays intact)
-# 8) remove the temporary .kernelconfig.tmp
+# 7) remove the temporary .kernelconfig.tmp
 ###
 ADK_PACKAGE_CRYPTINIT_ROOT:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_ROOT)))
 ADK_PACKAGE_CRYPTINIT_SWAP:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_SWAP)))
@@ -50,9 +42,6 @@ config-prepare: $(TOPDIR)/.config
 	    sed 's/=y/=m/' >>${BUILD_DIR}/.kernelconfig.modules
 	@sed -n '/^ADK_KERNEL/s//CONFIG/p' ${TOPDIR}/.config \
 	    >${BUILD_DIR}/.kernelconfig.kernel
-	@sed -n '/^# ADK_KERNEL/s//# CONFIG/p' ${TOPDIR}/.config \
-	    >${BUILD_DIR}/.kernelconfig.nokernel
-ifeq ($(ADK_USE_KERNEL_MINICONFIG),y)
 	@if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \
 		cat ${TOPDIR}/target/linux/kernel.config \
 		    ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} > ${BUILD_DIR}/.kernelconfig.board; \
@@ -60,23 +49,22 @@ ifeq ($(ADK_USE_KERNEL_MINICONFIG),y)
 		echo "no miniconfig found for target system"; \
 		exit 1; \
 	fi
-else
-	@if [ -f ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ];then \
-		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \
-	else \
-		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
-	fi
-endif
 	@(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \
 	    while IFS='=' read symbol value; do \
 		sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \
 	done;)
+	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ro"#' \
+		${BUILD_DIR}/.kernelconfig.board
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${FS_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
 ifneq ($(ADK_TARGET_CMDLINE),)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_TARGET_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
 endif
+ifeq ($(ADK_TARGET_QEMU_WITH_GRAPHIC),y)
+	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=tty0"#' \
+		${BUILD_DIR}/.kernelconfig.board
+endif
 ifneq ($(ADK_PACKAGE_CRYPTINIT_ROOT),)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_PACKAGE_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
@@ -93,7 +81,7 @@ ifeq ($(ADK_KERNEL_NETCONSOLE),y)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 netconsole=@$(ADK_PARAMETER_NETCONSOLE_SRC_IP)/,@$(ADK_PARAMETER_NETCONSOLE_DST_IP)/"#' \
 		${BUILD_DIR}/.kernelconfig.board
 endif
-	@cd ${BUILD_DIR} && cat .kernelconfig.board .kernelconfig.nokernel \
+	@cd ${BUILD_DIR} && cat .kernelconfig.board \
 	    .kernelconfig.kernel .kernelconfig.modules \
 	    >.kernelconfig.tmp
 	@cd ${BUILD_DIR} && cmp -s .kernelconfig.tmp .kernelconfig || \
@@ -101,10 +89,12 @@ endif
 	@-rm -f ${BUILD_DIR}/.kernelconfig.tmp
 else
 config-prepare: $(TOPDIR)/.config
-	if [ -f ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ];then \
-		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \
+	@if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \
+		cat ${TOPDIR}/target/linux/kernel.config \
+		    ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} > ${BUILD_DIR}/.kernelconfig.board; \
 	else \
-		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
+		echo "no miniconfig found for target system"; \
+		exit 1; \
 	fi
 endif
 

target/arm/Makefile

@@ -61,7 +61,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 	@echo "Use following command to install it on SD card:"
 	@echo "sudo ./scripts/install-rpi.sh /dev/sdb $(FW_DIR)/$(ROOTFSTARBALL)"
 endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
@@ -75,7 +75,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y)
 ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
         @echo 'qemu-system-arm -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user'
 else
@@ -88,7 +88,7 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 imageinstall: createinitramfs
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif

target/arm/kernel/qemu-arm-versatilepb

@@ -18,7 +18,6 @@ CONFIG_DTC=y
 CONFIG_OF=y
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y

target/arm/sys-available/acmesystems-foxg20

@@ -5,10 +5,6 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_soft_float
 	select ADK_eabi
 	select ADK_acmesystems_foxg20
-	select ADK_KERNEL_ARCH_AT91
-	select ADK_KERNEL_ARCH_AT91SAM9260
-	select ADK_KERNEL_ARCH_AT91SAM9G20
-	select ADK_KERNEL_MACH_ACMENETUSFOXG20
 	select ADK_KERNEL_AEABI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_MMC

target/arm/sys-available/cubox-i

@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_PACKAGE_U_BOOT_CUBOX_I
-	select ADK_USE_KERNEL_MINICONFIG
 	help
 	  Cubox-i
 

target/arm/sys-available/qemu-arm

@@ -3,8 +3,9 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_arm
 	select ADK_qemu_arm
 	select ADK_little
+	select ADK_soft_float
+	select ADK_eabi
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Support for Qemu Emulator (arm).

target/arm/sys-available/qemu-armhf

@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_QEMU_ARMHF
+	bool "Qemu Emulator (hard-float)"
+	select ADK_arm
+	select ADK_qemu_armhf
+	select ADK_little
+	select ADK_hard_float
+	select ADK_eabihf
+	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for Qemu Emulator (armhf).

target/arm/sys-available/raspberry-pi

@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_TARGET_WITH_INPUT
 	select ADK_PACKAGE_BCM2835_BOOTLOADER
 	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_USE_KERNEL_MINICONFIG
 	help
 	  Raspberry PI
 

target/arm/sys-available/sharp-zaurus

@@ -12,6 +12,5 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_TARGET_WITH_SOUND
 	select ADK_TARGET_WITH_TOUCHSCREEN
 	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Support for Sharp Zaurus CL3200 (Terrier)

target/config/Config.in

@@ -210,6 +210,8 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64
 	default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686
 	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
 	default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I
 	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -278,19 +280,18 @@ endchoice
 
 choice
 prompt "Qemu ARM Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_ARM
+depends on ADK_TARGET_SYSTEM_QEMU_ARM || ADK_TARGET_SYSTEM_QEMU_ARMHF
+
+config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	boolean "ARM Ltd. Versatile Express for Cortex-A9"
+	select ADK_CPU_CORTEX_A9
 
 config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	boolean "ARM Ltd. Versatile/PB"
 	select ADK_soft_float
 	select ADK_eabi
 	select ADK_CPU_ARM926EJ_S
-
-config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	boolean "ARM Ltd. Versatile Express for Cortex-A9"
-	select ADK_hard_float
-	select ADK_eabihf
-	select ADK_CPU_CORTEX_A9
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM
 
 config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	boolean "Xscale PXA270 Spitz PDA"
@@ -298,6 +299,7 @@ config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	select ADK_eabi
 	select ADK_CPU_XSCALE
 	select ADK_TARGET_WITH_VGA
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM
 
 endchoice
 
@@ -559,7 +561,6 @@ config ADK_TARGET_CPU_ARCH
 	default "mips" if ADK_LINUX_MIPS && ADK_big
 	default "mipsel" if ADK_LINUX_MIPS && ADK_little
 	default "arm" if ADK_LINUX_ARM && ADK_little
-	default "armeb" if ADK_LINUX_ARM && ADK_big
 	default "sparc" if ADK_LINUX_SPARC
 	default "sparc64" if ADK_LINUX_SPARC64
 	default "sh4" if ADK_LINUX_SH && ADK_little
@@ -613,28 +614,27 @@ config ADK_TARGET_CFLAGS
 config ADK_TARGET_CMDLINE
 	string
 	default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I
+	default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40
+	default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
 	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_X86_64
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SPARC64
-	default "console=ttyS0,9600 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC
-	default "console=hvc0 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC64
+	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686
+	default "console=tty0" if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_I686
+	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_SPARC64
+	default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_QEMU_PPC
+	default "console=hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
 	default "console=ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 	default "console=ttyS0,115200" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH4
-	default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH4EB
-	default "console=ttyS0" if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default "console=ttyS0,115200" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+	default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
+	default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4
+	default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default ""
@@ -669,6 +669,7 @@ config ADK_TARGET_LIB_UCLIBC
 	boolean
 	select ADK_uclibc
 	depends on \
+		   !ADK_LINUX_M68K && \
 		   !ADK_LINUX_MICROBLAZE && \
 		   !ADK_LINUX_SPARC64 && \
 		   !ADK_LINUX_PPC64 && \
@@ -768,7 +769,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 	depends on !ADK_HARDWARE_VBOX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_KERNEL_BLK_DEV_INITRD
-	select ADK_KERNEL_RD_XZ
+	select ADK_KERNEL_BLK_DEV_RAM if ADK_TARGET_SYSTEM_ARANYM_M68K
 	help
 	  create an read-only initramfs system.
 
@@ -778,6 +779,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	depends on \
 		ADK_HARDWARE_QEMU || \
 		ADK_LINUX_ARM || \
+		ADK_LINUX_M68K || \
 		ADK_LINUX_MICROBLAZE || \
 		ADK_LINUX_MIPS || \
 		ADK_LINUX_PPC || \

target/config/Config.in.arch.default

@@ -1,7 +1,4 @@
 # target architectures
-config ADK_native
-	bool
-
 config ADK_arm
 	bool
 
@@ -48,5 +45,4 @@ config ADK_TARGET_ARCH
 	default "sh"  if ADK_sh
 	default "x86"  if ADK_x86
 	default "x86_64"  if ADK_x86_64
-	default "native"  if ADK_native
 

target/config/Config.in.tools

@@ -38,6 +38,11 @@ config ADK_HOST_NEED_CCACHE
 	boolean
 	default n
 
+config ADK_HOST_NEED_PCRE
+	boolean
+	default y if ADK_HOST_DARWIN
+	default n
+
 config ADK_TOOLS_ADDPATTERN_ARGS
 	string
 	default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G

target/linux/config/Config.in.audio

@@ -13,23 +13,14 @@ config ADK_KERNEL_SND_USB
 config ADK_KERNEL_SND_PXA2XX_AC97
 	boolean
 
-config ADK_KERNEL_SND_TIMER
+config ADK_KPACKAGE_KMOD_SND_TIMER
 	boolean
 
-config ADK_KERNEL_SND_PCM
+config ADK_KPACKAGE_KMOD_SND_PCM
 	boolean
 
-config ADK_KERNEL_SND_HWDEP
-	boolean
-
-config ADK_KERNEL_SND_OSSEMUL
-	boolean
-
-config ADK_KERNEL_SND_MIXER_OSS
-	boolean
-
-config ADK_KERNEL_SND_PCM_OSS
-	boolean
+config ADK_KPACKAGE_KMOD_SND_HWDEP
+	tristate
 
 config ADK_KPACKAGE_KMOD_SOUND
 	tristate
@@ -40,32 +31,24 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI
 config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	tristate
 
-config ADK_KPACKAGE_KMOD_SND
-	prompt "kmod-snd...................... ALSA sound support"
+config ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE
 	tristate
-	select ADK_KPACKAGE_KMOD_SOUND
-	select ADK_KERNEL_SND_OSSEMUL
-	select ADK_KERNEL_SND_TIMER
-	select ADK_KERNEL_SND_PCM
-	select ADK_KERNEL_SND_HWDEP
-	default n
-	help
-	 Basic ALSA sound support.
 
-config ADK_KPACKAGE_KMOD_SND_OSSEMUL
-	prompt "kmod-snd-ossemul.............. ALSA OSS Emulation"
+config ADK_KPACKAGE_KMOD_SND_COMPRESS
 	tristate
-	select ADK_KERNEL_SND_MIXER_OSS
-	select ADK_KERNEL_SND_PCM_OSS
-	select ADK_KPACKAGE_KMOD_SND
-	default y if ADK_TARGET_SYSTEM_IBM_X40
+
+config ADK_KPACKAGE_KMOD_SND
+	tristate
+	select ADK_KPACKAGE_KMOD_SOUND
+	select ADK_KPACKAGE_KMOD_SND_PCM
+	select ADK_KPACKAGE_KMOD_SND_TIMER
+	select ADK_KPACKAGE_KMOD_SND_HWDEP
 	default n
-	help
-	 ALSA OSS Emulation
 
 config ADK_KPACKAGE_KMOD_SND_INTEL8X0
 	prompt "kmod-snd-intel8x0............. Intel AC97 driver"
 	tristate
+	select ADK_KERNEL_SND_PCI
 	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	select ADK_KPACKAGE_KMOD_SND
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -136,10 +119,12 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
 	default n
 
 config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
-	prompt "kmod-snd-bcm2708-soc-i2s........ ALSA SOC I2S Raspberry PI"
+	prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI"
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KERNEL_SND_ARM
 	select ADK_KPACKAGE_KMOD_SND_SOC
+	select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE
+	select ADK_KPACKAGE_KMOD_SND_COMPRESS
 	boolean
 	default n
 

target/linux/config/Config.in.block

@@ -1,6 +1,3 @@
-config ADK_KERNEL_BLOCK
-	boolean
-
 config ADK_KERNEL_MD
 	boolean
 
@@ -82,7 +79,6 @@ config ADK_KERNEL_PATA_PCMCIA
 
 config ADK_KERNEL_PATA_PXA
 	boolean
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -95,7 +91,6 @@ config ADK_KERNEL_PATA_PXA
 
 config ADK_KERNEL_MMC_AT91
 	boolean
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_MMC
 	select ADK_KERNEL_MMC_BLOCK
@@ -106,7 +101,6 @@ config ADK_KERNEL_MMC_AT91
 
 config ADK_KERNEL_MMC_SDHCI_BCM2708
 	boolean
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_MMC
 	select ADK_KERNEL_MMC_BLOCK
@@ -121,7 +115,6 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708
 
 config ADK_KERNEL_PATA_RB532
 	boolean
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -133,7 +126,6 @@ config ADK_KERNEL_PATA_RB532
 
 config ADK_KERNEL_PATA_AMD
 	boolean
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -148,7 +140,6 @@ config ADK_KERNEL_PATA_AMD
 
 config ADK_KERNEL_PATA_SC1200
 	boolean
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -160,7 +151,6 @@ config ADK_KERNEL_PATA_SC1200
 
 config ADK_KERNEL_PATA_JMICRON
 	boolean
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -171,7 +161,6 @@ config ADK_KERNEL_PATA_JMICRON
 
 config ADK_KERNEL_SATA_AHCI
 	tristate
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV
@@ -185,7 +174,6 @@ menu "Block devices support"
 config ADK_KPACKAGE_KMOD_SATA_AHCI
 	prompt "kmod-sata-ahci.................... AHCI SATA driver"
 	tristate
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on !ADK_KERNEL_SATA_AHCI
@@ -197,7 +185,6 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
 config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
 	prompt "kmod-blk-dev-loop................. Loop mount support"
 	tristate
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_BLK_DEV
 	default n
 	help

target/linux/config/Config.in.cpu

@@ -1,12 +1,3 @@
-config ADK_KERNEL_MATOM
-	boolean
-
-config ADK_KERNEL_MPENTIUMM
-	boolean
-
-config ADK_KERNEL_MGEODE_LX
-	boolean
-
 config ADK_KERNEL_MTRR
 	boolean
 	default y if ADK_TARGET_CPU_WITH_MTRR

target/linux/config/Config.in.fs

@@ -62,6 +62,7 @@ config ADK_KERNEL_EXT2_FS
 	boolean
 	default y if ADK_TARGET_WITH_CF
 	default y if ADK_TARGET_WITH_MMC && !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 
 config ADK_KPACKAGE_KMOD_EXT2_FS

target/linux/config/Config.in.graphics

@@ -13,7 +13,6 @@ config ADK_KERNEL_VT_CONSOLE
 config ADK_KERNEL_VGA_CONSOLE
 	boolean
 	default y if ADK_HARDWARE_VBOX
-	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 
 config ADK_KERNEL_FONTS
@@ -27,11 +26,19 @@ config ADK_KERNEL_FB
  	boolean
  
 config ADK_KERNEL_FRAMEBUFFER_CONSOLE
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default n
 	boolean
 
 config ADK_KERNEL_MFD_SM501
 	boolean
 
+config ADK_KERNEL_FB_ATARI
+	boolean
+	select ADK_KERNEL_FB
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default n
+
 config ADK_KERNEL_FB_CIRRUS
 	boolean
 

target/linux/config/Config.in.kernel

@@ -7,6 +7,9 @@ config ADK_KERNEL_EXPERIMENTAL
 config ADK_KERNEL_BLK_DEV_INITRD
 	boolean
 
+config ADK_KERNEL_BLK_DEV_RAM
+	boolean
+
 config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
 	boolean
 

target/linux/config/Config.in.systems

@@ -1,17 +0,0 @@
-# page size
-config ADK_KERNEL_PAGE_SIZE_4KB
-	boolean
-
-config ADK_KERNEL_PAGE_SIZE_16KB
-	boolean
-
-# ABI
-config ADK_KERNEL_AEABI
-	boolean
-
-# endianess
-config ADK_KERNEL_CPU_BIG_ENDIAN
-	boolean
-
-config ADK_KERNEL_CPU_LITTLE_ENDIAN
-	boolean

target/linux/kernel.config

@@ -15,6 +15,7 @@ CONFIG_INET=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_BLOCK=y
+CONFIG_BLK_DEV=y
 CONFIG_FILE_LOCKING=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y