[oe-commits] Roy Li : lvm2: install initscript or systemd unit service conditionally
git at git.openembedded.org
git at git.openembedded.org
Thu Sep 17 15:04:56 UTC 2015
Module: meta-openembedded.git
Branch: master-next
Commit: ece0f669869259f52656ac6c68b091e5c0505383
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ece0f669869259f52656ac6c68b091e5c0505383
Author: Roy Li <rongqing.li at windriver.com>
Date: Mon Sep 14 16:31:15 2015 +0800
lvm2: install initscript or systemd unit service conditionally
Issue: LIN8-854
install systemd unit files and modify them only when DISTRO_FEATURE
systemd is enabled, otherwise do_install failed due to no
blk-availability.service file
sed: can't read tmp/work/armv5e-wrs-linux-gnueabi/lvm2/2.02.125-r0/image/lib/systemd/system/blk-availability.service: No such file or directory
install the initscript when init is not systemd
Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-support/lvm2/lvm2.inc | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 2b2d8ed..cc70246 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -39,8 +39,14 @@ do_install_append() {
# Install machine specific configuration file
install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
- oe_runmake 'DESTDIR=${D}' install install_systemd_units
- sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_unitdir}/system/blk-availability.service
+ if ${@base_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_unitdir}/system/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
}
SYSTEMD_PACKAGES = "${PN}"
More information about the Openembedded-commits
mailing list