diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 6 |
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" |
39 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" | 39 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" |
40 | PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" | 40 | PACKAGES =+ "${@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" | |||
112 | FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" | 112 | FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" |
113 | FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" | 113 | FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" |
114 | 114 | ||
115 | FILES_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 |
116 | FILES_util-linux-blkid = "${base_sbindir}/blkid*" | 118 | FILES_util-linux-blkid = "${base_sbindir}/blkid*" |
117 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" | 119 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" |
@@ -126,7 +128,7 @@ RDEPENDS_util-linux-su += "libpam" | |||
126 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk" | 128 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk" |
127 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" | 129 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" |
128 | 130 | ||
129 | RRECOMMENDS_${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" | 131 | RRECOMMENDS_${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 | ||
131 | RRECOMMENDS_${PN}_class-native = "" | 133 | RRECOMMENDS_${PN}_class-native = "" |
132 | RRECOMMENDS_${PN}_class-nativesdk = "" | 134 | RRECOMMENDS_${PN}_class-nativesdk = "" |