summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2021-11-17 12:07:46 +0000
committerKhem Raj <raj.khem@gmail.com>2021-11-17 09:25:15 -0800
commitdefbcad66fc1e91117ba08bf1051035188e40b37 (patch)
tree075cfeeeebc4b7b531bef1bdbb06b18b6d0b9bca /meta-oe
parentccb01b99c35f16218cc14ff209289bb0a53fa1b4 (diff)
downloadmeta-openembedded-defbcad66fc1e91117ba08bf1051035188e40b37.tar.gz
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>
Diffstat (limited to 'meta-oe')
-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 3988d5491..a729324c9 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() {
17 install -d ${D}${sysconfdir}/lvm 17 install -d ${D}${sysconfdir}/lvm
18 install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf 18 install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
19 sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf 19 sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
20 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 20 # We don't want init scripts/systemd units for native SDK utilities
21 oe_runmake 'DESTDIR=${D}' install install_systemd_units 21 if [ "${PN}" != "nativesdk-lvm2" ]; then
22 sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service 22 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
23 else 23 oe_runmake 'DESTDIR=${D}' install install_systemd_units
24 oe_runmake 'DESTDIR=${D}' install install_initscripts 24 sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service
25 mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d 25 else
26 rm -rf ${D}${sysconfdir}/rc.d 26 oe_runmake 'DESTDIR=${D}' install install_initscripts
27 mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d
28 rm -rf ${D}${sysconfdir}/rc.d
29 fi
27 fi 30 fi
28} 31}
29 32