From: Luca Barbato <lu_zero@gentoo.org>
Date: Tue, 24 Oct 2023 11:10:51 +0000 (+0200)
Subject: image: Fix the CONFIG_EXTERNAL_CPIO logic
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=330492a101cdb1608d1194496c1b620315ef8bd8;p=openwrt%2Fstaging%2F981213.git

image: Fix the CONFIG_EXTERNAL_CPIO logic

Fix the qstrip call.

Fixes: #13776.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 6a0251a9e2..a0527c0d28 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -168,7 +168,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 )