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

Config.in

@@ -97,7 +97,7 @@ prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
 
 config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.12.13"
+	prompt "3.13.6"
 	boolean
 	depends on ADK_TOOLCHAIN_ONLY
 
@@ -109,8 +109,8 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 choice
 prompt "Kernel Version"
 
-config ADK_KERNEL_VERSION_3_13_5
-	prompt "3.13.5"
+config ADK_KERNEL_VERSION_3_13_6
+	prompt "3.13.6"
 	boolean
 
 config ADK_KERNEL_VERSION_3_12_13
@@ -133,7 +133,7 @@ endchoice
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.13.5" if ADK_KERNEL_VERSION_3_13_5
+	default "3.13.6" if ADK_KERNEL_VERSION_3_13_6
 	default "3.12.13" if ADK_KERNEL_VERSION_3_12_13
 	default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
 	default "3.10.30" if ADK_KERNEL_VERSION_3_10_30

LICENCE

@@ -1,4 +1,4 @@
-OpenADK is Copyright © 2008-2010 Waldemar Brodkorb <wbx@openadk.org>
+OpenADK is Copyright © 2008-2014 Waldemar Brodkorb <wbx@openadk.org>
 All rights reserved.
 
 This licence file covers all of the OpenADK meta distribution
@@ -20,11 +20,12 @@ contains tools that are possibly covered by non-GPL-compatible,
 but OSD/DFSG-compliant, licences. 
 
 OpenADK is based upon several other projects which are listed
-below, in no particular order. If you think you should be li-
-sted here but I have forgotten you, please forgive and drop
+below, in no particular order. If you think you should be listed 
+here but I have forgotten you, please forgive and drop
 me an email.
 
 • The FreeWRT Project
 • The OpenWrt Project
-• uClibc Buildroot
+• The Buildroot Project
+• The Aboriginal Linux Project
 • The MirOS Project and contributors

mk/build.mk

@@ -486,17 +486,18 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 bulktoolchain:
 	for libc in glibc uclibc musl;do \
 		while read arch; do \
-		    mkdir -p $(TOPDIR)/firmware/toolchain_$${arch}_$$libc; \
+			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#"); \
+			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;fi; \
-				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}_*; \
+				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}*; \
 				$(GMAKE) cleantoolchain; \
 			rm .config; \
-		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \
+		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}_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 \

mk/kernel-ver.mk

@@ -1,14 +1,14 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.12.13
+KERNEL_VERSION:=	3.13.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		345f5883cfb906dac4aef87e303d3a2d
+KERNEL_MD5SUM:=		445aa27da818617409982f42902a6e41
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_13_5),y)
-KERNEL_VERSION:=	3.13.5
+ifeq ($(ADK_KERNEL_VERSION_3_13_6),y)
+KERNEL_VERSION:=	3.13.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		b9fa20262a7ecbbc3277aa2ee10412da
+KERNEL_MD5SUM:=		445aa27da818617409982f42902a6e41
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_12_13),y)
 KERNEL_VERSION:=	3.12.13

mk/modules.mk

@@ -1198,8 +1198,11 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\
 	$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
 ,55))
 
-$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
+$(eval $(call KMOD_template,SND_SOC,snd-soc,\
 	$(MODULES_DIR)/kernel/sound/soc/snd-soc-core \
+,54))
+
+$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
 	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-lib \
 	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-pcm \
 	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-ac97 \
@@ -1207,12 +1210,26 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
 	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx-i2s \
 	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx \
 	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
-,55))
+,55, kmod-snd-soc))
 
 $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 	$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
 ,55))
 
+$(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2709-soc-i2s,\
+	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \
+	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8804 \
+	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s \
+,55, kmod-snd-soc))
+
+$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\
+	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-dac \
+,56, kmod-snd-bcm2709-soc-i2s))
+
+$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\
+	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \
+,56, kmod-snd-bcm2709-soc-i2s))
+
 #ifeq ($(ADK_LINUX_64),y)
 #V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32
 #endif

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

@@ -5,7 +5,9 @@
 . /etc/functions.sh
 
 # disable kernel messages
-echo 0 > /proc/sys/kernel/printk
+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

target/config/Config.in.runtime

