summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-11-30 19:50:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:43:01 +0000
commit9b638629110f675c10af8c8c23df739139c05129 (patch)
treea294225e696bf9ec3d4dda66dcb80f2827554061 /meta/recipes-core
parent6476182c33760cb4e55b85853331a6aa916eb365 (diff)
downloadpoky-9b638629110f675c10af8c8c23df739139c05129.tar.gz
util-linux: create own package for lsblk
Let util-linux-bash-completion depend on it, because it uses it. (From OE-Core rev: 27efae1e0ba8fc6b08117b31c4cb35638afc37e4) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 21815fb1ec..7d948bfda6 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -30,7 +30,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
30 util-linux-swaponoff util-linux-losetup util-linux-umount \ 30 util-linux-swaponoff util-linux-losetup util-linux-umount \
31 util-linux-mount util-linux-readprofile util-linux-uuidd \ 31 util-linux-mount util-linux-readprofile util-linux-uuidd \
32 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 32 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
33 util-linux-mkfs util-linux-mcookie util-linux-reset \ 33 util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-lsblk \
34 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ 34 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
35 util-linux-partx util-linux-hwclock util-linux-mountpoint \ 35 util-linux-partx util-linux-hwclock util-linux-mountpoint \
36 util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit" 36 util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit"
@@ -95,6 +95,7 @@ FILES_util-linux-prlimit = "${bindir}/prlimit"
95FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ 95FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \
96 ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ 96 ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \
97 ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" 97 ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*"
98FILES_util-linux-lsblk = "${bindir}/lsblk"
98FILES_util-linux-lscpu = "${bindir}/lscpu" 99FILES_util-linux-lscpu = "${bindir}/lscpu"
99 100
100FILES_util-linux-fsck = "${base_sbindir}/fsck*" 101FILES_util-linux-fsck = "${base_sbindir}/fsck*"
@@ -116,7 +117,7 @@ RDEPENDS_util-linux-reset += "ncurses"
116 117
117RDEPENDS_util-linux-runuser += "libpam" 118RDEPENDS_util-linux-runuser += "libpam"
118 119
119RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin" 120RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk"
120RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" 121RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
121 122
122RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit" 123RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit"
@@ -285,6 +286,7 @@ python populate_packages_prepend() {
285 extra_depends='', prepend=True, allow_links=True) 286 extra_depends='', prepend=True, allow_links=True)
286} 287}
287 288
289RDEPENDS_${PN}-bash-completion += "util-linux-lsblk"
288RDEPENDS_${PN}-ptest = "bash grep coreutils" 290RDEPENDS_${PN}-ptest = "bash grep coreutils"
289 291
290do_compile_ptest() { 292do_compile_ptest() {