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

5 files changed, 45 insertions, 42 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 13e287d89..339136238 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -22,7 +22,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_E2FSCK_STATIC=n \
 			ADK_PACKAGE_KEXECINIT=n \
-			ADK_PACKAGE_INSTALLER=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
@@ -31,12 +30,10 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_U_BOOT=n \
 			ADK_PACKAGE_CRYPTINIT=n \
-			ADK_PACKAGE_PAM=n \
 			ADK_PACKAGE_VIRTINST=n \
 			ADK_PACKAGE_URLGRABBER=n \
 			ADK_PACKAGE_LIBSSP=n \
 			ADK_PACKAGE_OPENAFS=n \
-			ADK_PACKAGE_OPENJDK7=n \
 			ADK_PKG_XORG=n \
 			ADK_PKG_CONSOLE=n \
 			ADK_PKG_TEST=n \
@@ -361,9 +358,9 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(LIBC)" ];then \
+	@if [ ! -z "$(CLIB)" ];then \
 		grep "^config" target/config/Config.in \
-			|grep -i "$(LIBC)" \
+			|grep -i "$(CLIB)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/.defconfig; \
 	fi
@@ -419,9 +416,9 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 	fi
-	@if [ ! -z "$(LIBC)" ];then \
+	@if [ ! -z "$(CLIB)" ];then \
 		grep "^config" target/config/Config.in \
-			|grep -i "$(LIBC)" \
+			|grep -i "$(CLIB)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 	fi
@@ -466,10 +463,10 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
 # build all target architecture and libc combinations (toolchain only)
 bulktoolchain:
-	@if [ -z "$(LIBC)" ];then \
+	@if [ -z "$(CLIB)" ];then \
 		libc="glibc uclibc musl"; \
 	else \
-		libc="$(LIBC)"; \
+		libc="$(CLIB)"; \
 	fi; \
 	for libc in $$libc;do \
 		while read arch; do \
@@ -478,7 +475,7 @@ bulktoolchain:
 			tarch=$$(echo $$arch|sed -e "s#sh4.*#sh#" -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##" -e "s#x86_64.*#x86_64#" ); \
 			carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e 's#x86$$#i686#' -e "s#x86_64.*#x86_64#" ); \
 			echo === building $$tarch $$libc toolchain-$$arch on $$(date); \
-				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
+				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch CLIB=$$libc defconfig; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
 				if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \
 				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
@@ -494,19 +491,19 @@ bulktoolchain:
 	done
 
 test-framework:
-	@if [ -z "$(LIBC)" ];then \
+	@if [ -z "$(CLIB)" ];then \
 		libc="glibc uclibc musl"; \
 	else \
-		libc="$(LIBC)"; \
+		libc="$(CLIB)"; \
 	fi; \
 	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); \
-				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
+				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch CLIB=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
 				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
@@ -529,7 +526,7 @@ release:
 		( \
 			echo === building $$libc on $$(date); \
 			$(GMAKE) prereq && \
-			$(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) LIBC=$$libc FS=archive allmodconfig; \
+			$(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) CLIB=$$libc FS=archive allmodconfig; \
 			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 			rm .config; \
 		) 2>&1 | tee $(TOPDIR)/firmware/release-build.log; \
@@ -547,7 +544,7 @@ bulk:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive defconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/firmware/bulkbuild.log; \
@@ -567,7 +564,7 @@ bulkall:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/firmware/bulkallbuild.log; \
@@ -587,7 +584,7 @@ bulkallmod:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allmodconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
 		$(GMAKE) clean; \
 		rm .config; \
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index ed5c4b88c..4a3baeaf2 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -1,6 +1,9 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+shellescape='$(subst ','\'',$(1))'
+shellexport=$(1)=$(call shellescape,${$(1)})
+
 ifneq ($(strip ${PKG_SITES}),)
 ifeq ($(strip ${DISTFILES}),)
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
@@ -105,14 +108,10 @@ endif
 			mv $$i.bak $$i; \
 		fi;\
 	done
-	@toedit=$$(WRKDIST='${WRKDIST}' CURDIR=$$(pwd) \
-	    PATCH_LIST='patch-* *.patch' WRKDIR1='${WRKDIR}' \
-	    ${BASH} ${TOPDIR}/scripts/update-patches); \
-	    if [[ -n $$toedit && $$toedit != FAIL ]]; then \
-		echo -n 'edit patches: '; read i; \
-		cd patches && $${VISUAL:-$${EDITOR:-vi}} $$toedit; \
-	    fi; \
-	    rm -rf ${WRKDIR}.orig; \
-	    [[ $$toedit != FAIL ]]
+	@WRKDIST=$(call shellescape,${WRKDIST}) \
+	    WRKDIR1=$(call shellescape,${WRKDIR}) \
+	    PATH=$(call shellescape,${HOST_PATH}) \
+	    $(call shellexport,DIFF_IGNOREFILES) \
+	    mksh ${TOPDIR}/scripts/update-patches2
 
 .PHONY: update-patches host-update-patches
diff --git a/mk/modules.mk b/mk/modules.mk
index 8f282498b..cc862cc13 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1238,6 +1238,12 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
 	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
 ,55, kmod-snd-soc))
 
+$(eval $(call KMOD_template,SND_IMX_SOC,snd-imx-soc,\
+	$(MODULES_DIR)/kernel/sound/soc/fsl/imx-pcm-dma \
+	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-fsl-spdif \
+	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-spdif \
+,55, kmod-snd-soc))
+
 $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 	$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
 ,55))
@@ -1482,15 +1488,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,\
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 2ccc6ff1e..bdc7104c3 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -267,3 +267,8 @@ ifeq (,$(filter noremove,${PKG_OPTS}))
 	fi
 endif
 	@rm -f '${STAGING_PKG_DIR}/${PKG_NAME}'
+
+ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
+DIFF_IGNOREFILES?=	configure missing depcomp install-sh INSTALL \
+			aclocal.m4 config.h.in Makefile.in */Makefile.in
+endif
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)