summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2016-08-04 15:28:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:31 +0100
commit416c4bc00973f585b18262f62dbb1aee188dbee9 (patch)
tree8a45c5328a05fb09dffa31344f16c0c86daa6286 /meta/recipes-core
parent07d9c3a41dc523ffc4146a92119c30f7cba0754d (diff)
downloadpoky-416c4bc00973f585b18262f62dbb1aee188dbee9.tar.gz
util-linux: make prlimit a separate package
Busybox doesn't provide a similar tool so having it in a separate package allows to us it in addition to busybox without having to include all of util-linux. Before it was part of the top level util-linux package. Now it is a separate package util-linux-prlimit but the top level package still RRECOMMENDS it so for most users nothing should change. (From OE-Core rev: e364ecc1216b04f2b61a88a623d2e9b5199af261) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> 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.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index bac1a37f0a..52362091df 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -32,7 +32,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
32 util-linux-mkfs util-linux-mcookie util-linux-reset \ 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 util-linux-hwclock util-linux-mountpoint \ 34 util-linux-partx util-linux-hwclock util-linux-mountpoint \
35 util-linux-findfs util-linux-getopt util-linux-sulogin" 35 util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit"
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)}" 37PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
38 38
@@ -88,6 +88,7 @@ FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
88FILES_util-linux-findfs = "${sbindir}/findfs" 88FILES_util-linux-findfs = "${sbindir}/findfs"
89FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" 89FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
90FILES_util-linux-runuser = "${sbindir}/runuser" 90FILES_util-linux-runuser = "${sbindir}/runuser"
91FILES_util-linux-prlimit = "${bindir}/prlimit"
91 92
92FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ 93FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \
93 ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ 94 ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \
@@ -116,7 +117,7 @@ RDEPENDS_util-linux-runuser += "libpam"
116RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin" 117RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin"
117RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" 118RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
118 119
119RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint" 120RRECOMMENDS_${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"
120 121
121RRECOMMENDS_${PN}_class-native = "" 122RRECOMMENDS_${PN}_class-native = ""
122RRECOMMENDS_${PN}_class-nativesdk = "" 123RRECOMMENDS_${PN}_class-nativesdk = ""