diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 24 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.31.bb (renamed from meta/recipes-core/util-linux/util-linux_2.30.bb) | 6 |
2 files changed, 13 insertions, 17 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index f0ffd255ff..03970e95c9 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -31,7 +31,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
31 | util-linux-swaponoff util-linux-losetup util-linux-umount \ | 31 | util-linux-swaponoff util-linux-losetup util-linux-umount \ |
32 | util-linux-mount util-linux-readprofile util-linux-uuidd \ | 32 | util-linux-mount util-linux-readprofile util-linux-uuidd \ |
33 | util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \ | 33 | util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \ |
34 | util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-reset \ | 34 | util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-rfkill \ |
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 \ |
@@ -44,7 +44,7 @@ PACKAGES_DYNAMIC = "^util-linux-lib.*" | |||
44 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ | 44 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ |
45 | --disable-makeinstall-chown \ | 45 | --disable-makeinstall-chown \ |
46 | --enable-kill --enable-last --enable-mesg --enable-partx \ | 46 | --enable-kill --enable-last --enable-mesg --enable-partx \ |
47 | --enable-raw --enable-reset --disable-login \ | 47 | --enable-raw --enable-rfkill --disable-login \ |
48 | --disable-vipw --disable-newgrp --disable-chfn-chsh \ | 48 | --disable-vipw --disable-newgrp --disable-chfn-chsh \ |
49 | --enable-write --enable-mount \ | 49 | --enable-write --enable-mount \ |
50 | --enable-libuuid --enable-libblkid --enable-fsck \ | 50 | --enable-libuuid --enable-libblkid --enable-fsck \ |
@@ -86,7 +86,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" | |||
86 | FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" | 86 | FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" |
87 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" | 87 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" |
88 | FILES_util-linux-uuidd = "${sbindir}/uuidd" | 88 | FILES_util-linux-uuidd = "${sbindir}/uuidd" |
89 | FILES_util-linux-reset = "${base_bindir}/reset*" | 89 | FILES_util-linux-rfkill = "${base_bindir}/rfkill*" |
90 | FILES_util-linux-partx = "${sbindir}/partx" | 90 | FILES_util-linux-partx = "${sbindir}/partx" |
91 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" | 91 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" |
92 | FILES_util-linux-findfs = "${sbindir}/findfs" | 92 | FILES_util-linux-findfs = "${sbindir}/findfs" |
@@ -119,9 +119,6 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid*" | |||
119 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" | 119 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" |
120 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" | 120 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" |
121 | 121 | ||
122 | # reset calls 'tput' | ||
123 | RDEPENDS_util-linux-reset += "ncurses" | ||
124 | |||
125 | RDEPENDS_util-linux-runuser += "libpam" | 122 | RDEPENDS_util-linux-runuser += "libpam" |
126 | RDEPENDS_util-linux-su += "libpam" | 123 | RDEPENDS_util-linux-su += "libpam" |
127 | 124 | ||
@@ -160,7 +157,7 @@ do_install () { | |||
160 | 157 | ||
161 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" | 158 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" |
162 | sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" | 159 | sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" |
163 | binprogs_a="dmesg getopt kill more umount mount login reset su mountpoint" | 160 | binprogs_a="dmesg getopt kill more umount mount login rfkill su mountpoint" |
164 | 161 | ||
165 | if [ "${base_sbindir}" != "${sbindir}" ]; then | 162 | if [ "${base_sbindir}" != "${sbindir}" ]; then |
166 | mkdir -p ${D}${base_sbindir} | 163 | mkdir -p ${D}${base_sbindir} |
@@ -198,9 +195,8 @@ do_install () { | |||
198 | fi | 195 | fi |
199 | } | 196 | } |
200 | 197 | ||
201 | # reset and nologin causes a conflict with ncurses-native and shadow-native | 198 | # nologin causes a conflict with shadow-native |
202 | do_install_append_class-native () { | 199 | do_install_append_class-native () { |
203 | rm -f ${D}${base_bindir}/reset | ||
204 | rm -f ${D}${base_sbindir}/nologin | 200 | rm -f ${D}${base_sbindir}/nologin |
205 | } | 201 | } |
206 | 202 | ||
@@ -220,14 +216,14 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" | |||
220 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" | 216 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" |
221 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" | 217 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" |
222 | 218 | ||
223 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" | 219 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" |
224 | 220 | ||
225 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" | 221 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" |
226 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" | 222 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" |
227 | ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" | 223 | ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" |
228 | ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" | 224 | ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" |
229 | ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" | 225 | ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" |
230 | ALTERNATIVE_LINK_NAME[reset.1] = "${mandir}/man1/reset.1" | 226 | ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" |
231 | ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" | 227 | ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" |
232 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" | 228 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" |
233 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" | 229 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" |
@@ -272,9 +268,9 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" | |||
272 | ALTERNATIVE_util-linux-blkid = "blkid" | 268 | ALTERNATIVE_util-linux-blkid = "blkid" |
273 | ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" | 269 | ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" |
274 | 270 | ||
275 | ALTERNATIVE_util-linux-reset = "reset" | 271 | ALTERNATIVE_util-linux-rfkill = "rfkill" |
276 | ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" | 272 | ALTERNATIVE_LINK_NAME[rfkill] = "${bindir}/rfkill" |
277 | ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" | 273 | ALTERNATIVE_TARGET[rfkill] = "${base_bindir}/rfkill" |
278 | 274 | ||
279 | ALTERNATIVE_util-linux-getopt = "getopt" | 275 | ALTERNATIVE_util-linux-getopt = "getopt" |
280 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | 276 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" |
diff --git a/meta/recipes-core/util-linux/util-linux_2.30.bb b/meta/recipes-core/util-linux/util-linux_2.31.bb index 39449d9ac9..a83919b5ac 100644 --- a/meta/recipes-core/util-linux/util-linux_2.30.bb +++ b/meta/recipes-core/util-linux/util-linux_2.31.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | MAJOR_VERSION = "2.30" | 1 | MAJOR_VERSION = "2.31" |
2 | require util-linux.inc | 2 | require util-linux.inc |
3 | 3 | ||
4 | # To support older hosts, we need to patch and/or revert | 4 | # To support older hosts, we need to patch and/or revert |
@@ -16,8 +16,8 @@ SRC_URI += "file://configure-sbindir.patch \ | |||
16 | file://avoid_parallel_tests.patch \ | 16 | file://avoid_parallel_tests.patch \ |
17 | " | 17 | " |
18 | SRC_URI_append_class-native = " file://no_getrandom.patch" | 18 | SRC_URI_append_class-native = " file://no_getrandom.patch" |
19 | SRC_URI[md5sum] = "eaa3429150268027908a1b8ae6ee9a62" | 19 | SRC_URI[md5sum] = "5b6821c403c3cc6e7775f74df1882a20" |
20 | SRC_URI[sha256sum] = "c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d" | 20 | SRC_URI[sha256sum] = "f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a" |
21 | 21 | ||
22 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" | 22 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" |
23 | 23 | ||