[openwrt/openwrt] kernel: fix flock name for gen-initramfs lock

LEDE Commits lede-commits at lists.infradead.org
Wed Sep 18 16:08:16 PDT 2024


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/98a62f7c8c099de724318cdbdd74a1df659df619

commit 98a62f7c8c099de724318cdbdd74a1df659df619
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Thu Sep 19 00:58:44 2024 +0200

    kernel: fix flock name for gen-initramfs lock
    
    Fix flock name for gen-initramfs lock as $(2) starts with .HASH making
    the lock name gen-initramfs-.HASH.flock
    
    Fix this to a better name of gen-initramfs.HASH.flock
    
    Fixes: 52cc9d82f113 ("kernel: rework Initramfs locking logic")
    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 82472c2194..64b8a3775e 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -214,7 +214,7 @@ define Kernel/CompileImage/Initramfs
 			$(KERNEL_MAKE) $(if $(2),-C $(LINUX_DIR)$(2)) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all);) \
 		$(call Kernel/CopyImage,-initramfs,$(2)); \
 		$(if $(2),rm -rf $(LINUX_DIR)$(2);) \
-	}, gen-initramfs$(if $(2),-$(2)));
+	}, gen-initramfs$(2));
 endef
 else
 define Kernel/CompileImage/Initramfs




More information about the lede-commits mailing list