summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2015-12-23 12:21:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-11 23:23:17 +0000
commit35a86d15ed09d64cb999d35db13a2023bcaa51cc (patch)
treee376617a6ad3360702cd2fda63af452ea6b3aa58
parent04beae24db3cbea6d5ec8f2b181d312d625d7c37 (diff)
downloadopenembedded-core-contrib-35a86d15ed09d64cb999d35db13a2023bcaa51cc.tar.gz
openembedded-core-contrib-35a86d15ed09d64cb999d35db13a2023bcaa51cc.tar.bz2
openembedded-core-contrib-35a86d15ed09d64cb999d35db13a2023bcaa51cc.zip
util-linux: create util-linux-runuser package
Split runuser into its own package (previously provided by util-linux). runuser is compiled only when DISTRO_FEATURES includes pam and also the package is created only when runuser exists. Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index fb384e11bc..7ef7a5485b 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,7 +29,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-swaponoff util-linux-losetup util-linux-umount \
util-linux-mount util-linux-readprofile util-linux-uuidd \
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
- util-linux-mkfs util-linux-mcookie util-linux-reset \
+ util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-runuser \
util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
util-linux-partx ${PN}-bash-completion util-linux-hwclock \
util-linux-findfs util-linux-getopt util-linux-sulogin"
@@ -87,6 +87,7 @@ FILES_util-linux-partx = "${sbindir}/partx"
FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
FILES_util-linux-findfs = "${sbindir}/findfs"
FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
+FILES_util-linux-runuser = "${sbindir}/runuser"
FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \
${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*"
@@ -108,7 +109,11 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
# reset calls 'tput'
RDEPENDS_util-linux-reset += "ncurses"
+RDEPENDS_util-linux-runuser += "libpam"
+
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin"
+RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
+
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
RRECOMMENDS_${PN}_class-native = ""