aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2021-11-17 12:07:46 +0000
committerArmin Kuster <akuster808@gmail.com>2021-12-08 20:50:52 -0800
commit8739e7ae8ff5df6d0559aeacbfbf2e101066a3b1 (patch)
treef08607119143f7b355e72613462d978be788a10e
parentf632403d1800363ac63a1ad5543278b82c659832 (diff)
downloadmeta-openembedded-contrib-8739e7ae8ff5df6d0559aeacbfbf2e101066a3b1.tar.gz
meta-openembedded-contrib-8739e7ae8ff5df6d0559aeacbfbf2e101066a3b1.tar.bz2
meta-openembedded-contrib-8739e7ae8ff5df6d0559aeacbfbf2e101066a3b1.zip
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 <luca.boccassi@microsoft.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit defbcad66fc1e91117ba08bf1051035188e40b37) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb17
1 files 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
}