@@ -77,7 +77,7 @@ prompt "Initial login shell for the root user"
 default ADK_ROOTSH_MKSH
 
 config ADK_ROOTSH_MKSH
-	select ADK_PACKAGE_MKSH
+	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
 	bool "mksh (MirBSD Korn Shell)"
 	help
 	  Use mksh (a Korn Shell variant) as standard login shell
@@ -97,13 +97,6 @@ config ADK_ROOTSH_BASH
 	help
 	  Use GNU bash as standard login shell for the superuser.
 
-config ADK_ROOTSH_MKSH
-	select ADK_PACKAGE_MKSH
-	bool "mksh (MirBSD Korn Shell)"
-	help
-	  Use mksh (a Korn Shell variant) as standard login shell
-	  for the superuser.
-
 config ADK_ROOTSH_TCSH
 	select ADK_PACKAGE_TCSH
 	bool "tcsh (Tenex C Shell)"
@@ -124,7 +117,7 @@ prompt "System /bin/sh (POSIX script shell)"
 default ADK_BINSH_MKSH
 
 config ADK_BINSH_MKSH
-	select ADK_PACKAGE_MKSH
+	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
 	bool "mksh (MirBSD Korn Shell)"
 	help
 	  Use mksh (a Korn Shell variant) as system shell, which is

target/linux/config/Config.in.audio

@@ -7,9 +7,6 @@ config ADK_KERNEL_SND_ARM
 config ADK_KERNEL_SND_USB
 	boolean
 
-config ADK_KERNEL_SND_SOC
-	boolean
-
 config ADK_KERNEL_SND_PXA2XX_AC97
 	boolean
 
@@ -105,6 +102,10 @@ config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
 	help
 	 ALSA AMD CS5535 driver
 
+config ADK_KPACKAGE_KMOD_SND_SOC
+	tristate
+	default n
+
 config ADK_KERNEL_SND_PXA2XX_SOC
 	tristate
 	default n
@@ -113,10 +114,10 @@ config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ
 	prompt "kmod-snd-pxa2xx-soc-spitz..... ALSA SOC Sharp Zaurus"
 	tristate
 	select ADK_KERNEL_SND_ARM
-	select ADK_KERNEL_SND_SOC
 	select ADK_KERNEL_SND_PXA2XX_AC97
-	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
+	select ADK_KPACKAGE_KMOD_SND_SOC
 	select ADK_KERNEL_SND_PXA2XX_SOC
 	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -131,4 +132,26 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+	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
+	boolean
+	default n
+
+config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC
+	prompt "kmod-snd-bcm2708-hifiberry-dac.... ALSA for Raspberry PI with hifiberry DAC"
+	tristate
+	select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+
+config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI
+	prompt "kmod-snd-bcm2708-hifiberry-digi... ALSA for Raspberry PI with hifiberry DIGI"
+	tristate
+	select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+
 endmenu

target/linux/config/Config.in.debug

@@ -25,6 +25,34 @@ config ADK_QUIET_KERNEL
 	help
 	  Make bootup quiet without messages from the kernel.
 
+config ADK_KERNEL_EARLY_PRINTK
+	boolean
+	default n
+
+config ADK_KERNEL_PRINTK
+	prompt "Enable printk to save space and quieten bootup"
+	boolean
+	select ADK_KERNEL_EARLY_PRINTK
+	default y
+	help
+	  Disable printk to save space and quieten bootup.
+
+config ADK_KERNEL_PRINTK_TIME
+	prompt "Enable timing information for printk"
+	boolean
+	depends on ADK_KERNEL_PRINTK
+	default n
+	help
+	  Enable timing information for printk, to analyze kernel
+	  bootup performance.
+
+config ADK_KERNEL_BUG
+	prompt "Enable BUGS() in the kernel"
+	boolean
+	default n
+	help
+	  Enable if you need BUGS() in the kernel.
+
 config ADK_KERNEL_NETCONSOLE
 	prompt "Netconsole"
 	boolean

target/linux/config/Config.in.netfilter.ip4

@@ -37,9 +37,10 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for Full NAT"
 	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_11
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_5
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
@@ -53,8 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_11_10 || ADK_KERNEL_VERSION_3_12_11 \
-		|| ADK_KERNEL_VERSION_3_13_5
+	depends on ADK_KERNEL_VERSION_3_10_30 \
+		|| ADK_KERNEL_VERSION_3_11_10 \
+		|| ADK_KERNEL_VERSION_3_12_13 \
+		|| ADK_KERNEL_VERSION_3_13_6
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by

