From 7a10f4931bad2ef02fcf41e6d83d7b3e843f7ce2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 10:59:10 +0200
Subject: add vfat to supported filesystems

---
 package/base-files/Makefile          | 2 +-
 package/base-files/src/etc/init.d/fs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c9a343d59..b6e771d4a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		82
+PKG_RELEASE:=		83
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index e995422ee..c524a089f 100644
--- a/package/base-files/src/etc/init.d/fs
+++ b/package/base-files/src/etc/init.d/fs
@@ -8,7 +8,7 @@
 # activate any logical volumes
 [ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
 
-fstypes="ext2 ext3 ext4 xfs"
+fstypes="ext2 ext3 ext4 xfs vfat"
 
 # filesystem checks
 for fs in $fstypes; do
-- 
cgit v1.2.3


From 77826cce54a79049a8fb009c454518a849bd575d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 11:40:18 +0200
Subject: finetune package

---
 package/samba/Makefile            | 4 +++-
 package/samba/files/smb.conf      | 6 +++---
 package/samba/files/swat.postinst | 6 ------
 3 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 package/samba/files/swat.postinst

diff --git a/package/samba/Makefile b/package/samba/Makefile
index 7279063b9..ab3334163 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		samba
 PKG_VERSION:=		3.6.23
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		2f7aee1dc5d31aefcb364600915b31dc
 PKG_DESCR:=		NetBIOS/SMB file and print server
 PKG_SECTION:=		net/fs
@@ -14,6 +14,8 @@ PKG_DEPENDS:=		samba-lib libuuid libpopt
 PKG_URL:=		http://www.samba.org/
 PKG_SITES:=		http://samba.org/samba/ftp/stable/
 
+PKG_CFLINE_SAMBA:=	select ADK_KERNEL_INOTIFY_USER
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		SAMBA SAMBA_CLIENT SAMBA_PASSWD SAMBA_LIB
diff --git a/package/samba/files/smb.conf b/package/samba/files/smb.conf
index 90ebf2bb4..8cae4dc2c 100644
--- a/package/samba/files/smb.conf
+++ b/package/samba/files/smb.conf
@@ -1,12 +1,12 @@
 [global]
- syslog = 3
+ syslog = 2
  syslog only = yes
- log level = 2
+ log level = 1
  workgroup = OpenADK
  server string = OpenADK Samba Server
  security = user
  encrypt passwords = yes
- guest account = root
+ guest account = nobody
  local master = yes
  name resolve order = hosts bcast
  pid directory = /var/run/samba
diff --git a/package/samba/files/swat.postinst b/package/samba/files/swat.postinst
deleted file mode 100644
index 85c2d226e..000000000
--- a/package/samba/files/swat.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_service swat 901/tcp
-grep -qe '^swat	' -e '^#swat	' $IPKG_INSTROOT/etc/inetd.conf 2>&- || \
-    echo '#swat	stream	tcp	nowait.400	root	/usr/bin/swat	swat' \
-    >>$IPKG_INSTROOT/etc/inetd.conf
-- 
cgit v1.2.3


From 30e7ab424389615d22867a9ac7d135da5f8bf20f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 13:28:24 +0200
Subject: fix symlink

---
 package/ntfs-3g/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index b893cdb53..a0f3502de 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ntfs-3g
 PKG_VERSION:=		2014.2.15
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f11d563816249d730a00498983485f3a
-PKG_DESCR:=		ntfs filesystem driver
+PKG_DESCR:=		ntfs filesystem driver using fuse
 PKG_SECTION:=		fs
 PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://tuxera.com
@@ -26,6 +26,6 @@ CONFIGURE_ARGS+=	--disable-ldconfig \
 ntfs-3g-install:
 	${INSTALL_DIR} ${IDIR_NTFS_3G}/bin
 	${INSTALL_BIN} ${WRKINST}/bin/ntfs-3g ${IDIR_NTFS_3G}/bin
-	cd ${WRKINST}/bin && ln -sf ntfs-3g mount.ntfs-3g
+	cd ${IDIR_NTFS_3G}/bin && ln -sf ntfs-3g mount.ntfs-3g
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 31030399d3f01d6348b3fba4d1ff42e8b11ec0d3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 13 Apr 2014 17:23:54 +0200
Subject: remove unused

---
 target/sh/sys-available/toolchain-sh4   | 2 +-
 target/sh/sys-available/toolchain-sh4eb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/sys-available/toolchain-sh4
index 4d7fff826..91110cb0c 100644
--- a/target/sh/sys-available/toolchain-sh4
+++ b/target/sh/sys-available/toolchain-sh4
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4
 	bool "Toolchain only (little endian)"
 	select ADK_sh
 	select ADK_little
-	select ADK_toolchain_sh
+	select ADK_toolchain_sh4
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
diff --git a/target/sh/sys-available/toolchain-sh4eb b/target/sh/sys-available/toolchain-sh4eb
index cccc163e1..70b99cb8e 100644
--- a/target/sh/sys-available/toolchain-sh4eb
+++ b/target/sh/sys-available/toolchain-sh4eb
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4EB
 	bool "Toolchain only (big endian)"
 	select ADK_sh
 	select ADK_big
-	select ADK_toolchain_sheb
+	select ADK_toolchain_sh4eb
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
-- 
cgit v1.2.3


From f71879b1e9e706b6159dfcc62b64b62e63b6f6cb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Apr 2014 08:50:21 +0200
Subject: fix description, do not select fpu

---
 target/arm/sys-available/toolchain-arm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index b9ba30aa5..876bcd84a 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -1,10 +1,9 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
-	bool "Toolchain only (little endian)"
+	bool "Toolchain only (soft float)"
 	select ADK_arm
 	select ADK_toolchain_arm
 	select ADK_little
 	select ADK_soft_float
-	select ADK_fpu_vfp
 	select ADK_eabi
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
-- 
cgit v1.2.3


From 0456a5ee2733ba01127043cc674aace662bd7c71 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 21:59:55 +0200
Subject: exclude aarch64 from test-framework, set 3.13.11 as default kernel

---
 Config.in   | 1 +
 mk/build.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Config.in b/Config.in
index 3feae189d..3c3687555 100644
--- a/Config.in
+++ b/Config.in
@@ -106,6 +106,7 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
+default ADK_KERNEL_VERSION_3_13_11
 
 config ADK_KERNEL_VERSION_3_14_1
 	prompt "3.14.1"
diff --git a/mk/build.mk b/mk/build.mk
index 13e287d89..6d4f8a4e1 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -502,7 +502,7 @@ test-framework:
 	for libc in $$libc;do \
 		( \
 			mkdir -p $(TOPDIR)/firmware/; \
-			for arch in $$(grep -v m68k target/tarch.lst|xargs);do \
+			for arch in $$(grep -v "\(m68k\|aarch64\)" toolchain/$$libc/tarch.lst|xargs);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##" -e "s#x86_64.*#x86_64#"); \
 				arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
-- 
cgit v1.2.3


From 81d7f759d5c9bff2cfedfe121dbdff2f7842dcc2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 22:11:09 +0200
Subject: fix mysql_config script

---
 package/mysql/Makefile                              |  5 ++++-
 package/mysql/patches/patch-scripts_mysql_config_sh | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 package/mysql/patches/patch-scripts_mysql_config_sh

diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 759cab63c..293392a9c 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
 PKG_VERSION:=		5.6.17
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		82114fa7c13fa3ca897b34666577d9f4
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		db
@@ -36,6 +36,9 @@ host-build:
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
 
+pre-configure:
+	$(SED) "s#@@STAGING_DIR@@#${STAGING_TARGET_DIR}#" ${WRKBUILD}/scripts/mysql_config.sh
+
 mysql-hostinstall:
 	$(INSTALL_BIN) ${WRKBUILD}/extra/comp_err \
 		$(STAGING_HOST_DIR)/usr/bin
diff --git a/package/mysql/patches/patch-scripts_mysql_config_sh b/package/mysql/patches/patch-scripts_mysql_config_sh
new file mode 100644
index 000000000..87ba2a833
--- /dev/null
+++ b/package/mysql/patches/patch-scripts_mysql_config_sh
@@ -0,0 +1,20 @@
+--- mysql-5.6.17.orig/scripts/mysql_config.sh	2014-03-14 20:07:28.000000000 +0100
++++ mysql-5.6.17/scripts/mysql_config.sh	2014-04-29 21:45:14.000000000 +0200
+@@ -83,7 +83,7 @@ execdir='@libexecdir@'
+ bindir='@bindir@'
+ 
+ # If installed, search for the compiled in directory first (might be "lib64")
+-pkglibdir='@pkglibdir@'
++pkglibdir='@@STAGING_DIR@@@pkglibdir@'
+ pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
+ fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+ 
+@@ -91,7 +91,7 @@ plugindir='@pkgplugindir@'
+ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
+ fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
+ 
+-pkgincludedir='@pkgincludedir@'
++pkgincludedir='@@STAGING_DIR@@@pkgincludedir@'
+ if [ -f "$basedir/include/mysql/mysql.h" ]; then
+   pkgincludedir="$basedir/include/mysql"
+ elif [ -f "$basedir/include/mysql.h" ]; then
-- 
cgit v1.2.3


From 96b68fb7047d2d355a6d3cc8409a0f1db95acec9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 01:07:06 +0200
Subject: fix 32 bit userland with 64 bit kernel support

after onger discussion with Phil, I understood his old
patches and fixed support for x86 systems with 32 Bit userland
and 64 Bit kernel by using a biarch toolchain instead of
a multilib one.
---
 package/genext2fs/Makefile                      |  2 +
 target/config/Config.in                         |  2 +-
 target/x86/Makefile                             | 18 +++++++--
 target/x86/kernel/qemu-x86_64                   | 20 +++++++++
 target/x86/sys-available/qemu-x86_64-32         | 11 +++++
 target/x86_64/sys-available/toolchain-x86_64_32 | 12 ------
 toolchain/binutils/Makefile                     |  6 +--
 toolchain/gcc/Makefile                          | 13 ++++--
 toolchain/gcc/patches/4.8.2/abi32.patch         | 54 -------------------------
 9 files changed, 58 insertions(+), 80 deletions(-)
 create mode 100644 target/x86/kernel/qemu-x86_64
 create mode 100644 target/x86/sys-available/qemu-x86_64-32
 delete mode 100644 target/x86_64/sys-available/toolchain-x86_64_32
 delete mode 100644 toolchain/gcc/patches/4.8.2/abi32.patch

diff --git a/package/genext2fs/Makefile b/package/genext2fs/Makefile
index 4e8fea5bd..cf88ab095 100644
--- a/package/genext2fs/Makefile
+++ b/package/genext2fs/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		genext2fs utility
 PKG_SECTION:=		fs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=genext2fs/}
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_CFLINE_GENEXT2FS:=	depends on ADK_HOST_ONLY
 
 include $(TOPDIR)/mk/host.mk
diff --git a/target/config/Config.in b/target/config/Config.in
index 3d613bb1e..b1725b876 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -242,7 +242,7 @@ config ADK_TARGET_CUBOX_I1
 endchoice
 
 # global symbols
-config ADK_TARGET_KERNEL_MAY_64BIT
+config ADK_TARGET_KERNEL_64
 	boolean
 
 config ADK_TOOLCHAIN_ONLY
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 736f1c359..89e59095a 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -8,6 +8,16 @@ include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
+
+QEMU_ARGS:=-M pc
+QEMU_ARGS+=${ADK_QEMU_ARGS}
+
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64_32),y)
+QEMU_ARCH:=x86_84
+else
+QEMU_ARCH:=i386
+endif
+
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
 ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y)
 CREATE:=./scripts/create.sh -g -t
