summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 2d17fa2f8c..80065e3a83 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 ${PN}-bash-completion util-linux-hwclock \ 34 util-linux-partx ${PN}-bash-completion util-linux-hwclock \
35 util-linux-findfs util-linux-getopt" 35 util-linux-findfs util-linux-getopt util-linux-sulogin"
36PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" 36PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"
37 37
38PACKAGES_DYNAMIC = "^util-linux-lib.*" 38PACKAGES_DYNAMIC = "^util-linux-lib.*"
@@ -96,6 +96,8 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs"
96FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" 96FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs"
97FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" 97FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs"
98 98
99FILES_util-linux-sulogin = "${base_sbindir}/sulogin*"
100
99# Util-linux' blkid replaces the e2fsprogs one 101# Util-linux' blkid replaces the e2fsprogs one
100FILES_util-linux-blkid = "${base_sbindir}/blkid*" 102FILES_util-linux-blkid = "${base_sbindir}/blkid*"
101RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" 103RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
@@ -104,7 +106,7 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
104# reset calls 'tput' 106# reset calls 'tput'
105RDEPENDS_util-linux-reset += "ncurses" 107RDEPENDS_util-linux-reset += "ncurses"
106 108
107RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" 109RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin"
108RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs " 110RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
109 111
110RRECOMMENDS_${PN}_class-native = "" 112RRECOMMENDS_${PN}_class-native = ""
@@ -173,7 +175,7 @@ ALTERNATIVE_PRIORITY = "100"
173 175
174ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" 176ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
175ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" 177ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
176ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject sulogin" 178ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject"
177 179
178ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 180ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
179ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 181ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -184,7 +186,6 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
184ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" 186ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
185ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" 187ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
186ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 188ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
187ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
188 189
189ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1" 190ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1"
190 191
@@ -241,6 +242,9 @@ ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
241ALTERNATIVE_util-linux-getopt = "getopt" 242ALTERNATIVE_util-linux-getopt = "getopt"
242ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" 243ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
243 244
245ALTERNATIVE_util-linux-sulogin = "sulogin"
246ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
247
244BBCLASSEXTEND = "native nativesdk" 248BBCLASSEXTEND = "native nativesdk"
245 249
246python do_package_prepend () { 250python do_package_prepend () {