diff mbox series

bootchart2: Handle bindir == sbindir

Message ID f1724665f0d2a09e5f6d94796d8581a03b4f814e.1785239008.git.joerg.sommer@navimatix.de
State Under Review
Headers show
Series bootchart2: Handle bindir == sbindir | expand

Commit Message

Jörg Sommer July 28, 2026, 11:43 a.m. UTC 
From: Jörg Sommer <joerg.sommer@navimatix.de>

The upcoming binmerge (driven by systemd) merges /usr/sbin into /usr/bin.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb | 7 +++++++
 1 file changed, 7 insertions(+)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
index 77fdd67302..c03bee4c1f 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
@@ -136,6 +136,13 @@  do_install () {
     install -d ${D}${sysconfdir}/init.d
     install -m 0755 ${UNPACKDIR}/bootchartd_stop.sh ${D}${sysconfdir}/init.d
 
+    if test "${bindir}" = "${sbindir}"
+    then
+        install -d ${D}${bindir}
+        mv ${D}${EARLY_PREFIX}/sbin/* ${D}${bindir}
+        rmdir ${D}${EARLY_PREFIX}/sbin
+    fi
+
     if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
         mv ${D}${EARLY_PREFIX}${sysconfdir}/bootchartd.conf ${D}${sysconfdir}/bootchartd.conf
         rmdir ${D}${EARLY_PREFIX}${sysconfdir}