aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-02-18 03:10:11 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-02-22 13:16:47 +0100
commit6370feda0dd633d05d3de6fd862a7a68899eff0d (patch)
tree51a3e9587e4c0126e75c690c5b2fd3fea64a4094 /meta-oe
parent402ee2143c7157f50d9644275aaaa18e1e663a3f (diff)
downloadmeta-openembedded-6370feda0dd633d05d3de6fd862a7a68899eff0d.tar.gz
lvm2: Move bash scripts to a separate package
By putting the bash scripts in a separate package (lvm2-scripts), the lvm2 package no longer needs to depend on bash. For backwards compatibility, the lvm2 package recommends the lvm2-scripts package. Also remove the adding of ${libdir}/device-mapper/.debug to FILES_${PN}-dbg as it has not been needed since Krogoth. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 438ea7b606..1462841a29 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -73,6 +73,8 @@ do_install_append() {
fi
}
+PACKAGE_BEFORE_PN = "${PN}-scripts"
+
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'lvmetad', 'lvm2-lvmetad.socket lvm2-pvscan@.service', '', d)} \
@@ -82,8 +84,14 @@ SYSTEMD_AUTO_ENABLE = "disable"
TARGET_CC_ARCH += "${LDFLAGS}"
FILES_${PN} += "${libdir}/device-mapper/*.so ${base_libdir}/udev"
-FILES_${PN}-dbg += "${libdir}/device-mapper/.debug"
+FILES_${PN}-scripts = " \
+ ${sbindir}/blkdeactivate \
+ ${sbindir}/fsadm \
+ ${sbindir}/lvmconf \
+ ${sbindir}/lvmdump \
+"
-RDEPENDS_${PN} = "bash"
+RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) bash"
+RRECOMMENDS_${PN} = "${PN}-scripts (= ${EXTENDPKGV})"
CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf"