diff options
author | Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | 2015-12-23 12:21:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 23:26:31 +0000 |
commit | c4a3258c2c9c81ebacf6dc99a93b91415d78f0b9 (patch) | |
tree | 97cd64f3ade535c4926fdfdc8f77657b9a40f81d /meta | |
parent | 554ca68e019633ef1145749b579147de6d5b3125 (diff) | |
download | poky-c4a3258c2c9c81ebacf6dc99a93b91415d78f0b9.tar.gz |
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.
(From OE-Core rev: 35a86d15ed09d64cb999d35db13a2023bcaa51cc)
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 7 |
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 | |||
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 \ | 32 | util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-runuser \ |
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" |
@@ -87,6 +87,7 @@ FILES_util-linux-partx = "${sbindir}/partx" | |||
87 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" | 87 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" |
88 | FILES_util-linux-findfs = "${sbindir}/findfs" | 88 | FILES_util-linux-findfs = "${sbindir}/findfs" |
89 | FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" | 89 | FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" |
90 | FILES_util-linux-runuser = "${sbindir}/runuser" | ||
90 | 91 | ||
91 | FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \ | 92 | FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \ |
92 | ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*" | 93 | ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*" |
@@ -108,7 +109,11 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid" | |||
108 | # reset calls 'tput' | 109 | # reset calls 'tput' |
109 | RDEPENDS_util-linux-reset += "ncurses" | 110 | RDEPENDS_util-linux-reset += "ncurses" |
110 | 111 | ||
112 | RDEPENDS_util-linux-runuser += "libpam" | ||
113 | |||
111 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin" | 114 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin" |
115 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" | ||
116 | |||
112 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs " | 117 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs " |
113 | 118 | ||
114 | RRECOMMENDS_${PN}_class-native = "" | 119 | RRECOMMENDS_${PN}_class-native = "" |