diff mbox series

[1/1] dracut: upgrade 109 -> 110

Message ID 20260414113636.3754157-1-adam.duskett@amarulasolutions.com
State Under Review
Headers show
Series [1/1] dracut: upgrade 109 -> 110 | expand

Commit Message

Adam Duskett April 14, 2026, 11:36 a.m. UTC 
Drop upstream 0002-fix-broken-symlink-in-dracut-config-examples.patch

Changelog: https://github.com/dracut-ng/dracut-ng/releases/tag/110
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 ...en-symlink-in-dracut-config-examples.patch | 44 -------------------
 .../dracut/{dracut_109.bb => dracut_110.bb}   |  6 +--
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0002-fix-broken-symlink-in-dracut-config-examples.patch
 rename meta-initramfs/recipes-devtools/dracut/{dracut_109.bb => dracut_110.bb} (95%)
diff mbox series

Patch

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 @@ 
-From e01991f1d55d4d1327793790bad3724b89952704 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Thu, 22 May 2025 18:07:27 +0800
-Subject: [PATCH 2/2] 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
-
-Upstream-Status: Submitted [https://github.com/dracut-ng/dracut-ng/pull/1344]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index 3a40594b..df7956ab 100644
---- a/Makefile
-+++ b/Makefile
-@@ -218,6 +218,7 @@ ifeq ($(enable_test),yes)
- 	done
- else
- 	rm -rf $(DESTDIR)$(pkglibdir)/modules.d/70test*
-+	rm -rf $(DESTDIR)$(pkglibdir)/dracut.conf.d/test*
- endif
- ifneq ($(enable_documentation),no)
- 	for i in $(man1pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man1/$${i##*/}; done
--- 
-2.47.3
-
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_109.bb b/meta-initramfs/recipes-devtools/dracut/dracut_110.bb
similarity index 95%
rename from meta-initramfs/recipes-devtools/dracut/dracut_109.bb
rename to 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"
 
 PE = "1"
 
-SRCREV = "13c5e5feee9ba86b960d351f87aa0eb25f242ff0"
-SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main;tag=${PV} \
-           file://0002-fix-broken-symlink-in-dracut-config-examples.patch \
-           "
+SRCREV = "25bf13842a5c55f4a5ab1523e005b3b11b9ac38e"
+SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main;tag=${PV}"
 
 DEPENDS += "kmod"
 DEPENDS:append:libc-musl = " fts"