diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-25 10:32:38 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-25 10:35:31 +0100 |
| commit | 2c6139f32fd4eb2829568bc3c6eeb379c3c7d9be (patch) | |
| tree | 9904e99f5e1d3293e993ca06070f75c2f29b90af /mk/image.mk | |
| parent | acd7dc43632c921003b795f25876e98996fc7bf4 (diff) | |
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.
Diffstat (limited to 'mk/image.mk')
| -rw-r--r-- | mk/image.mk | 10 |
1 files changed, 4 insertions, 6 deletions
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 \ |