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

mk/kernel-ver.mk

@@ -2,7 +2,7 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
 KERNEL_VERSION:=	3.11.10
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		edbf88eb7f7d34dbd5d3887726790755
+KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_11_10),y)
 KERNEL_VERSION:=	3.11.10

package/corosync/Makefile

@@ -16,6 +16,7 @@ PKG_SITES:=		http://corosync.org/download/
 
 PKG_CFLINE_COROSYNC:=	select ADK_KERNEL_IP_MULTICAST
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_ARCH_DEPENDS:=      x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
 

package/pacemaker-mgmt/Makefile

@@ -14,6 +14,7 @@ PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_ARCH_DEPENDS:=      x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
 

package/util-linux/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		util-linux
 PKG_VERSION:=		2.23.2
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_MD5SUM:=		b39fde897334a4858bb2098edcce5b3f
 PKG_DESCR:=		Linux utilities (meta-package)
 PKG_SECTION:=		utils

package/util-linux/patches/patch-libuuid_uuid_pc_in

@@ -0,0 +1,13 @@
+--- util-linux-2.23.2.orig/libuuid/uuid.pc.in	2013-02-27 17:46:29.883020734 +0100
++++ util-linux-2.23.2/libuuid/uuid.pc.in	2013-12-17 17:07:37.935403478 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@usrlib_execdir@
+-includedir=@includedir@
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: uuid
+ Description: Universally unique id library

target/arm/kernel.config

@@ -808,7 +808,7 @@ CONFIG_TMPFS=y
 # CONFIG_MISC_FILESYSTEMS is not set
 # CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_NLS=m
-CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set

target/arm/sys-available/keyasic-ka2000

@@ -0,0 +1,16 @@
+config ADK_TARGET_SYSTEM_KEYASIC_KA2000
+	bool "KeyASIC KA2000 (f.e. Transcend WifiSD)"
+	select ADK_arm
+	select ADK_little
+	select ADK_keyasic_ka2000
+	select ADK_KERNEL_AEABI
+	select ADK_EABI
+	select ADK_CPU_ARMV5
+	select ADK_TARGET_NO_FPU
+	select ADK_TOOLCHAIN
+	select ADK_STATIC
+	select BUSYBOX_STATIC
+	help
+	  KeyASIC KA2000 aka Transcend WifiSD.
+	  Build a toolchain only and make all binaries static.
+

target/linux/config/Config.in.fs

@@ -172,7 +172,8 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
 	prompt "kmod-vfat-fs...................... VFAT filesystem support"
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
-	select ADK_KPACKAGE_KMOD_NLS_UTF8
+	select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
+	select ADK_KPACKAGE_KMOD_NLS_ISO8859_1
 	select ADK_KERNEL_BLOCK
 	default y if ADK_TARGET_WITH_MMC
 	default n