From 4cdb26e62ae81a038d0f942ecc3c713c2d472fbb Mon Sep 17 00:00:00 2001 From: Niko Mauno Date: Fri, 20 Apr 2018 17:09:29 +0300 Subject: [PATCH] e2fsprogs: Complement update-alternatives scope 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 Signed-off-by: Ross Burton --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb index 56abb3b5d3..cda432460f 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb @@ -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() { -- 2.40.1