diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2023-10-24 13:10:51 +0200 |
---|---|---|
committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-10-24 14:39:15 +0200 |
commit | 38ee41a0b6d1fb72a5f1c7f37c6b599db013c389 (patch) | |
tree | 5f50a54a5ac3e362e7f48f74c976aa5cc325f2fa | |
parent | 1fa6b2639c9c1a3e8c4174f56c6ca54e8b84efe9 (diff) | |
download | upstream-38ee41a0b6d1fb72a5f1c7f37c6b599db013c389.tar.gz upstream-38ee41a0b6d1fb72a5f1c7f37c6b599db013c389.tar.bz2 upstream-38ee41a0b6d1fb72a5f1c7f37c6b599db013c389.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.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 ) |