]> code.ossystems Code Review - openembedded-core.git/commitdiff
e2fsprogs: Complement update-alternatives scope
authorNiko Mauno <niko.mauno@vaisala.com>
Fri, 20 Apr 2018 14:09:29 +0000 (17:09 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 3 May 2018 09:03:25 +0000 (10:03 +0100)
Avoid collision of e2fsprogs provided tune2fs, mke2fs and mkfs.ext2
commands with corresponding BusyBox provided applets in case both
packages are installed to same rootfs, by adding these commands to
update-alternatives scope

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb

index 56abb3b5d31a523db7aa04d7f527f2a65337e5c4..cda432460fec8ed80bf6dabd8d1a6e0c909bd23e 100644 (file)
@@ -100,6 +100,13 @@ ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
 ALTERNATIVE_${PN}-doc = "fsck.8"
 ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
 
+ALTERNATIVE_${PN}-tune2fs = "tune2fs"
+ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
+
+ALTERNATIVE_${PN}-mke2fs = "mke2fs mkfs.ext2"
+ALTERNATIVE_LINK_NAME[mke2fs] = "${base_sbindir}/mke2fs"
+ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2"
+
 RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash"
 
 do_compile_ptest() {