summaryrefslogtreecommitdiffstats
path: root/meta-initramfs/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta-initramfs/recipes-devtools')
-rw-r--r--meta-initramfs/recipes-devtools/dracut/dracut/0002-fix-broken-symlink-in-dracut-config-examples.patch44
-rw-r--r--meta-initramfs/recipes-devtools/dracut/dracut_110.bb (renamed from meta-initramfs/recipes-devtools/dracut/dracut_109.bb)6
2 files changed, 2 insertions, 48 deletions
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0002-fix-broken-symlink-in-dracut-config-examples.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0002-fix-broken-symlink-in-dracut-config-examples.patch
deleted file mode 100644
index e2c202a079..0000000000
--- a/meta-initramfs/recipes-devtools/dracut/dracut/0002-fix-broken-symlink-in-dracut-config-examples.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From e01991f1d55d4d1327793790bad3724b89952704 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 22 May 2025 18:07:27 +0800
4Subject: [PATCH 2/2] fix broken symlink in dracut config examples
5
6Due to commit [1], it installs dracut config examples under /usr.
7But while enable_test=no, the symlink of test in dracut config is broken
8...
9root@qemux86-64:~# ls /usr/lib/dracut/dracut.conf.d/test* -ahl
10lrwxrwxrwx 1 root root 27 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test -> ../test/dracut.conf.d/test/
11lrwxrwxrwx 1 root root 36 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test-makeroot -> ../test/dracut.conf.d/test-makeroot/
12lrwxrwxrwx 1 root root 31 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test-root -> ../test/dracut.conf.d/test-root
13root@qemux86-64:~# realpath /usr/lib/dracut/dracut.conf.d/test*
14realpath: /usr/lib/dracut/dracut.conf.d/test: No such file or directory
15realpath: /usr/lib/dracut/dracut.conf.d/test-makeroot: No such file or directory
16realpath: /usr/lib/dracut/dracut.conf.d/test-root: No such file or directory
17...
18
19This commit cleans up test symlink if enable_test=no
20
21[1] https://github.com/dracut-ng/dracut-ng/commit/0d369e3e30935dffe48dfff1e90463868e7f804a
22
23Upstream-Status: Submitted [https://github.com/dracut-ng/dracut-ng/pull/1344]
24
25Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
26---
27 Makefile | 1 +
28 1 file changed, 1 insertion(+)
29
30diff --git a/Makefile b/Makefile
31index 3a40594b..df7956ab 100644
32--- a/Makefile
33+++ b/Makefile
34@@ -218,6 +218,7 @@ ifeq ($(enable_test),yes)
35 done
36 else
37 rm -rf $(DESTDIR)$(pkglibdir)/modules.d/70test*
38+ rm -rf $(DESTDIR)$(pkglibdir)/dracut.conf.d/test*
39 endif
40 ifneq ($(enable_documentation),no)
41 for i in $(man1pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man1/$${i##*/}; done
42--
432.47.3
44
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_109.bb b/meta-initramfs/recipes-devtools/dracut/dracut_110.bb
index ee6dce4576..d5ca94add8 100644
--- a/meta-initramfs/recipes-devtools/dracut/dracut_109.bb
+++ b/meta-initramfs/recipes-devtools/dracut/dracut_110.bb
@@ -7,10 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8PE = "1" 8PE = "1"
9 9
10SRCREV = "13c5e5feee9ba86b960d351f87aa0eb25f242ff0" 10SRCREV = "25bf13842a5c55f4a5ab1523e005b3b11b9ac38e"
11SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main;tag=${PV} \ 11SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main;tag=${PV}"
12 file://0002-fix-broken-symlink-in-dracut-config-examples.patch \
13 "
14 12
15DEPENDS += "kmod" 13DEPENDS += "kmod"
16DEPENDS:append:libc-musl = " fts" 14DEPENDS:append:libc-musl = " fts"