Return-Path: Received: from bastet.se.axis.com (bastet.se.axis.com [195.60.68.11]) by mail.openembedded.org (Postfix) with ESMTP id 26F867734D for ; Sat, 18 Feb 2017 02:19:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id 3FB981820C for ; Sat, 18 Feb 2017 03:10:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id 4QPg7-dRNTJk for ; Sat, 18 Feb 2017 03:10:13 +0100 (CET) Received: from boulder03.se.axis.com (boulder03.se.axis.com [10.0.8.17]) by bastet.se.axis.com (Postfix) with ESMTPS id F15771843F for ; Sat, 18 Feb 2017 03:10:12 +0100 (CET) Received: from boulder03.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DF4F61E079 for ; Sat, 18 Feb 2017 03:10:12 +0100 (CET) Received: from boulder03.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D1EA91E077 for ; Sat, 18 Feb 2017 03:10:12 +0100 (CET) Received: from thoth.se.axis.com (unknown [10.0.2.173]) by boulder03.se.axis.com (Postfix) with ESMTP for ; Sat, 18 Feb 2017 03:10:12 +0100 (CET) Received: from saur-2.se.axis.com (saur-2.se.axis.com [10.92.3.2]) by thoth.se.axis.com (Postfix) with ESMTP id C551D770 for ; Sat, 18 Feb 2017 03:10:12 +0100 (CET) Received: from saur-2.se.axis.com (localhost [127.0.0.1]) by saur-2.se.axis.com (8.14.5/8.14.5) with ESMTP id v1I2ACwO032054 for ; Sat, 18 Feb 2017 03:10:12 +0100 Received: (from pkj@localhost) by saur-2.se.axis.com (8.14.5/8.14.5/Submit) id v1I2ACZQ032053 for openembedded-devel@lists.openembedded.org; Sat, 18 Feb 2017 03:10:12 +0100 From: Peter Kjellerstedt To: openembedded-devel@lists.openembedded.org Date: Sat, 18 Feb 2017 03:10:11 +0100 Message-Id: <20170218021012.31978-7-pkj@axis.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170218021012.31978-1-pkj@axis.com> References: <20170218021012.31978-1-pkj@axis.com> X-TM-AS-GCONF: 00 Subject: [meta-oe][PATCH 7/8] lvm2: Move bash scripts to a separate package X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Feb 2017 02:19:12 -0000 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 --- meta-oe/recipes-support/lvm2/lvm2.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 438ea7b..1462841 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" -- 2.9.0