[openwrt/openwrt] image: Fix the CONFIG_EXTERNAL_CPIO logic

LEDE Commits lede-commits at lists.infradead.org
Tue Oct 24 05:39:33 PDT 2023


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/38ee41a0b6d1fb72a5f1c7f37c6b599db013c389

commit 38ee41a0b6d1fb72a5f1c7f37c6b599db013c389
Author: Luca Barbato <lu_zero at gentoo.org>
AuthorDate: Tue Oct 24 13:10:51 2023 +0200

    image: Fix the CONFIG_EXTERNAL_CPIO logic
    
    Fix the qstrip call.
    
    Fixes: #13776.
    
    Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
    (cherry picked from commit 330492a101cdb1608d1194496c1b620315ef8bd8)
---
 include/kernel-defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 2e21392016..2291acdaf9 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -171,7 +171,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 )




More information about the lede-commits mailing list