summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Sommer <joerg.sommer@navimatix.de>2026-04-12 12:39:20 +0200
committerKhem Raj <khem.raj@oss.qualcomm.com>2026-04-12 16:42:05 -0700
commit174ab7dff169e909d58e21c2f5a1fecfe0afd21f (patch)
tree2a5ad88a8dd17e7ed5d608e7c15b0fa1e8c46464
parent22e23418d2508b8b89cd6fcc9d473236c992de56 (diff)
downloadmeta-openembedded-174ab7dff169e909d58e21c2f5a1fecfe0afd21f.tar.gz
atop: Fix binmerge
In case $sbindir = $bindir we have to pass this setting to make install. Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
-rw-r--r--meta-oe/recipes-support/atop/atop_2.12.1.bb2
1 files changed, 1 insertions, 1 deletions
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 92665fa464..d40b95ce6c 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() {
37do_install() { 37do_install() {
38 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 38 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
39 make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \ 39 make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \
40 PMPATHD=${systemd_unitdir}/system-sleep install 40 PMPATHD=${systemd_unitdir}/system-sleep SBINPATH=${sbindir} install
41 install -d ${D}${sysconfdir}/tmpfiles.d 41 install -d ${D}${sysconfdir}/tmpfiles.d
42 install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf 42 install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf
43 rm -f ${D}${systemd_system_unitdir}/atopacct.service 43 rm -f ${D}${systemd_system_unitdir}/atopacct.service