@@ -43,9 +53,9 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "$(CREATE) qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following command line:"
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img'
 else
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 endif
 ifeq ($(ADK_HARDWARE_VBOX),y)
@@ -72,7 +82,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -81,7 +91,7 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
 ifeq (${ADK_TARGET_FS},iso)
diff --git a/target/x86/kernel/qemu-x86_64 b/target/x86/kernel/qemu-x86_64
new file mode 100644
index 000000000..7bf96c74c
--- /dev/null
+++ b/target/x86/kernel/qemu-x86_64
@@ -0,0 +1,20 @@
+CONFIG_X86=y
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_GENERIC_CPU=y
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_MTRR=y
+CONFIG_X86_PAT=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_IA32_EMULATION=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/x86/sys-available/qemu-x86_64-32 b/target/x86/sys-available/qemu-x86_64-32
new file mode 100644
index 000000000..f96e6ea35
--- /dev/null
+++ b/target/x86/sys-available/qemu-x86_64-32
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_QEMU_X86_64_32
+	bool "Qemu Emulator (x86_64) with 32Bit userland"
+	select ADK_x86
+	select ADK_qemu_x86_64_32
+	select ADK_CPU_I686
+	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_BZIMAGE
+	select ADK_TARGET_KERNEL_64
+	help
+	 Support for Qemu Emulator (x86_64) with 32 Bit userland.
+
diff --git a/target/x86_64/sys-available/toolchain-x86_64_32 b/target/x86_64/sys-available/toolchain-x86_64_32
deleted file mode 100644
index 9e8297ea4..000000000
--- a/target/x86_64/sys-available/toolchain-x86_64_32
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_32
-	bool "Toolchain only (32 ABI)"
-	select ADK_x86_64
-	select ADK_32
-	select ADK_toolchain_x86_64
-	select ADK_CPU_X86_64
-	select ADK_LINUX_64
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  Build a x86_64 toolchain.
-
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 8947ee77e..0a41fc9f3 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -24,11 +24,7 @@ else
 CONFOPTS+=		--disable-gold
 endif
 
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-CONFOPTS+=          	--with-arch=armv6
-endif
-
-ifneq ($(ADK_LINUX_64),)
+ifneq ($(ADK_LINUX_64)$(ADK_TARGET_KERNEL_64),)
 CONFOPTS+=		--enable-64-bit-bfd
 endif
 
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 63d0237c3..12ad4ebca 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -35,7 +35,7 @@ GCC_CONFOPTS:=		--prefix=$(TOOLCHAIN_DIR)/usr \
 			--disable-nls
 
 GCC_FINAL_CONFOPTS:=
-ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64),)
+ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64)$(ADK_LINUX_X86),)
 GCC_FINAL_CONFOPTS+=	--disable-biarch --disable-multilib
 endif
 
@@ -48,13 +48,18 @@ endif
 GCC_FINAL_CONFOPTS+=	--enable-multilib --with-multilib-list=m4,m4-nofpu
 endif
 
+ifeq ($(ADK_LINUX_X86),y)
+ifeq ($(ADK_TARGET_KERNEL_64),y)
+GCC_FINAL_CONFOPTS+=	--enable-biarch --enable-targets=all --disable-multilib
+else
+GCC_FINAL_CONFOPTS+=    --disable-biarch --disable-multilib
+endif
+endif
+
 ifeq ($(ADK_LINUX_X86_64),y)
 ifeq ($(ADK_x32),y)
 GCC_FINAL_CONFOPTS+=	--with-abi=x32
 endif
-ifeq ($(ADK_32),y)
-GCC_FINAL_CONFOPTS+=	--with-abi=32
-endif
 ifeq ($(ADK_64),y)
 GCC_FINAL_CONFOPTS+=	--disable-biarch --disable-multilib
 endif
diff --git a/toolchain/gcc/patches/4.8.2/abi32.patch b/toolchain/gcc/patches/4.8.2/abi32.patch
deleted file mode 100644
index 856d608bd..000000000
--- a/toolchain/gcc/patches/4.8.2/abi32.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Nur gcc-4.8.2.orig/gcc/config/i386/biarch32.h gcc-4.8.2/gcc/config/i386/biarch32.h
---- gcc-4.8.2.orig/gcc/config/i386/biarch32.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.8.2/gcc/config/i386/biarch32.h	2014-03-23 20:33:52.000000000 +0100
-@@ -0,0 +1,27 @@
-+/* Make configure files to produce biarch compiler defaulting to 32bit mode.
-+   This file must be included very first, while the OS specific file later
-+   to overwrite otherwise wrong defaults. 
-+   Copyright (C) 2001-2014 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+Under Section 7 of GPL version 3, you are granted additional
-+permissions described in the GCC Runtime Library Exception, version
-+3.1, as published by the Free Software Foundation.
-+
-+You should have received a copy of the GNU General Public License and
-+a copy of the GCC Runtime Library Exception along with this program;
-+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#define TARGET_64BIT_DEFAULT 0
-diff -Nur gcc-4.8.2.orig/gcc/config.gcc gcc-4.8.2/gcc/config.gcc
---- gcc-4.8.2.orig/gcc/config.gcc	2013-10-03 02:47:24.000000000 +0200
-+++ gcc-4.8.2/gcc/config.gcc	2014-03-22 13:15:18.000000000 +0100
-@@ -522,6 +522,9 @@
- 	64 | m64)
- 		tm_file="i386/biarch64.h ${tm_file}"
- 		;;
-+	32 | m32)
-+		tm_file="i386/biarch32.h ${tm_file}"
-+		;;
- 	x32 | mx32)
- 		tm_file="i386/biarchx32.h ${tm_file}"
- 		;;
-@@ -1343,6 +1346,9 @@
- 		x32 | mx32)
- 			x86_multilibs="mx32"
- 			;;
-+		32 | m32)
-+			x86_multilibs="m32"
-+			;;
- 		*)
- 			x86_multilibs="m64,m32"
- 			;;
-- 
cgit v1.2.3


From 7bcadb06072bccdda7eebb8f9217e63745cf30b1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 01:28:54 +0200
Subject: combine cubox-i kernel configs, make SMP, PREEMPT and HIGHMEM
 configurable

---
 target/arm/kernel/cubox-i            | 23 +++++++++++++++++++++++
 target/arm/kernel/cubox-i1           | 16 ----------------
 target/arm/kernel/cubox-i2           | 17 -----------------
 target/arm/kernel/cubox-i2ultra      | 24 ------------------------
 target/arm/kernel/cubox-i4pro        | 27 ---------------------------
 target/config/Config.in              | 10 ++--------
 target/linux/Config.in               |  1 +
 target/linux/config/Config.in.kernel | 33 ++++++++++++++++++++++++++-------
 8 files changed, 52 insertions(+), 99 deletions(-)
 create mode 100644 target/arm/kernel/cubox-i
 delete mode 100644 target/arm/kernel/cubox-i1
 delete mode 100644 target/arm/kernel/cubox-i2
 delete mode 100644 target/arm/kernel/cubox-i2ultra
 delete mode 100644 target/arm/kernel/cubox-i4pro

diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/cubox-i
new file mode 100644
index 000000000..0b56db7d7
--- /dev/null
+++ b/target/arm/kernel/cubox-i
@@ -0,0 +1,23 @@
+CONFIG_ARM=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MXC=y
+CONFIG_ARCH_MX6=y
+CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6SL=y
+CONFIG_LOCAL_TIMERS=y
+CONFIG_MXC_DEBUG_BOARD=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_AEABI=y
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+CONFIG_PCI_IMX6=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=y
+CONFIG_PHYLIB=y
+CONFIG_AT803X_PHY=y
+CONFIG_ATAGS=y
+CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/kernel/cubox-i1 b/target/arm/kernel/cubox-i1
deleted file mode 100644
index 82934afc0..000000000
--- a/target/arm/kernel/cubox-i1
+++ /dev/null
@@ -1,16 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/target/arm/kernel/cubox-i2 b/target/arm/kernel/cubox-i2
deleted file mode 100644
index 3a6fecdf5..000000000
--- a/target/arm/kernel/cubox-i2
+++ /dev/null
@@ -1,17 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/target/arm/kernel/cubox-i2ultra b/target/arm/kernel/cubox-i2ultra
deleted file mode 100644
index 47bc235c5..000000000
--- a/target/arm/kernel/cubox-i2ultra
+++ /dev/null
@@ -1,24 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_LOCAL_TIMERS=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=y
-CONFIG_PHYLIB=y
-CONFIG_AT803X_PHY=y
-CONFIG_ATAGS=y
-CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/kernel/cubox-i4pro b/target/arm/kernel/cubox-i4pro
deleted file mode 100644
index 9d99b12a3..000000000
--- a/target/arm/kernel/cubox-i4pro
+++ /dev/null
@@ -1,27 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_HIGHMEM=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_LOCAL_TIMERS=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=y
-CONFIG_PHYLIB=y
-CONFIG_AT803X_PHY=y
-CONFIG_ATAGS=y
-CONFIG_CMDLINE_FORCE=y
diff --git a/target/config/Config.in b/target/config/Config.in
index b1725b876..b5cd6121c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -214,10 +214,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32
 	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
-	default "cubox-i4pro" if ADK_TARGET_CUBOX_I4PRO
-	default "cubox-i2ultra" if ADK_TARGET_CUBOX_I2ULTRA
-	default "cubox-i2" if ADK_TARGET_CUBOX_I2
-	default "cubox-i1" if ADK_TARGET_CUBOX_I1
+	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
 	default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -483,8 +480,6 @@ config ADK_TARGET_LIBC
 	default "glibc"  if ADK_glibc
 	default "musl"  if ADK_musl
 
-source "target/linux/config/Config.in.kernel"
-
 choice 
 prompt "Target C library"
 depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH
@@ -606,8 +601,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 		ADK_LINUX_PPC || \
 		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86 || \
-		ADK_LINUX_X86_64 || \
-		ADK_LINUX_NATIVE
+		ADK_LINUX_X86_64
 	depends on !ADK_HARDWARE_VBOX
 	select ADK_KERNEL_EXT2_FS
 	help
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 778f4aa7c..03c4f079e 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,3 +1,4 @@
+source target/linux/config/Config.in.kernel
 source target/linux/config/Config.in.cpu
 source target/linux/config/Config.in.block
 source target/linux/config/Config.in.flash
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index aed028f79..e6dc6d6e9 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -106,12 +106,6 @@ config ADK_KERNEL_CPU_MIPS64_R1
 config ADK_KERNEL_CPU_MIPS64_R2
 	boolean
 
-config ADK_KERNEL_PREEMPT
-	boolean
-
-config ADK_KERNEL_THUMB2_KERNEL
-	boolean
-
 # page size
 config ADK_KERNEL_PAGE_SIZE_4KB
 	boolean
@@ -119,10 +113,13 @@ config ADK_KERNEL_PAGE_SIZE_4KB
 config ADK_KERNEL_PAGE_SIZE_16KB
 	boolean
 
-# ABI
+# ARM specific
 config ADK_KERNEL_AEABI
 	boolean
 
+config ADK_KERNEL_THUMB2_KERNEL
+	boolean
+
 # endianess
 config ADK_KERNEL_CPU_BIG_ENDIAN
 	default y if ADK_big
@@ -131,3 +128,25 @@ config ADK_KERNEL_CPU_BIG_ENDIAN
 config ADK_KERNEL_CPU_LITTLE_ENDIAN
 	default y if ADK_little
 	boolean
+
+menu "Kernel options"
+
+config ADK_KERNEL_SMP
+	prompt "Enable symmetric multi processing"
+	boolean
+	default y if ADK_TARGET_CUBOX_I4PRO
+	default y if ADK_TARGET_CUBOX_I2ULTRA
+	default n
+
+config ADK_KERNEL_HIGHMEM
+	prompt "Enable high memory"
+	boolean
+	default y if ADK_TARGET_CUBOX_I4PRO
+	default n
+
+config ADK_KERNEL_PREEMPT
+	prompt "Enable preemptive kernel"
+	boolean
+	default n
+
+endmenu
-- 
cgit v1.2.3


From 999c0d4d60937174ad592d3992e608415ff91a20 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 01:37:52 +0200
Subject: rework thumb2 support

do not change gcc defaults, discussed with phil, make
the resulting toolchains more conform.
---
 target/config/Config.in | 13 -------------
 toolchain/Config.in     | 15 ++++-----------
 toolchain/gcc/Makefile  |  1 -
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/target/config/Config.in b/target/config/Config.in
index b5cd6121c..8cc77b06c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -50,12 +50,6 @@ config ADK_fpu_neon
 config ADK_fpu_vfp
 	boolean
 
-config ADK_mode_arm
-	boolean
-
-config ADK_mode_thumb
-	boolean
-
 config ADK_TARGET_FLOAT
 	string
 	default "hard" if ADK_hard_float
@@ -66,13 +60,6 @@ config ADK_TARGET_FPU
 	default "vfp" if ADK_fpu_vfp
 	default "neon" if ADK_fpu_neon
 
-config ADK_TARGET_ARM_MODE
-	depends on ADK_LINUX_ARM
-	string
-	default "arm" if ADK_mode_arm
-	default "thumb" if ADK_mode_thumb
-	default "arm"
-
 config ADK_TARGET_ENDIAN
 	string
 	default "little" if ADK_little
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 6a41140b8..f80c44841 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -44,18 +44,11 @@ config ADK_TOOLCHAIN_USE_GOLD
 	depends on ADK_TOOLCHAIN_GOLD
 	default n
 
-choice
-prompt "Use ARM thumb mode"
-depends on ADK_CPU_CORTEX_A9
-
-config ADK_LINUX_ARM_WITHOUT_THUMB
-	boolean "disabled"
-	select ADK_mode_arm
-
 config ADK_LINUX_ARM_WITH_THUMB
-	boolean "enabled"
-	select ADK_mode_thumb
+	prompt "Use THUMB2 ARM mode"
+	boolean
+	depends on ADK_CPU_CORTEX_A9 && ADK_TARGET_LIB_GLIBC
 	select ADK_KERNEL_THUMB2_KERNEL
+	default n
 
-endchoice
 endmenu
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 12ad4ebca..7616f2ab3 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -89,7 +89,6 @@ endif
 
 ifeq ($(ARCH),arm)
 GCC_CONFOPTS+=		--with-float=$(ADK_TARGET_FLOAT)
-GCC_CONFOPTS+=		--with-mode=$(ADK_TARGET_ARM_MODE)
 ifneq ($(ADK_TARGET_FPU),)
 GCC_CONFOPTS+=		--with-fpu=$(ADK_TARGET_FPU)
 endif
-- 
cgit v1.2.3


From d0dcbe4630cc167a473dfe2f896f4f72023f07c2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 01:59:17 +0200
Subject: fix leds kernel module packaging

---
 mk/modules.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/modules.mk b/mk/modules.mk
index 8f282498b..59f609cc8 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1482,15 +1482,15 @@ $(eval $(call KMOD_template,LEDS_ALIX2,leds-alix2,\
 ,10))
 
 $(eval $(call KMOD_template,LEDS_TRIGGER_TIMER,leds-trigger-timer,\
-	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-timer \
+	$(MODULES_DIR)/kernel/drivers/leds/trigger/ledtrig-timer \
 ,20))
 
 $(eval $(call KMOD_template,LEDS_TRIGGER_HEARTBEAT,leds-trigger-heartbeat,\
-	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-heartbeat \
+	$(MODULES_DIR)/kernel/drivers/leds/trigger/ledtrig-heartbeat \
 ,20))
 
 $(eval $(call KMOD_template,LEDS_TRIGGER_DEFAULT_ON,leds-trigger-default-on,\
-	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-default-on \
+	$(MODULES_DIR)/kernel/drivers/leds/trigger/ledtrig-default-on \
 ,20))
 
 $(eval $(call KMOD_template,NETFILTER_XT_TARGET_LED,netfilter-xt-target-led,\
-- 
cgit v1.2.3


From 7f5413cc5602a961b5d3bbdcc8b9f98de33419af Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:04:05 +0200
Subject: set -mthumb when thum is choosen

---
 mk/vars.mk | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index 947aacbed..96a42592d 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -86,15 +86,6 @@ TARGET_CC+=		$(ADK_TARGET_ABI_CFLAGS)
 TARGET_CXX+=		$(ADK_TARGET_ABI_CFLAGS)
 endif
 
-MODE_FLAGS:=
-ifeq ($(ADK_LINUX_ARM),y)
-ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
-MODE_FLAGS:=		-mthumb
-else
-MODE_FLAGS:=		-marm
-endif
-endif
-
 TARGET_CPPFLAGS:=	
 TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
 TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident
@@ -149,9 +140,14 @@ TARGET_CFLAGS+=		-fno-unwind-tables -fno-asynchronous-unwind-tables
 TARGET_CFLAGS+=		-g3
 endif
 
-ifneq ($(MODE_FLAGS),)
-TARGET_CFLAGS+=		$(MODE_CFLAGS)
-TARGET_CXXFLAGS+=	$(MODE_CFLAGS)
+ifeq ($(ADK_LINUX_ARM),y)
+ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
+TARGET_CFLAGS+=		-mthumb
+TARGET_CXXFLAGS+=	-mthumb
+else
+TARGET_CFLAGS+=		-marm
+TARGET_CXXFLAGS+=	-marm
+endif
 endif
 
 # A nifty macro to make testing gcc features easier (from uClibc project)
-- 
cgit v1.2.3


From 5a56253cede7a561a3256808f6e93ae26a750654 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:19:35 +0200
Subject: update

---
 BUGS |  3 ---
 TODO | 35 +++++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/BUGS b/BUGS
index 38c61307f..4ae9b352b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,2 @@
-- qemu-sparc: startup kernel with gcc 4.8.2 broken
-- qemu-sh4: usb keyboard is broken
-- qemu-arm: thumb mode with glibc does not boot
 - qemu-sparc64: ide driver not working, only virtio (but unstable)
 - qemu-microblaze: ml605 early printk and network card emulation fails, little endian works
diff --git a/TODO b/TODO
index 7446514d5..0491af170 100644
--- a/TODO
+++ b/TODO
@@ -1,24 +1,39 @@
+global:
+- projects dir idea
+
+toolchain stuff:
 - hash-style=gnu for non-mips and non-musl
-- fix libiberty.a mess
 - check gold for mozilla compile
-- add stunnel
-- check for gcc and SSP again
+- check for gcc and SSP
 - config.site/config.cache usage for speedup?
   http://lists.gnu.org/archive/html/autoconf/2014-03/msg00031.html
-- add daemon() function to functions.sh
-- add printing of OK/FAIL (optional verbose bootup)
 - fixup rework libgcc --export-symbols
 - libgcc static?
 - static toolchain support
-- try Preset Loops per Jiffy for faster bootup via lpj=
-- port uuterm
+
+base system:
+- automount ntfs/ntfs-3g
+- add daemon() function to functions.sh
 - add fb full screen logo
-- port opkg with gpg signing
+- add printing of OK/FAIL (optional verbose bootup)
+- try Preset Loops per Jiffy for faster bootup via lpj=
 - restart network (kill wpa_supplicant)
 - essid with spaces
+
+new or update packages:
+- xbmc gotham
+- add rsyslog
+- add btrfs-utils
+- add stunnel
+- port uuterm
+- port opkg with gpg signing
 - add grsec kernel patch
-- microblaze: add cfgfs partition to dts, add partition to spartan dts
-- evaluate libguestfs for image creation
 - port msmtp
 - rutorrent porting
 - lms perl 
+
+system target specific:
+- fix ibm x40 bootup
+- reenable rb532
+- qemu superh more ram
+- microblaze: add cfgfs partition to dts, add partition to spartan dts
-- 
cgit v1.2.3


From c543dd2fde53678661dc25bfb52578cbe17168cc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:20:09 +0200
Subject: update collections

---
 target/packages/pkg-available/console     | 2 +-
 target/packages/pkg-available/development | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console
index 68ff1f0b5..ff7654834 100644
--- a/target/packages/pkg-available/console
+++ b/target/packages/pkg-available/console
@@ -3,13 +3,13 @@ config ADK_PKG_CONSOLE
 	default n
 	select ADK_PACKAGE_ALSA_UTILS
 	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
-	select ADK_PACKAGE_DROPBEAR
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_SUDO
 	select ADK_PACKAGE_LINKS
 	select ADK_PACKAGE_ELINKS
 	select ADK_PACKAGE_LYNX
 	select ADK_PACKAGE_KEYCHAIN
+	select ADK_PACKAGE_OPENSSH
 	select ADK_PACKAGE_OPENSSH_CLIENT
 	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
 	select ADK_PACKAGE_OPENSSH_SERVER
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index 6a883ebf2..9ea11f7f6 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -4,7 +4,6 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_BASH
 	select ADK_PACKAGE_BINUTILS
 	select ADK_PACKAGE_DIFFUTILS
-	select ADK_PACKAGE_FILE
 	select ADK_PACKAGE_GAWK
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GXX
@@ -16,10 +15,8 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBNCURSES_DEV
-	select ADK_PACKAGE_M4
 	select ADK_PACKAGE_MAKE
 	select ADK_PACKAGE_MKFONTDIR
-	select ADK_PACKAGE_PATCH
 	select ADK_PACKAGE_PERL
 	select BUSYBOX_STAT
 	select BUSYBOX_FEATURE_STAT_FORMAT
-- 
cgit v1.2.3


From fdfc7843aa85f23a3211afeb289042ec89738ace Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:20:51 +0200
Subject: more work need to be done, Xorg still broken

---
 package/xorg-server/Makefile                       |  6 ++-
 .../patches/patch-hw_kdrive_linux_linux_c          | 13 +++++
 .../patches/patch-hw_xfree86_common_compiler_h     | 58 +++++++++++++++++++++-
 .../patch-hw_xfree86_common_xf86VGAarbiter_h       | 18 +++++++
 .../xorg-server/patches/patch-hw_xfree86_dri_dri_c | 18 +++++++
 .../patches/patch-hw_xfree86_dri_sarea_h           | 11 ++++
 .../patch-hw_xfree86_os-support_linux_lnx_init_c   | 13 +++++
 .../patch-hw_xfree86_os-support_linux_lnx_video_c  | 23 +++++++++
 8 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_h
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_dri_dri_c
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c

diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index a8217311a..486bcec2e 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -31,7 +31,7 @@ PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib
-PKGFD_WITH_DRI:=		enable DRI/DRI2 support
+PKGFD_WITH_DRI:=		enable DRI support
 PKGFB_WITH_DRI:=		xf86driproto glproto MesaLib
 PKGFD_WITH_KDRIVE:=		Build Kdrive Xfbdev server
 
@@ -78,6 +78,8 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--disable-xcsecurity \
 			--disable-xvfb \
 			--disable-xvmc \
+			--disable-selective-werror \
+			--disable-strict-compilation \
 			--with-xkb-output=/tmp \
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://openadk.org"
@@ -109,8 +111,10 @@ xorg-server-install:
 	${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin
 	${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
 	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
+endif
 	${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
 ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
diff --git a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
new file mode 100644
index 000000000..a7ad990e1
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
@@ -0,0 +1,13 @@
+--- xorg-server-1.15.0.orig/hw/kdrive/linux/linux.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/kdrive/linux/linux.c	2014-03-21 12:51:06.774068258 +0100
+@@ -66,8 +66,8 @@ static void
+ LinuxCheckChown(const char *file)
+ {
+     struct stat st;
+-    __uid_t u;
+-    __gid_t g;
++    uid_t u;
++    gid_t g;
+ 
+     if (stat(file, &st) < 0)
+         return;
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
index 3a0eb0dbb..07737fafe 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
+++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
@@ -1,7 +1,63 @@
 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
++++ xorg-server-1.15.0/hw/xfree86/common/compiler.h	2014-03-21 12:53:48.834417415 +0100
+@@ -727,26 +727,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;
+ }
+ 
+@@ -754,21 +754,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);
+ }
+ 
+ #if defined(__mips__)
 @@ -995,7 +995,7 @@ inl(unsigned short port)
      return xf86ReadMmio32Le((void *) ioBase, port);
  }
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_h b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_h
new file mode 100644
index 000000000..599c558d0
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_h
@@ -0,0 +1,18 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/common/xf86VGAarbiter.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/common/xf86VGAarbiter.h	2014-03-21 17:00:39.953676328 +0100
+@@ -30,6 +30,7 @@
+ #include "misc.h"
+ #include "xf86.h"
+ 
++#ifdef XSERVER_LIBPCIACCESS
+ /* Functions */
+ extern void xf86VGAarbiterInit(void);
+ extern void xf86VGAarbiterFini(void);
+@@ -41,6 +42,7 @@ extern void xf86VGAarbiterUnlock(ScrnInf
+ /* allow a driver to remove itself from arbiter - really should be
+  * done in the kernel though */
+ extern _X_EXPORT void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn, int rsrc);
++#endif
+ 
+ /* DRI and arbiter are really not possible together,
+  * you really want to remove the card from arbitration if you can */
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_c b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_c
new file mode 100644
index 000000000..6f0f10aec
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_c
@@ -0,0 +1,18 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/dri/dri.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/dri/dri.c	2014-03-21 16:18:51.934149666 +0100
+@@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include <xorg-config.h>
+ #endif
+ 
++#include "xf86VGAarbiter.h"
+ #include "xf86.h"
+ #include <sys/time.h>
+ #include <unistd.h>
+@@ -68,7 +69,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include "mipointer.h"
+ #include "xf86_OSproc.h"
+ #include "inputstr.h"
+-#include "xf86VGAarbiter.h"
+ #include "xf86Extensions.h"
+ 
+ static int DRIEntPrivIndex = -1;
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
new file mode 100644
index 000000000..12f64f718
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
@@ -0,0 +1,11 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/dri/sarea.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/dri/sarea.h	2014-03-21 12:54:54.486559308 +0100
+@@ -43,6 +43,8 @@
+ #define SAREA_MAX 			0x2000
+ #elif defined(__ia64__)
+ #define SAREA_MAX			0x10000 /* 64kB */
++#elif defined(__mips__)
++#define SAREA_MAX			0x4000
+ #else
+ /* Intel 830M driver needs at least 8k SAREA */
+ #define SAREA_MAX			0x2000
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
new file mode 100644
index 000000000..d170fa424
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
@@ -0,0 +1,13 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/os-support/linux/lnx_init.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/os-support/linux/lnx_init.c	2014-03-21 12:56:02.898707432 +0100
+@@ -83,8 +83,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) {
+ 
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
new file mode 100644
index 000000000..843cc145b
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -0,0 +1,23 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/os-support/linux/lnx_video.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/os-support/linux/lnx_video.c	2014-03-21 13:14:06.821293270 +0100
+@@ -473,7 +473,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,11 @@ static Bool
+ hwEnableIO(void)
+ {
+     int fd;
++#ifdef __powerpc__
+     unsigned int ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
++#else
++    unsigned int ioBase_phys = 0x1fd00000;
++#endif
+ 
+     fd = open("/dev/mem", O_RDWR);
+     if (ioBase == NULL) {
-- 
cgit v1.2.3


From 30d6f21d2fb3ca89a86346994a70a436afbb2e14 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:24:21 +0200
Subject: update openswan

---
 package/openswan/Makefile                           |  4 ++--
 package/openswan/patches/patch-Makefile_inc         | 21 +++++++++++++++++----
 package/openswan/patches/patch-Makefile_top         | 11 -----------
 .../patches/patch-lib_libopenswan_alg_info_c        | 12 ------------
 4 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 package/openswan/patches/patch-Makefile_top
 delete mode 100644 package/openswan/patches/patch-lib_libopenswan_alg_info_c

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 5dc4245b6..1c981f30b 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.38
+PKG_VERSION:=		2.6.41
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		13073eb5314b83a31be88e4117e8bbcd
+PKG_MD5SUM:=		da2e8b02ecc30a408cc5766767fef84f
 PKG_DESCR:=		IPsec software
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		ip libgmp libpthread kmod-net-key kmod-xfrm-user
diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc
index 2a2040949..9c73c7ce0 100644
--- a/package/openswan/patches/patch-Makefile_inc
+++ b/package/openswan/patches/patch-Makefile_inc
@@ -1,5 +1,5 @@
---- openswan-2.6.37.orig/Makefile.inc	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/Makefile.inc	2011-12-01 17:30:31.000000000 +0100
+--- openswan-2.6.41.orig/Makefile.inc	2014-02-21 21:46:57.000000000 +0100
++++ openswan-2.6.41/Makefile.inc	2014-03-12 18:39:50.906115397 +0100
 @@ -169,7 +169,7 @@ INSTALL=install
  # how backup names are composed.
  # Note that the install procedures will never overwrite an existing config
@@ -9,7 +9,20 @@
  INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
  INSTMANFLAGS=
  INSTCONFFLAGS=
-@@ -279,12 +279,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
+@@ -191,10 +191,10 @@ BISONOSFLAGS=
+ #Example for a cross compile:
+ #USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
+ GCC_LINT ?= -DGCC_LINT
+-USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
++USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
+ # on fedora/rhel
+ #USERCOMPILE?=-g -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4  -m64 -mtune=generic -fPIE -pie -DSUPPORT_BROKEN_ANDROID_ICS
+-KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
++KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
+ # Additional debugging for developers (warning: can crash openswan!)
+ #USERCOMPILE?=-g -DLEAK_DETECTIVE -lefence
+ # You can also run this before starting openswan on glibc systems:
+@@ -283,12 +283,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
  # Note you need a locally running bind9 nameserver with lwres{} enabled
  # to use this, or have the "lwres" package installed and running.
  # This only affects conns that use DNS for keys in lookups.
@@ -23,4 +36,4 @@
 +USE_DYNAMICDNS?=false
  
  # Do we want all the configuration files like ipsec.conf and ipsec.secrets
- # and any certificates to be in a single directory defined by 
+ # and any certificates to be in a single directory defined by
diff --git a/package/openswan/patches/patch-Makefile_top b/package/openswan/patches/patch-Makefile_top
deleted file mode 100644
index 410670312..000000000
--- a/package/openswan/patches/patch-Makefile_top
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.38.orig/Makefile.top	2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/Makefile.top	2012-07-25 18:17:21.000000000 +0200
-@@ -26,7 +26,7 @@ ERRCHECK=${MAKEUTILS}/errcheck
- KVUTIL=${MAKEUTILS}/kernelversion
- KVSHORTUTIL=${MAKEUTILS}/kernelversion-short
- 
--SUBDIRS?=lib programs testing
-+SUBDIRS?=lib programs
- 
- clean::
- 	-(cd ${OPENSWANSRCDIR} && $(MAKE) modclean && $(MAKE) mod26clean)
diff --git a/package/openswan/patches/patch-lib_libopenswan_alg_info_c b/package/openswan/patches/patch-lib_libopenswan_alg_info_c
deleted file mode 100644
index 3ac8e824b..000000000
--- a/package/openswan/patches/patch-lib_libopenswan_alg_info_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.38.orig/lib/libopenswan/alg_info.c	2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/lib/libopenswan/alg_info.c	2012-07-25 18:17:21.000000000 +0200
-@@ -778,7 +778,7 @@ alg_info_discover_pfsgroup_hack(struct a
-     static char err_buf[256];
-     int ret;
-     
--    pfs_name=index(esp_buf, ';');
-+    pfs_name=strchr(esp_buf, ';');
-     
-     if(pfs_name) {
- 	*pfs_name='\0';
-- 
cgit v1.2.3


From 5a43da1af12df3a39cd30b724bf9144850bd2764 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:26:35 +0200
Subject: experimental midori support

---
 package/geoclue/Makefile                           |  29 +
 package/harfbuzz/Makefile                          |  10 +-
 package/icu4c/Makefile                             |  47 ++
 package/json-glib/Makefile                         |  27 +
 package/libcroco/Makefile                          |  32 +
 package/librsvg/Makefile                           |  34 +
 package/libsecret/Makefile                         |  31 +
 package/libsecret/patches/patch-Makefile_am        |  26 +
 package/libsecret/patches/patch-Makefile_am.orig   |  11 +
 package/libsecret/patches/patch-configure_ac       |  44 ++
 package/libsecret/patches/patch-configure_ac.orig  |  35 ++
 .../patch-docs_reference_libsecret_Makefile_am     |  20 +
 ...patch-docs_reference_libsecret_Makefile_am.orig |  11 +
 .../libsecret/patches/patch-libsecret_Makefile_am  |  95 +++
 .../patches/patch-libsecret_tests_Makefile_am      | 113 ++++
 .../patches/patch-libsecret_tests_Makefile_am.orig |  72 +++
 package/libsoup/Makefile                           |  31 +
 package/libsoup/patches/patch-Makefile_am          |  20 +
 .../libsoup/patches/patch-build-aux_config_guess   | 447 ++++++++++++++
 package/libsoup/patches/patch-build-aux_config_sub | 183 ++++++
 package/libsoup/patches/patch-build-aux_depcomp    | 682 +++++++++++++++++++++
 package/libsoup/patches/patch-build-aux_missing    | 440 +++++++++++++
 package/libsoup/patches/patch-configure_ac         |  10 +
 package/libwebp/Makefile                           |  25 +
 package/ltrace/Makefile                            |  26 +
 package/ltrace/patches/patch-breakpoints_c         |  14 +
 package/ltrace/patches/patch-breakpoints_c.orig    |  14 +
 package/ltrace/patches/patch-handle_event_c        |  19 +
 package/ltrace/patches/patch-proc_c                |  32 +
 package/midori/Makefile                            |  40 ++
 package/vala/Makefile                              |  33 +
 package/webkitgtk/Makefile                         |  43 ++
 32 files changed, 2693 insertions(+), 3 deletions(-)
 create mode 100644 package/geoclue/Makefile
 create mode 100644 package/icu4c/Makefile
 create mode 100644 package/json-glib/Makefile
 create mode 100644 package/libcroco/Makefile
 create mode 100644 package/librsvg/Makefile
 create mode 100644 package/libsecret/Makefile
 create mode 100644 package/libsecret/patches/patch-Makefile_am
 create mode 100644 package/libsecret/patches/patch-Makefile_am.orig
 create mode 100644 package/libsecret/patches/patch-configure_ac
 create mode 100644 package/libsecret/patches/patch-configure_ac.orig
 create mode 100644 package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am
 create mode 100644 package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig
 create mode 100644 package/libsecret/patches/patch-libsecret_Makefile_am
 create mode 100644 package/libsecret/patches/patch-libsecret_tests_Makefile_am
 create mode 100644 package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig
 create mode 100644 package/libsoup/Makefile
 create mode 100644 package/libsoup/patches/patch-Makefile_am
 create mode 100644 package/libsoup/patches/patch-build-aux_config_guess
 create mode 100644 package/libsoup/patches/patch-build-aux_config_sub
 create mode 100644 package/libsoup/patches/patch-build-aux_depcomp
 create mode 100644 package/libsoup/patches/patch-build-aux_missing
 create mode 100644 package/libsoup/patches/patch-configure_ac
 create mode 100644 package/libwebp/Makefile
 create mode 100644 package/ltrace/Makefile
 create mode 100644 package/ltrace/patches/patch-breakpoints_c
 create mode 100644 package/ltrace/patches/patch-breakpoints_c.orig
 create mode 100644 package/ltrace/patches/patch-handle_event_c
 create mode 100644 package/ltrace/patches/patch-proc_c
 create mode 100644 package/midori/Makefile
 create mode 100644 package/vala/Makefile
 create mode 100644 package/webkitgtk/Makefile

diff --git a/package/geoclue/Makefile b/package/geoclue/Makefile
new file mode 100644
index 000000000..113d400eb
--- /dev/null
+++ b/package/geoclue/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		geoclue
+PKG_VERSION:=		1.99.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		514efbecd69c78b3e0a3d86012b7d88c
+PKG_DESCR:=		D-Bus service that provides location information
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		json-glib
+PKG_BUILDDEP:=		json-glib
+PKG_URL:=		http://www.freedesktop.org/wiki/Software/GeoClue/
+PKG_SITES:=		http://www.freedesktop.org/software/geoclue/releases/1.99/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GEOCLUE,geoclue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+geoclue-install:
+	$(INSTALL_DIR) $(IDIR_GEOCLUE)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/geoclue*.so* \
+		$(IDIR_GEOCLUE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index d2530b5a1..07a84a5b4 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		harfbuzz
 PKG_VERSION:=		0.9.9
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		e901ffe556d706b7d43b272f83be7f09
 PKG_DESCR:=		OpenType text shaping engine
 PKG_SECTION:=		libs
 PKG_SITES:=		http://www.freedesktop.org/software/harfbuzz/release/
-PKG_DEPENDS:=		libstdcxx cairo
-PKG_BUILDDEP:=		libstdcxx cairo
+PKG_DEPENDS:=		libstdcxx cairo icu4c
+PKG_BUILDDEP:=		libstdcxx cairo icu4c
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!m68k
@@ -22,6 +22,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+pre-install:
+	$(INSTALL_DIR) $(WRKINST)/usr/include/harfbuzz
+	$(CP) $(WRKBUILD)/src/hb-icu.h $(WRKINST)/usr/include/harfbuzz
+
 harfbuzz-install:
 	$(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libharfbuzz*.so* \
diff --git a/package/icu4c/Makefile b/package/icu4c/Makefile
new file mode 100644
index 000000000..772e147b5
--- /dev/null
+++ b/package/icu4c/Makefile
@@ -0,0 +1,47 @@
+# 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:=		icu4c
+PKG_VERSION:=		52.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9e96ed4c1d99c0d14ac03c140f9f346c
+PKG_DESCR:=		unicode and globalization library
+PKG_SECTION:=		libs
+PKG_BUILDDEP:=		icu4c-host
+PKG_URL:=		http://icu-project.org
+PKG_SITES:=		http://download.icu-project.org/files/icu4c/52.1/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-52_1-src.tgz
+
+WRKDIST=		${WRKDIR}/icu/source
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--enable-extras=no \
+			--enable-samples=no \
+			--enable-tests=no \
+			--enable-shared=no \
+			--enable-dyload=no \
+			--enable-static
+CONFIGURE_ARGS+=	--with-cross-build=${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host/icu/source \
+			--enable-extras=no \
+			--enable-samples=no \
+			--enable-tests=no \
+
+icu4c-hostinstall:
+
+icu4c-install:
+	$(INSTALL_DIR) $(IDIR_ICU4C)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libicuuc.so* \
+		$(IDIR_ICU4C)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/json-glib/Makefile b/package/json-glib/Makefile
new file mode 100644
index 000000000..f293c8384
--- /dev/null
+++ b/package/json-glib/Makefile
@@ -0,0 +1,27 @@
+# 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:=		json-glib
+PKG_VERSION:=		0.14.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2a22832c4654156a35b38ee027f6f065
+PKG_DESCR:=		a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format 
+PKG_SECTION:=		libs
+PKG_URL:=		https://wiki.gnome.org/JsonGlib/
+PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.14/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JSON_GLIB,json-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+json-glib-install:
+	$(INSTALL_DIR) $(IDIR_JSON_GLIB)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjson-glib*.so* \
+		$(IDIR_JSON_GLIB)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libcroco/Makefile b/package/libcroco/Makefile
new file mode 100644
index 000000000..8e6775354
--- /dev/null
+++ b/package/libcroco/Makefile
@@ -0,0 +1,32 @@
+# 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:=		libcroco
+PKG_VERSION:=		0.6.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		767e73c4174f75b99695d4530fd9bb80
+PKG_DESCR:=		CSS2 parsing and manipulation library
+PKG_SECTION:=		libs
+PKG_URL:=		https://github.com/GNOME/libcroco
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+HOST_STYLE:=		auto
+
+libcroco-install:
+	$(INSTALL_DIR) $(IDIR_LIBCROCO)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcroco*.so* \
+		$(IDIR_LIBCROCO)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/librsvg/Makefile b/package/librsvg/Makefile
new file mode 100644
index 000000000..39eeaab5d
--- /dev/null
+++ b/package/librsvg/Makefile
@@ -0,0 +1,34 @@
+# 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:=		librsvg
+PKG_VERSION:=		2.40.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		acdecdb9f08f3bf662a68bf7dafb8b82
+PKG_DESCR:=		SVG library
+PKG_BUILDDEP:=		libcroco
+HOST_BUILDDEP:=		libcroco-host
+PKG_SECTION:=		libs
+PKG_URL:=		https://wiki.gnome.org/action/show/Projects/LibRsvg?action=show&redirect=LibRsvg
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+HOST_STYLE:=		auto
+CONFIGURE_ARGS+=	--enable-introspection=no
+
+librsvg-install:
+	$(INSTALL_DIR) $(IDIR_LIBRSVG)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/librsvg*.so* \
+		$(IDIR_LIBRSVG)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libsecret/Makefile b/package/libsecret/Makefile
new file mode 100644
index 000000000..6659cbc67
--- /dev/null
+++ b/package/libsecret/Makefile
@@ -0,0 +1,31 @@
+# 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:=		libsecret
+PKG_VERSION:=		0.16
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ab0edcd5887a6fe78c948e36b6341858
+PKG_DESCR:=		library for storing and retrieving passwords
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libgcrypt
+PKG_BUILDDEP:=		autotool libgcrypt
+PKG_URL:=		https://wiki.gnome.org/Libsecret
+PKG_SITES:=		https://git.gnome.org/browse/libsecret/snapshot/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSECRET,libsecret,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:=	autoreconf
+CONFIGURE_ARGS+=	--enable-vala=no \
+			--enable-gcrypt
+
+libsecret-install:
+	$(INSTALL_DIR) $(IDIR_LIBSECRET)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsecret*.so* \
+		$(IDIR_LIBSECRET)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libsecret/patches/patch-Makefile_am b/package/libsecret/patches/patch-Makefile_am
new file mode 100644
index 000000000..50af269ea
--- /dev/null
+++ b/package/libsecret/patches/patch-Makefile_am
@@ -0,0 +1,26 @@
+--- libsecret-0.16.orig/Makefile.am	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/Makefile.am	2013-11-22 14:38:52.000000000 +0100
+@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
+ 
+ ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = build egg libsecret tool po docs .
++SUBDIRS = build egg libsecret tool .
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-debug=yes \
+@@ -42,14 +42,9 @@ upload-release: $(DIST_ARCHIVES)
+ upload-docs:
+ 	rsync -Hvax docs/reference/libsecret/html/./ master.gnome.org:public_html/libsecret-docs/
+ 
+-if HAVE_VALAC
+-dist-check-valac:
+-
+-else
+ dist-check-valac:
+ 	@echo "*** valac must be installed and enabled