From 97293e7cdef37765f129b0e482ffd5af42f0d160 Mon Sep 17 00:00:00 2001 From: Niko Mauno Date: Sat, 5 May 2018 22:50:42 +0300 Subject: 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 (From OE-Core rev: 81dc858a24cc5b5dc547356eb22f00dde9801b6f) Signed-off-by: Niko Mauno Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/e2fsprogs') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb index 56abb3b5d3..989d47394b 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb @@ -75,6 +75,12 @@ do_install_append_class-nativesdk() { e2fsprogs_conf_fixup } +do_install_append_class-target() { + mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.e2fsprogs + mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.e2fsprogs + mv ${D}${base_sbindir}/tune2fs ${D}${base_sbindir}/tune2fs.e2fsprogs +} + RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" @@ -83,8 +89,8 @@ PACKAGES =+ "libcomerr libss libe2p libext2fs" FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" -FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" -FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label" +FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.e2fsprogs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" +FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs.e2fsprogs ${base_sbindir}/e2label" FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" FILES_libcomerr = "${base_libdir}/libcom_err.so.*" FILES_libss = "${base_libdir}/libss.so.*" @@ -100,6 +106,13 @@ ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" ALTERNATIVE_${PN}-doc = "fsck.8" ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" +ALTERNATIVE_${PN}-mke2fs = "mke2fs mkfs.ext2" +ALTERNATIVE_LINK_NAME[mke2fs] = "${base_sbindir}/mke2fs" +ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2" + +ALTERNATIVE_${PN}-tune2fs = "tune2fs" +ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs" + RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash" do_compile_ptest() { -- cgit v1.2.3-54-g00ecf