5 files changed, 70 insertions, 15 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 @@
+From 8871c593973d9abfef45408575e5da887830f42e 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] 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 d33aebbc..151d9f79 100644
+--- a/Makefile
++++ b/Makefile
+@@ -180,6 +180,7 @@ ifneq ($(enable_test),no)
+        cp -arx test $(DESTDIR)$(pkglibdir)
+ else
+        rm -rf $(DESTDIR)$(pkglibdir)/modules.d/80test*
++       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.34.1
+
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_102.bb b/meta-initramfs/recipes-devtools/dracut/dracut_106.bb
index 39ff265a31..d59b357dc1 100644
--- a/meta-initramfs/recipes-devtools/dracut/dracut_102.bb
+++ b/meta-initramfs/recipes-devtools/dracut/dracut_106.bb
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 PE = "1"
 
-SRCREV = "1a8ee6e00bbe017717a5ef9e9bcfefb3b88f629e"
+SRCREV = "956c08774074ddc45b2f975e13d5c13d1fc36eff"
 SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \
            file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \
+           file://0001-fix-broken-symlink-in-dracut-config-examples.patch \
            "
 
 DEPENDS += "kmod"
@@ -17,24 +18,23 @@ DEPENDS:append:libc-musl = " fts"
 
 inherit bash-completion pkgconfig
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF = "--prefix=${prefix} \
-                --libdir=${prefix}/lib \
+                --libdir=${nonarch_libdir} \
                 --datadir=${datadir} \
                 --sysconfdir=${sysconfdir} \
                 --sbindir=${sbindir} \
-                --disable-documentation \
                 --bindir=${bindir} \
                 --includedir=${includedir} \
                 --localstatedir=${localstatedir} \
+                --disable-documentation \
                "
 
 # RDEPEND on systemd optionally
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd"
 
-EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"'
+EXTRA_OEMAKE += 'libdir=${nonarch_libdir} LDLIBS="${LDLIBS}" enable_test=no DRACUT_FULL_VERSION=${PV}'
 
 CFLAGS:append = " -fPIC"
 LDLIBS:append:libc-musl = " -lfts"
@@ -47,22 +47,26 @@ do_install() {
     oe_runmake install DESTDIR=${D}
     # Its Makefile uses cp -arx to install modules.d, so fix the owner
     # to root:root
-    chown -R root:root ${D}/${prefix}/lib/dracut/modules.d
+    chown -R root:root ${D}/${nonarch_libdir}/dracut/modules.d \
+        ${D}/${nonarch_libdir}/dracut/dracut.conf.d
+
+    if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        rm -rf ${D}${nonarch_libdir}/systemd
+    fi
 }
 
-FILES:${PN} += "${prefix}/lib/kernel \
-                ${prefix}/lib/dracut \
+FILES:${PN} += "${nonarch_libdir}/kernel \
+                ${nonarch_libdir}/dracut \
                 ${systemd_unitdir} \
                "
-FILES:${PN}-dbg += "${prefix}/lib/dracut/.debug"
+FILES:${PN}-dbg += "${nonarch_libdir}/dracut/.debug"
 
 CONFFILES:${PN} += "${sysconfdir}/dracut.conf"
 
 RDEPENDS:${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd"
 
 # This could be optimized a bit, but let's avoid non-booting systems :)
-RRECOMMENDS:${PN} = " \
-                     kernel-modules \
+RRECOMMENDS:${PN} = "kernel-modules \
                      coreutils \
                     "
 
diff --git a/meta-initramfs/recipes-devtools/grubby/grubby_git.bb b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb
index ff673e21bb..60f68728e9 100644
--- a/meta-initramfs/recipes-devtools/grubby/grubby_git.bb
+++ b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
 DEPENDS = "popt util-linux rpm"
 DEPENDS:append:libc-musl = " libexecinfo argp-standalone"
 
-S = "${WORKDIR}/git"
 SRCREV = "c01b0d5bb182bde35b464d14996acf354a3ada2e"
 SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https;;branch=main \
            file://0001-rename-grub2-editenv-to-grub-editenv.patch \
@@ -24,12 +23,21 @@ SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https;;branch=main \
 
 RDEPENDS:${PN} += "dracut"
 
-inherit autotools-brokensep ptest
+inherit ptest
 
 EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' 'LIBS=${LIBS}'"
 
 LIBS:libc-musl = "-lexecinfo -largp"
 LIBS ?= ""
+
+do_compile() {
+        oe_runmake
+}
+
+do_install() {
+        oe_runmake DESTDIR=${D} install
+}
+
 do_install_ptest() {
     install -d ${D}${PTEST_PATH}
     cp -r ${S}/test ${S}/test.sh ${D}${PTEST_PATH}
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc
index 6093e19b7c..2af53b18e3 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc.inc
+++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc
@@ -29,7 +29,7 @@ ARMPATCHES:arm = " \
                  "
 SRC_URI[sha256sum] = "d673a294f742d59368222ff5c38462d81098c55063799de6fb8a7ba3d4af0436"
 
-S = "${WORKDIR}/klibc-${PV}"
+S = "${UNPACKDIR}/klibc-${PV}"
 
 OPTFLAGS = "${TUNE_CCARGS} -Os -fcommon"
 OPTFLAGS:append = " ${DEBUG_PREFIX_MAP}"
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb
index 43ddb82a00..461d75e625 100644
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
              file://0001-make-Add-compiler-includes-in-cflags.patch \
              "
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "--disable-tests --without-jffs --without-ubifs"