aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2023-10-24 13:10:51 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-10-24 14:38:58 +0200
commitee3600a91efaad112d1fabffffeb371f6f3b8e7f (patch)
tree2362408ee989ee858baad6a9933f1cc70133dc4f
parent023f90fbc828a7d146bc1dce057c205a67e313a7 (diff)
downloadupstream-ee3600a91efaad112d1fabffffeb371f6f3b8e7f.tar.gz
upstream-ee3600a91efaad112d1fabffffeb371f6f3b8e7f.tar.bz2
upstream-ee3600a91efaad112d1fabffffeb371f6f3b8e7f.zip
image: Fix the CONFIG_EXTERNAL_CPIO logic
Fix the qstrip call. Fixes: #13776. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 330492a101cdb1608d1194496c1b620315ef8bd8)
-rw-r--r--include/kernel-defaults.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 6a341c3225..b17ff7f932 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -166,7 +166,7 @@ define Kernel/CompileImage/Initramfs
$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR) $(TARGET_DIR)/init)
rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),y)
-ifneq ($(qstrip $(CONFIG_EXTERNAL_CPIO)),)
+ifneq ($(call qstrip,$(CONFIG_EXTERNAL_CPIO)),)
$(CP) $(CONFIG_EXTERNAL_CPIO) $(KERNEL_BUILD_DIR)/initrd.cpio
else
( cd $(TARGET_DIR); find . | LC_ALL=C sort | $(STAGING_DIR_HOST)/bin/cpio --reproducible -o -H newc -R 0:0 > $(KERNEL_BUILD_DIR)/initrd.cpio )