diff mbox series

atop: Fix binmerge

Message ID 0cfa4d49021a742fdf06215e9f1734908e3f6375.1775939729.git.joerg.sommer@navimatix.de
State Under Review
Headers show
Series atop: Fix binmerge | expand

Commit Message

Jörg Sommer April 11, 2026, 8:35 p.m. UTC 
From: Jörg Sommer <joerg.sommer@navimatix.de>

In case $sbindir = $bindir we have to pass this setting to make install and
later on explicitly cleanup the unwanted daemons.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 meta-oe/recipes-support/atop/atop_2.12.1.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/atop/atop_2.12.1.bb b/meta-oe/recipes-support/atop/atop_2.12.1.bb
index 4ca74edbaf..6b462a4d8f 100644
--- a/meta-oe/recipes-support/atop/atop_2.12.1.bb
+++ b/meta-oe/recipes-support/atop/atop_2.12.1.bb
@@ -37,7 +37,7 @@  do_compile() {
 do_install() {
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \
-            PMPATHD=${systemd_unitdir}/system-sleep install
+            PMPATHD=${systemd_unitdir}/system-sleep SBINPATH=${sbindir} install
         install -d ${D}${sysconfdir}/tmpfiles.d
         install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf
         rm -f ${D}${systemd_system_unitdir}/atopacct.service
@@ -53,7 +53,8 @@  do_install() {
     rmdir --ignore-fail-on-non-empty ${D}${localstatedir}
 
     # remove atopacct related files
-    rm -rf ${D}${sbindir} ${D}${mandir}/man8
+    rm -rf ${D}${sbindir}/atopacctd ${D}${mandir}/man8/atopacctd.8 \
+        ${D}${sbindir}/atopgpud ${D}${mandir}/man8/atopgpud.8
 }
 
 inherit systemd