From 6370feda0dd633d05d3de6fd862a7a68899eff0d Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 18 Feb 2017 03:10:11 +0100 Subject: 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 Signed-off-by: Martin Jansa --- meta-oe/recipes-support/lvm2/lvm2.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-support/lvm2') 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" -- cgit 1.2.3-korg