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

5 files changed, 14 insertions, 41 deletions

diff --git a/README b/README
index 3e280c165..687950abd 100644
--- a/README
+++ b/README
@@ -10,6 +10,7 @@ Before you can start you need to install some tools:
 - GNU make
 - GNU awk
 - GNU sed
+- findutils (find, xargs)
 - tar
 - patch
 - gzip
@@ -18,7 +19,6 @@ Before you can start you need to install some tools:
 - ncurses5 headers
 - zlib headers
 - perl
-- xargs
 
 There is a check for the required versions of these tools in advance, though.
 (to re-issue the checks, use "make prereq").
diff --git a/mk/image.mk b/mk/image.mk
index e97839760..6721549b5 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -47,7 +47,7 @@ image-prepare-post:
 			mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \
 		done; \
 	fi
-	sed -i '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd
+	$(SED) '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd
 	-rm -f ${TARGET_DIR}/bin/sh
 	ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
 ifeq ($(ADK_LINUX_X86_64),y)
@@ -171,7 +171,7 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
 		--pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
 
 createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
-	${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \
+	${SED} 's/.*CONFIG_\(RD_\|XZ_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \
 		${LINUX_DIR}/.config
 	( \
 		echo "CONFIG_BLK_DEV_INITRD=y"; \
diff --git a/mk/vars.mk b/mk/vars.mk
index 904735aab..01120b005 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -149,9 +149,9 @@ LDFLAGS_FOR_BUILD?= 	-L$(STAGING_HOST_DIR)/usr/lib
 FLAGS_FOR_BUILD=	${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
 
 PATCH=			${BASH} $(SCRIPT_DIR)/patch.sh
-SED:=			sed -i -e
+SED:=			PATH=${HOST_PATH} sed -i -e
 LINUX_DIR:=		$(BUILD_DIR)/linux
-KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} KERNELVERSION="2.6" \
+KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} \
 			KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \
 			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
 			LDFLAGS="$(ADK_TARGET_KERNEL_LDFLAGS)" CFLAGS_MODULE="-fhonour-copts" V=1
diff --git a/scripts/automake.dep b/scripts/automake.dep
deleted file mode 100644
index 2cfd5d3ce..000000000
--- a/scripts/automake.dep
+++ /dev/null
@@ -1,36 +0,0 @@
-configure configure.ac
-configure configure.in
-configure configure.sh
-configure missing
-/Makefile.in /Makefile.am
-/Makefile.in configure.in
-/Makefile.in configure.ac
-/Makefile.in aclocal.m4
-aclocal.m4 configure.in
-aclocal.m4 configure.ac
-aclocal.m4 acinclude.m4
-config-h.in configure.in
-config-h.in configure.ac
-config.h.in configure.in
-config.h.in configure.ac
-config.h.in aclocal.m4
-config.h.in autoconfig.h.in
-config.h.in gpsd_config.h.in
-configure configure.in
-configure configure.ac
-configure aclocal.m4
-stamp-h.in configure.in
-stamp-h.in configure.ac
-stamp-h.in aclocal.m4
-stamp-h.in acconfig.h
-/Makefile.am subdirs
-/Makefile.am /Makefile.am.in
-subdirs /Makefile.am.in
-configure.files subdirs
-configure.files /configure.in.in
-configure.files admin/configure.in.min
-configure.in configure.files
-acinclude.m4 admin/libtool.m4.in
-acinclude.m4 admin/acinclude.m4.in
-acinclude.m4 libltdl/ltdl.m4
-libtoolize.in configure
diff --git a/scripts/find b/scripts/find
new file mode 100755
index 000000000..ea38d92fb
--- /dev/null
+++ b/scripts/find
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+if [ -z "$(which gfind 2>/dev/null)" ];then
+	/usr/bin/find "$@"
+else
+	gfind "$@"
+fi