diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-05-09 07:51:48 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-11 07:49:38 +0100 |
commit | 8d9d88d662de6f4815eb1cc654dd6d59c51dd7e4 (patch) | |
tree | aa5f1f832d64dd11048e6ae46133a9f092cfbcf1 /meta/recipes-core/util-linux/util-linux.inc | |
parent | 6dee5da9db7721adb02283e118d779ffa567f439 (diff) | |
download | poky-8d9d88d662de6f4815eb1cc654dd6d59c51dd7e4.tar.gz |
util-linux: update to 2.32
rfkill moved locations, update accordingly
refactored avoid_parallel_tests.patch
includes security fix:
CVE-2018-7738 (score: 7.2)
affects: < 2.32-rc1
see changelog for other bugfixes:
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.32/v2.32-ChangeLog
(From OE-Core rev: a7a1e3155287d3bac7ab83e58d53ee2a364f2e29)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux.inc')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 157416df48..0b7db529fd 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -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-rfkill = "${base_bindir}/rfkill*" | 89 | FILES_util-linux-rfkill = "${sbindir}/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" |
@@ -157,7 +157,7 @@ do_install () { | |||
157 | 157 | ||
158 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" | 158 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" |
159 | 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" |
160 | binprogs_a="dmesg getopt kill more umount mount login rfkill su mountpoint" | 160 | binprogs_a="dmesg getopt kill more umount mount login su mountpoint" |
161 | 161 | ||
162 | if [ "${base_sbindir}" != "${sbindir}" ]; then | 162 | if [ "${base_sbindir}" != "${sbindir}" ]; then |
163 | mkdir -p ${D}${base_sbindir} | 163 | mkdir -p ${D}${base_sbindir} |
@@ -272,7 +272,6 @@ ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" | |||
272 | 272 | ||
273 | ALTERNATIVE_util-linux-rfkill = "rfkill" | 273 | ALTERNATIVE_util-linux-rfkill = "rfkill" |
274 | ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" | 274 | ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" |
275 | ALTERNATIVE_TARGET[rfkill] = "${base_bindir}/rfkill" | ||
276 | 275 | ||
277 | ALTERNATIVE_util-linux-getopt = "getopt" | 276 | ALTERNATIVE_util-linux-getopt = "getopt" |
278 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | 277 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" |