From 2c6139f32fd4eb2829568bc3c6eeb379c3c7d9be Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 25 Dec 2016 10:32:38 +0100
Subject: use GNU cpio instead of heirloom cpio

On newer hardware heirloom cpio triggers a segfault in memcpy
from glibc (ssse3 optimized version).
Just use default GNU cpio and provide it via host package.
---
 mk/image.mk | 10 ++++------
 mk/vars.mk  |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'mk')

diff --git a/mk/image.mk b/mk/image.mk
index 6d0d70a35..aa91e65d3 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -139,17 +139,15 @@ kernel-package: kernel-strip
 	$(END_TRACE)
 
 ${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}/.adk kernel-package
-	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
-		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
-		${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | $(XZ) -c >$@
+	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \
+		$(CPIO) -o -Hustar --owner=0:0 | $(XZ) -c >$@
 ifeq ($(ADK_TARGET_QEMU),y)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 endif
 
 ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}/.adk
-	cd ${TARGET_DIR}; find . | grep -v ./boot/ | sed -n '/^\.\//s///p' | \
-		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
-		${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | $(XZ) -c >$@
+	cd ${TARGET_DIR}; find . | grep -v ./boot/ | sed -n '/^\.\//s///p' | sort | \
+		$(CPIO) -o -Hustar --owner=0:0 | $(XZ) -c >$@
 
 ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk
 	env PATH='${HOST_PATH}' $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
diff --git a/mk/vars.mk b/mk/vars.mk
index b05fd6ad3..3054d48b8 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -306,6 +306,7 @@ endif
 
 SED:=			PATH='${HOST_PATH}' sed -i -e
 XZ:=			PATH='${HOST_PATH}' xz
+CPIO:=			PATH='${HOST_PATH}' cpio
 LINUX_DIR:=		$(BUILD_DIR)/linux
 KERNEL_MODULE_FLAGS:=	ARCH=${ADK_TARGET_ARCH} \
 			PREFIX=/usr \
-- 
cgit v1.2.3