From 8739e7ae8ff5df6d0559aeacbfbf2e101066a3b1 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 17 Nov 2021 12:07:46 +0000 Subject: lvm2: do not install systemd units/initscripts when building native SDK tools Nothing picks them up, so the build fails. Required to be able to build native tools like systemd-analyze. Signed-off-by: Luca Boccassi Signed-off-by: Khem Raj (cherry picked from commit defbcad66fc1e91117ba08bf1051035188e40b37) Signed-off-by: Armin Kuster --- meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb index 3988d54910..a729324c9b 100644 --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb @@ -17,13 +17,16 @@ do_install:append() { install -d ${D}${sysconfdir}/lvm install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - oe_runmake 'DESTDIR=${D}' install install_systemd_units - sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service - else - oe_runmake 'DESTDIR=${D}' install install_initscripts - mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d - rm -rf ${D}${sysconfdir}/rc.d + # We don't want init scripts/systemd units for native SDK utilities + if [ "${PN}" != "nativesdk-lvm2" ]; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + oe_runmake 'DESTDIR=${D}' install install_systemd_units + sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service + else + oe_runmake 'DESTDIR=${D}' install install_initscripts + mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d + rm -rf ${D}${sysconfdir}/rc.d + fi fi } -- cgit v1.2