target/linux/kernel.config

@@ -28,8 +28,6 @@ CONFIG_BINFMT_SCRIPT=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
-CONFIG_PRINTK=y
-CONFIG_BUG=n
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
@@ -40,5 +38,3 @@ CONFIG_AIO=y
 CONFIG_PCI_QUIRKS=y
 CONFIG_TTY=y
 CONFIG_UNIX98_PTYS=y
-CONFIG_PRINTK_TIME=y
-CONFIG_EARLY_PRINTK=y

target/packages/pkg-available/console

@@ -12,8 +12,6 @@ config ADK_PKG_CONSOLE
 	select ADK_PACKAGE_OPENSSH_CLIENT
 	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
 	select ADK_PACKAGE_OPENSSH_SERVER
-	select ADK_PACKAGE_MKSH
-	select ADK_PACKAGE_MKSH_FULL
 	select ADK_PACKAGE_MUTT
 	select ADK_PACKAGE_IRSSI
 	select ADK_PACKAGE_IRSSI_WITH_SSL
@@ -29,3 +27,6 @@ config ADK_PKG_CONSOLE
 	select ADK_PACKAGE_WIRELESS_TOOLS if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	select ADK_PACKAGE_IW if ADK_TARGET_SYSTEM_IBM_X40
 	select ADK_KPACKAGE_KMOD_USB_STORAGE
+	help
+	  Support for Linux system without X.
+

target/packages/pkg-available/mpdbox

@@ -2,6 +2,9 @@ config ADK_PKG_MPDBOX
 	bool "Choose packages for MPDBox system"
 	default n
 	select ADK_PACKAGE_MPDBOX
+	select ADK_PACKAGE_CIFS_UTILS
+	select ADK_PACKAGE_NFS_UTILS if ADK_TARGET_LIB_GLIBC
+	select ADK_PACKAGE_NFS_UTILS_CLIENT if ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_LIBMPDCLIENT
 	select ADK_PACKAGE_MPC
 	select ADK_PACKAGE_MPD
@@ -19,9 +22,9 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_MPD_WITH_CURL
 	select ADK_PACKAGE_MPD_WITH_SAMPLERATE
 	select ADK_PACKAGE_MPD_WITH_HTTPD
-	select ADK_PACKAGE_NFS_UTILS if !ADK_TARGET_LIB_MUSL
-	select ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS if !ADK_TARGET_LIB_MUSL
-	select ADK_PACKAGE_NFS_UTILS_CLIENT if !ADK_TARGET_LIB_MUSL
+	select ADK_PACKAGE_MPD_WITH_AVAHI
+	select ADK_PACKAGE_AVAHI_DAEMON
+	select ADK_PACKAGE_AVAHI_DNSCONFD
 	select ADK_PACKAGE_CPUFREQUTILS
 	select ADK_PACKAGE_FILE
 	select ADK_PACKAGE_HTOP
@@ -51,9 +54,9 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_VIM
 	select ADK_PACKAGE_ALSA_UTILS
 	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
-	select ADK_PACKAGE_MKSH
-	select ADK_PACKAGE_MKSH_FULL
 	select ADK_KPACKAGE_KMOD_SND_INTEL8X0 if ADK_TARGET_SYSTEM_QEMU_I686
-	select ADK_PACKAGE_CIFS_UTILS
 	select ADK_KPACKAGE_KMOD_SND_USB_AUDIO
 	select ADK_KPACKAGE_KMOD_USB_STORAGE
+	help
+	  Create a small mpdbox.
+

target/packages/pkg-available/test

@@ -7,3 +7,4 @@ config ADK_PKG_TEST
 	help
 	  Package collection used to build adk-test-framework root
 	  filesystem.
+

target/packages/pkg-available/xorg

@@ -22,3 +22,6 @@ config ADK_PKG_XORG
 	select ADK_PACKAGE_EVILWM
 	select ADK_PACKAGE_DILLO
 	select ADK_PACKAGE_XRDB
+	help
+	  X desktop environment with EvilWM.
+