[openwrt/openwrt] kernel: aldo fix CopyImage for Separate Initramfs

LEDE Commits lede-commits at lists.infradead.org
Mon Jul 8 04:23:28 PDT 2024


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/0122fd7929d0971e2286518b2da3d307b677c683

commit 0122fd7929d0971e2286518b2da3d307b677c683
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Sun Jul 7 19:28:35 2024 +0200

    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 <ansuelsmth at gmail.com>
---
 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 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 && \




More information about the lede-commits mailing list