From 785ab2b62c8d9366023095641f2ba237e2b0ed8e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 3 Mar 2021 16:09:04 +0100 Subject: [PATCH] build: use numeric uid/gid on cpio calls There are systems that don't have the 'root' group, so don't rely on host specific user/group names Signed-off-by: Felix Fietkau --- include/image.mk | 2 +- include/kernel-defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/image.mk b/include/image.mk index 7f0d27b74643..993de5ff53d7 100644 --- a/include/image.mk +++ b/include/image.mk @@ -301,7 +301,7 @@ endif ifdef CONFIG_TARGET_ROOTFS_CPIOGZ define Image/Build/cpiogz - ( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R root:root | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz ) + ( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R 0:0 | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz ) endef endif diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index ade31b0dc19c..4b0b136a03a1 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -163,7 +163,7 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),y) ifeq ($(CONFIG_EXTERNAL_CPIO),y) $(CP) $(CONFIG_EXTERNAL_CPIO) $(KERNEL_BUILD_DIR)/initrd.cpio else - ( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R root:root > $(KERNEL_BUILD_DIR)/initrd.cpio ) + ( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R 0:0 > $(KERNEL_BUILD_DIR)/initrd.cpio ) endif $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),bzip2 -9 -c < $(KERNEL_BUILD_DIR)/initrd.cpio > $(KERNEL_BUILD_DIR)/initrd.cpio.bzip2) $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),gzip -f -S .gzip -9n $(KERNEL_BUILD_DIR)/initrd.cpio) -- 2.30.2