From 35a86d15ed09d64cb999d35db13a2023bcaa51cc Mon Sep 17 00:00:00 2001 From: Ioan-Adrian Ratiu Date: Wed, 23 Dec 2015 12:21:06 +0200 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-core/util-linux/util-linux.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 = "" -- cgit 1.2.3-korg