mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-31 01:10:08 +00:00
Code Issues Projects Releases Wiki Activity

lvm2: add --with-systemdsystemunitdir in configuration

Browse Source 
Otherwise sed command for blk-availability.service may fail.
It will look for the service file in a wrong location

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andrei Kholodnyi
2015-09-24 15:01:27 +02:00
committed by Martin Jansa
parent 38ed53fcde
commit 9461b4ca6d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/lvm2/lvm2.inc
+2 -1
View File
@@ -27,6 +27,7 @@ EXTRA_OECONF = "--with-user= \
--enable-lvmetad \ --enable-lvmetad \
--with-udev-prefix= \ --with-udev-prefix= \
--with-usrlibdir=${libdir} \ --with-usrlibdir=${libdir} \
--with-systemdsystemunitdir=${systemd_system_unitdir} \
" "
PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
@@ -41,7 +42,7 @@ do_install_append() {
sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
oe_runmake 'DESTDIR=${D}' install install_systemd_units 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 sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service
else else
oe_runmake 'DESTDIR=${D}' install install_initscripts oe_runmake 'DESTDIR=${D}' install install_initscripts
mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d