]> code.ossystems Code Review - openembedded-core.git/commitdiff
util-linux: Fix packaging of util-linux-unshare
authorOtavio Salvador <otavio@ossystems.com.br>
Wed, 26 Sep 2018 13:08:52 +0000 (10:08 -0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 27 Sep 2018 22:39:28 +0000 (23:39 +0100)
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>
`----

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/util-linux/util-linux.inc

index 9d52ed935f546106814a7ddbcb0175af5aecfc18..c2e02e847a84756d99a0f9b8c334ac41b91a4774 100644 (file)
@@ -113,7 +113,7 @@ FILES_util-linux-sulogin = "${base_sbindir}/sulogin*"
 FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}"
 
 FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}"
-FILES_util-linux-unshare = "${bindir}/unshare"
+FILES_util-linux-unshare = "${bindir}/unshare.${BPN}"
 
 # Util-linux' blkid replaces the e2fsprogs one
 FILES_util-linux-blkid = "${base_sbindir}/blkid*"