From 5ab921af6386c3c9ba3f2dd8b3e0db9bfd8903f4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Mar 2014 16:16:12 +0100 Subject: kernel bump, add hifiberry device drivers --- target/linux/config/Config.in.audio | 33 ++++++++++++++++++++++++----- target/linux/config/Config.in.netfilter.ip4 | 11 ++++++---- 2 files changed, 35 insertions(+), 9 deletions(-) (limited to 'target/linux/config') diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 76c353f0c..c466bed45 100644 --- a/target/linux/config/Config.in.audio +++ b/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 diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index cf33c02a2..b43a566b9 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/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 -- cgit v1.2.3 From 8f148a08f29ccb6c21f108549e20aa8e0bb04b79 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 11 Mar 2014 10:55:56 +0100 Subject: finetune rebuild stuff need to rebuild kmod-packages, when removed. f.e. by hudson. fix kmod-soft-watchdog while there. Use bin directory for ldd to avoid a cpio failure. --- mk/kernel-build.mk | 16 +++++++++------- mk/modules.mk | 4 ++-- mk/pkg-bottom.mk | 5 ----- package/musl/Makefile | 6 +++--- target/linux/config/Config.in.watchdog | 2 +- 5 files changed, 15 insertions(+), 18 deletions(-) (limited to 'target/linux/config') diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 8fe0799a0..b2dc77d82 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -42,28 +42,30 @@ else $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE) endif - ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE) touch -c $(LINUX_DIR)/.config $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config - -rm $(LINUX_DIR)/$(KERNEL_TARGET) 2>/dev/null $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile - ${KERNEL_MAKE_ENV} $(MAKE) V=1 ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) $(MAKE_TRACE) + ${KERNEL_MAKE_ENV} $(MAKE) ${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 \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ LOCALVERSION="" \ - modules modules_install $(MAKE_TRACE) + modules_install $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET_ARCH)-create-packages ifneq ($(strip $(TARGETS)),) $(MAKE) $(TARGETS) endif - touch -c $(LINUX_DIR)/$(KERNEL_FILE) + +$(INSTALL_TARGETS): $(LINUX_BUILD_DIR)/modules prepare: -compile: $(LINUX_DIR)/$(KERNEL_FILE) -install: compile +compile: $(LINUX_BUILD_DIR)/modules +install: compile $(INSTALL_TARGETS) ifneq ($(strip $(INSTALL_TARGETS)),) $(TRACE) target/${ADK_TARGET_ARCH}-modules-install ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) diff --git a/mk/modules.mk b/mk/modules.mk index 6015aadf0..428fe2700 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1417,8 +1417,8 @@ $(eval $(call KMOD_template,BT_RFCOMM,bt-rfcomm,\ # Misc devices # -$(eval $(call KMOD_template,SOFTDOG,softdog,\ - $(MODULES_DIR)/kernel/drivers/char/watchdog/softdog \ +$(eval $(call KMOD_template,SOFT_WATCHDOG,soft-watchdog,\ + $(MODULES_DIR)/kernel/drivers/watchdog/softdog \ ,95)) $(eval $(call KMOD_template,FW_LOADER,fw-loader,\ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 941970cbc..3e454ee5a 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -213,11 +213,6 @@ endif touch $@ ${_IPKGS_COOKIE}: - @clean=0; \ - for f in ${ALL_IPKGS}; do \ - [[ -e $$f ]] && clean=1; \ - done; \ - [[ $$clean = 0 ]] || ${MAKE} clean exec ${MAKE} package package: ${ALL_IPKGS} diff --git a/package/musl/Makefile b/package/musl/Makefile index 3341c83a8..efb5404cb 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -55,13 +55,13 @@ endif # do nothing, musl is already build in toolchain directory do-install: - ${INSTALL_DIR} $(IDIR_MUSL)/usr/bin + ${INSTALL_DIR} $(IDIR_MUSL)/bin ${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) (cd $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) && \ ln -sf libc.so ld-musl-$(MARCH).so.1) - (cd $(IDIR_MUSL)/usr/bin && \ - ln -sf ../../lib/ld-musl-$(MARCH).so.1 ldd) + (cd $(IDIR_MUSL)/bin && \ + ln -sf ../lib/ld-musl-$(MARCH).so.1 ldd) musl-dev-install: diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 08e884a01..4a727e7d6 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -73,7 +73,7 @@ config ADK_KERNEL_RC32434_WDT Routerboard 532's SoC, the IDT RC32434. config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG - prompt "kmod-softdog...................... Software watchdog" + prompt "kmod-soft-watchdog...................... Software watchdog" tristate default n select ADK_KERNEL_WATCHDOG -- cgit v1.2.3 From b782769986db676b49d10b22e20f2b8184448fc0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 11 Mar 2014 13:56:39 +0100 Subject: add adk-test-tools package - scripts to shutdown qemu from linux - only start klogd when printk is available --- package/adk-test-tools/Makefile | 28 ++++++++++++++++++++++++++++ package/adk-test-tools/files/test.init | 11 +++++++++++ package/adk-test-tools/src/qmp | 4 ++++ package/adk-test-tools/src/quit | 2 ++ package/base-files/Makefile | 2 +- package/base-files/src/etc/init.d/boot | 5 ----- package/base-files/src/etc/init.d/rcS | 4 ++++ package/busybox/Makefile | 2 +- package/busybox/files/syslog.init | 8 ++++++-- package/dropbear/Makefile | 2 +- package/strace/patches/patch-util_c | 12 ++++++++++++ target/linux/config/Config.in.debug | 1 + target/packages/pkg-available/test | 1 + 13 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 package/adk-test-tools/Makefile create mode 100755 package/adk-test-tools/files/test.init create mode 100755 package/adk-test-tools/src/qmp create mode 100755 package/adk-test-tools/src/quit create mode 100644 package/strace/patches/patch-util_c (limited to 'target/linux/config') diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile new file mode 100644 index 000000000..bc2624fe9 --- /dev/null +++ b/package/adk-test-tools/Makefile @@ -0,0 +1,28 @@ +# 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:= adk-test-tools +PKG_VERSION:= 0.1 +PKG_RELEASE:= 1 +PKG_DESCR:= helper tools and scripts for adk-test-framework +PKG_SECTION:= misc +PKG_URL:= http://openadk.org/ + +NO_DISTFILES:= 1 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,ADK_TEST_TOOLS,adk-test-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +adk-test-tools-install: + $(INSTALL_DIR) $(IDIR_ADK_TEST_TOOLS)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/{qmp,quit} \ + $(IDIR_ADK_TEST_TOOLS)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init new file mode 100755 index 000000000..81095fa39 --- /dev/null +++ b/package/adk-test-tools/files/test.init @@ -0,0 +1,11 @@ +#!/bin/sh +#PKG adk-test-tools +#INIT 90 +[[ $1 = autostart ]] || exit 0 +echo "Starting test script ..." +if [ -x /run.sh ];then + exec /run.sh +else + echo "no run.sh found" +fi +quit diff --git a/package/adk-test-tools/src/qmp b/package/adk-test-tools/src/qmp new file mode 100755 index 000000000..8f9912222 --- /dev/null +++ b/package/adk-test-tools/src/qmp @@ -0,0 +1,4 @@ +#!/bin/sh +echo '{ "execute": "qmp_capabilities" }' +sleep 1 +echo '{ "execute": "quit" }' diff --git a/package/adk-test-tools/src/quit b/package/adk-test-tools/src/quit new file mode 100755 index 000000000..a625553e2 --- /dev/null +++ b/package/adk-test-tools/src/quit @@ -0,0 +1,2 @@ +#!/bin/sh +socat exec:/usr/bin/qmp tcp:10.0.2.2:4444 diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f320d6b82..f325d2210 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:= 68 +PKG_RELEASE:= 69 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index 8daf52b89..fc2f79ac2 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -4,11 +4,6 @@ . /etc/functions.sh -# disable kernel messages -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 diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS index d34cce6e9..9daa8f5cd 100755 --- a/package/base-files/src/etc/init.d/rcS +++ b/package/base-files/src/etc/init.d/rcS @@ -1,4 +1,8 @@ #!/bin/sh +# disable kernel messages +if [ -f /proc/sys/kernel/printk ];then + echo 0 > /proc/sys/kernel/printk +fi echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin ln -s /proc/self/fd/2 /dev/stderr diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 1fe63ff0a..c1923708e 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.21.1 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init index 7a84815a6..7a85430ca 100644 --- a/package/busybox/files/syslog.init +++ b/package/busybox/files/syslog.init @@ -11,10 +11,14 @@ autostart) ;; start) /sbin/syslogd $syslogd_flags - /sbin/klogd + if [ -f /proc/sys/kernel/printk ];then + /sbin/klogd + fi ;; stop) - kill $(pgrep -f /sbin/klogd) + if [ -f /proc/sys/kernel/printk ];then + kill $(pgrep -f /sbin/klogd) + fi kill $(pgrep -f /sbin/syslogd) ;; restart) diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 0e497279f..319c7522f 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -14,7 +14,7 @@ PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_DFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY +PKG_DFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY && !ADK_PKG_TEST PKG_SUBPKGS:= DROPBEAR DBCONVERT PKGSD_DBCONVERT:= Utility for converting SSH private keys diff --git a/package/strace/patches/patch-util_c b/package/strace/patches/patch-util_c new file mode 100644 index 000000000..34181a22f --- /dev/null +++ b/package/strace/patches/patch-util_c @@ -0,0 +1,12 @@ +--- strace-4.8.orig/util.c 2013-05-06 20:23:01.000000000 +0200 ++++ strace-4.8/util.c 2014-03-07 15:34:01.074036954 +0100 +@@ -55,7 +55,9 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++#if !defined(SH) + # include ++#endif + # undef ia64_fpreg + # undef pt_all_user_regs + #endif diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 46942160f..80387c627 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -34,6 +34,7 @@ config ADK_KERNEL_PRINTK boolean select ADK_KERNEL_EARLY_PRINTK default y + depends on !ADK_PKG_TEST help Disable printk to save space and quieten bootup. diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index fe9204f9c..6560dc8a1 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -1,6 +1,7 @@ config ADK_PKG_TEST bool "Compile a ADK test framework system" default n + select ADK_PACKAGE_ADK_TEST_TOOLS select ADK_PACKAGE_STRACE select ADK_PACKAGE_SOCAT select ADK_PACKAGE_MAKE -- cgit v1.2.3