summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2018-09-26 10:08:52 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-27 23:41:41 +0100
commit3bce21ee5489b03ab42b540f09876cea97867cb1 (patch)
treee9aeeb8e193457055d92408259c2ead88c3b52dc /meta
parent5cd00e3e53819f3c10d1733480077ce9f3cc2ca8 (diff)
downloadpoky-3bce21ee5489b03ab42b540f09876cea97867cb1.tar.gz
util-linux: Fix packaging of util-linux-unshare
Below commit has added the unshare to alternatives but did not fix the packaging of the changed file. ,----[ Offending commit ] | commit 147da8fe7458a38598845958cb358bb094eba57b | Author: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | Date: Thu Jul 5 11:57:19 2018 +0300 | | util-linux.inc: add fallocate & unshare to alternatives | | These binaries can be provided by busybox triggering a conflict in | do_rootfs so update-alternatives needs to know about them to properly | create the symlinks. | | Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | Signed-off-by: Ross Burton <ross.burton@intel.com> `---- (From OE-Core rev: a68f1cacb560632382f8f8ff0c7e03e39a891b29) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 9d52ed935f..c2e02e847a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -113,7 +113,7 @@ FILES_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}" 115FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}"
116FILES_util-linux-unshare = "${bindir}/unshare" 116FILES_util-linux-unshare = "${bindir}/unshare.${BPN}"
117 117
118# Util-linux' blkid replaces the e2fsprogs one 118# Util-linux' blkid replaces the e2fsprogs one
119FILES_util-linux-blkid = "${base_sbindir}/blkid*" 119FILES_util-linux-blkid = "${base_sbindir}/blkid*"