summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2017-09-18 15:22:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-21 09:24:24 +0100
commit6fa8db23740914a7918ac2760d239fcc00ae71b0 (patch)
treef2eb1e750c2518ddbb56cd281401e84d13205b9c
parent8b85be328c3c8bf9d5b6e62997e84e20dec6de1e (diff)
downloadpoky-6fa8db23740914a7918ac2760d239fcc00ae71b0.tar.gz
util-linux: package switch_root separately
Having only this utility is useful for tiny initramfs'es which don't need the whole util-linux package (and neither the busybox binary which is much bigger than switch_root) to do operations like decrypt a rootfs & switch to it in the init file. (From OE-Core rev: 027f1782dfd85b47f34a4a9c8b62a22f57fece7e) 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>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index ba5d320321..5c4694b1fd 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -35,7 +35,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
35 util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \ 35 util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \
36 util-linux-partx util-linux-hwclock util-linux-mountpoint \ 36 util-linux-partx util-linux-hwclock util-linux-mountpoint \
37 util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit \ 37 util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit \
38 util-linux-ionice" 38 util-linux-ionice util-linux-switch-root"
39PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" 39PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"
40PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" 40PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}"
41 41
@@ -112,6 +112,8 @@ FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs"
112FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" 112FILES_util-linux-sulogin = "${base_sbindir}/sulogin*"
113FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" 113FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}"
114 114
115FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}"
116
115# Util-linux' blkid replaces the e2fsprogs one 117# Util-linux' blkid replaces the e2fsprogs one
116FILES_util-linux-blkid = "${base_sbindir}/blkid*" 118FILES_util-linux-blkid = "${base_sbindir}/blkid*"
117RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" 119RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
@@ -126,7 +128,7 @@ RDEPENDS_util-linux-su += "libpam"
126RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk" 128RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk"
127RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" 129RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}"
128 130
129RRECOMMENDS_${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 util-linux-ionice" 131RRECOMMENDS_${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 util-linux-ionice util-linux-switch-root"
130 132
131RRECOMMENDS_${PN}_class-native = "" 133RRECOMMENDS_${PN}_class-native = ""
132RRECOMMENDS_${PN}_class-nativesdk = "" 134RRECOMMENDS_${PN}_class-nativesdk = ""