diff options
author | Andrei Kholodnyi <andrei.kholodnyi@gmail.com> | 2015-09-24 15:01:27 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-13 12:28:13 +0200 |
commit | 9461b4ca6d09f6e4296394d01a61aca823820e7a (patch) | |
tree | 68b4cf97db0fa76ccb8730d9f88ebd9f2cbec88a /meta-oe/recipes-support/lvm2 | |
parent | 38ed53fcde416c06f5b8e56c0b8405beb44b16cc (diff) | |
download | meta-openembedded-9461b4ca6d09f6e4296394d01a61aca823820e7a.tar.gz |
lvm2: add --with-systemdsystemunitdir in configuration
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>
Diffstat (limited to 'meta-oe/recipes-support/lvm2')
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index cc70246cf..cd7f6fdbb 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -27,6 +27,7 @@ EXTRA_OECONF = "--with-user= \ | |||
27 | --enable-lvmetad \ | 27 | --enable-lvmetad \ |
28 | --with-udev-prefix= \ | 28 | --with-udev-prefix= \ |
29 | --with-usrlibdir=${libdir} \ | 29 | --with-usrlibdir=${libdir} \ |
30 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ | ||
30 | " | 31 | " |
31 | 32 | ||
32 | PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | 33 | PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" |
@@ -41,7 +42,7 @@ do_install_append() { | |||
41 | sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf | 42 | sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf |
42 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 43 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
43 | oe_runmake 'DESTDIR=${D}' install install_systemd_units | 44 | oe_runmake 'DESTDIR=${D}' install install_systemd_units |
44 | sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_unitdir}/system/blk-availability.service | 45 | sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service |
45 | else | 46 | else |
46 | oe_runmake 'DESTDIR=${D}' install install_initscripts | 47 | oe_runmake 'DESTDIR=${D}' install install_initscripts |
47 | mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d | 48 | mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d |