summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2016-01-12 11:23:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 11:54:51 +0000
commit764c9279eaebe2774ec344f722dfec9911b45691 (patch)
tree9222399aa58968b3fec30323fab7f9a05035a11b
parent95dce70489e658569bf144f7472bc1392b75b526 (diff)
downloadpoky-764c9279eaebe2774ec344f722dfec9911b45691.tar.gz
util-linux: create util-linux-runuser iff pam in DISTRO_FEATURES
If pam is not present in DISTRO_FEATURES, then exclude util-linux-runuser from PACKAGES to avoid its libpam dependency. (From OE-Core rev: 9ba9807fc7c19938022c37641b171464699fc742) Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 7ef7a5485b..e7e32e8366 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,11 +29,12 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
29 util-linux-swaponoff util-linux-losetup util-linux-umount \ 29 util-linux-swaponoff util-linux-losetup util-linux-umount \
30 util-linux-mount util-linux-readprofile util-linux-uuidd \ 30 util-linux-mount util-linux-readprofile util-linux-uuidd \
31 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 31 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
32 util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-runuser \ 32 util-linux-mkfs util-linux-mcookie util-linux-reset \
33 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ 33 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
34 util-linux-partx ${PN}-bash-completion util-linux-hwclock \ 34 util-linux-partx ${PN}-bash-completion util-linux-hwclock \
35 util-linux-findfs util-linux-getopt util-linux-sulogin" 35 util-linux-findfs util-linux-getopt util-linux-sulogin"
36PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" 36PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"
37PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
37 38
38PACKAGES_DYNAMIC = "^util-linux-lib.*" 39PACKAGES_DYNAMIC = "^util-linux-lib.*"
39 40