diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2025-05-22 18:20:36 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-05-22 17:39:10 -0700 |
| commit | f74ce27642a22594bb81c14b3a1ef441f3702f65 (patch) | |
| tree | ac8777eb5fe90503db92758853286e3469399eaa | |
| parent | f677cabe3f9ecfe2c3e42c2ac736726c47031312 (diff) | |
| download | meta-openembedded-f74ce27642a22594bb81c14b3a1ef441f3702f65.tar.gz | |
fix broken symlink in dracut config examples
Due to commit [1], it installs dracut config examples under /usr.
But while enable_test=no, the symlink of test in dracut config is broken
...
root@qemux86-64:~# ls /usr/lib/dracut/dracut.conf.d/test* -ahl
lrwxrwxrwx 1 root root 27 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test -> ../test/dracut.conf.d/test/
lrwxrwxrwx 1 root root 36 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test-makeroot -> ../test/dracut.conf.d/test-makeroot/
lrwxrwxrwx 1 root root 31 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test-root -> ../test/dracut.conf.d/test-root
root@qemux86-64:~# realpath /usr/lib/dracut/dracut.conf.d/test*
realpath: /usr/lib/dracut/dracut.conf.d/test: No such file or directory
realpath: /usr/lib/dracut/dracut.conf.d/test-makeroot: No such file or directory
realpath: /usr/lib/dracut/dracut.conf.d/test-root: No such file or directory
...
This commit cleans up test symlink if enable_test=no
[1] https://github.com/dracut-ng/dracut-ng/commit/0d369e3e30935dffe48dfff1e90463868e7f804a
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-initramfs/recipes-devtools/dracut/dracut/0001-fix-broken-symlink-in-dracut-config-examples.patch | 44 | ||||
| -rw-r--r-- | meta-initramfs/recipes-devtools/dracut/dracut_106.bb | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-fix-broken-symlink-in-dracut-config-examples.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-fix-broken-symlink-in-dracut-config-examples.patch new file mode 100644 index 0000000000..7d0b65a161 --- /dev/null +++ b/meta-initramfs/recipes-devtools/dracut/dracut/0001-fix-broken-symlink-in-dracut-config-examples.patch | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | From 8871c593973d9abfef45408575e5da887830f42e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Thu, 22 May 2025 18:07:27 +0800 | ||
| 4 | Subject: [PATCH] fix broken symlink in dracut config examples | ||
| 5 | |||
| 6 | Due to commit [1], it installs dracut config examples under /usr. | ||
| 7 | But while enable_test=no, the symlink of test in dracut config is broken | ||
| 8 | ... | ||
| 9 | root@qemux86-64:~# ls /usr/lib/dracut/dracut.conf.d/test* -ahl | ||
| 10 | lrwxrwxrwx 1 root root 27 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test -> ../test/dracut.conf.d/test/ | ||
| 11 | lrwxrwxrwx 1 root root 36 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test-makeroot -> ../test/dracut.conf.d/test-makeroot/ | ||
| 12 | lrwxrwxrwx 1 root root 31 Apr 5 2011 /usr/lib/dracut/dracut.conf.d/test-root -> ../test/dracut.conf.d/test-root | ||
| 13 | root@qemux86-64:~# realpath /usr/lib/dracut/dracut.conf.d/test* | ||
| 14 | realpath: /usr/lib/dracut/dracut.conf.d/test: No such file or directory | ||
| 15 | realpath: /usr/lib/dracut/dracut.conf.d/test-makeroot: No such file or directory | ||
| 16 | realpath: /usr/lib/dracut/dracut.conf.d/test-root: No such file or directory | ||
| 17 | ... | ||
| 18 | |||
| 19 | This commit cleans up test symlink if enable_test=no | ||
| 20 | |||
| 21 | [1] https://github.com/dracut-ng/dracut-ng/commit/0d369e3e30935dffe48dfff1e90463868e7f804a | ||
| 22 | |||
| 23 | Upstream-Status: Submitted [https://github.com/dracut-ng/dracut-ng/pull/1344] | ||
| 24 | |||
| 25 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 26 | --- | ||
| 27 | Makefile | 1 + | ||
| 28 | 1 file changed, 1 insertion(+) | ||
| 29 | |||
| 30 | diff --git a/Makefile b/Makefile | ||
| 31 | index d33aebbc..151d9f79 100644 | ||
| 32 | --- a/Makefile | ||
| 33 | +++ b/Makefile | ||
| 34 | @@ -180,6 +180,7 @@ ifneq ($(enable_test),no) | ||
| 35 | cp -arx test $(DESTDIR)$(pkglibdir) | ||
| 36 | else | ||
| 37 | rm -rf $(DESTDIR)$(pkglibdir)/modules.d/80test* | ||
| 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 | -- | ||
| 43 | 2.34.1 | ||
| 44 | |||
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_106.bb b/meta-initramfs/recipes-devtools/dracut/dracut_106.bb index b474514713..b70ee4baeb 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_106.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_106.bb | |||
| @@ -10,6 +10,7 @@ PE = "1" | |||
| 10 | SRCREV = "956c08774074ddc45b2f975e13d5c13d1fc36eff" | 10 | SRCREV = "956c08774074ddc45b2f975e13d5c13d1fc36eff" |
| 11 | SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ | 11 | SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ |
| 12 | file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ | 12 | file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ |
| 13 | file://0001-fix-broken-symlink-in-dracut-config-examples.patch \ | ||
| 13 | " | 14 | " |
| 14 | 15 | ||
| 15 | DEPENDS += "kmod" | 16 | DEPENDS += "kmod" |
