From: Christian Marangi Date: Sun, 7 Jul 2024 17:28:35 +0000 (+0200) Subject: kernel: aldo fix CopyImage for Separate Initramfs X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0122fd7929d0971e2286518b2da3d307b677c683;p=openwrt%2Fstaging%2Fthess.git kernel: aldo fix CopyImage for Separate Initramfs Also fix CopyImage for Separate Initramfs with Per Device Rootfs. Fixes: 7bffb3f72bbf ("kernel: fix CopyImage function with Per Device Rootfs") Signed-off-by: Christian Marangi --- diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 46045b0ed7..ff6c60d5b0 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -185,7 +185,7 @@ endif $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO),$(STAGING_DIR_HOST)/bin/lzop -9 -f $(if $(2),$(LINUX_DIR)$(2),$(KERNEL_BUILD_DIR))/initrd.cpio) $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ),$(STAGING_DIR_HOST)/bin/xz -T$(if $(filter 1,$(NPROC)),2,0) -9 -fz --check=crc32 $(if $(2),$(LINUX_DIR)$(2),$(KERNEL_BUILD_DIR))/initrd.cpio) $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD),$(STAGING_DIR_HOST)/bin/zstd -T0 -f -o $(if $(2),$(LINUX_DIR)$(2),$(KERNEL_BUILD_DIR))/initrd.cpio.zstd $(if $(2),$(LINUX_DIR)$(2),$(KERNEL_BUILD_DIR))/initrd.cpio) - $(call Kernel/CopyImage,-initramfs$(2)) + $(call Kernel/CopyImage,-initramfs,$(2)) else +$(call locked,$(if $(2),$(CP) $(LINUX_DIR)$(2)/.config* $(LINUX_DIR) && touch $(LINUX_DIR)/.config && )\ rm -rf $(LINUX_DIR)/usr/initramfs_data.cpio* $(LINUX_DIR)/.config.prev && \