summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorNiko Mauno <niko.mauno@iki.fi>2018-05-05 22:50:42 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:56:49 +0100
commit97293e7cdef37765f129b0e482ffd5af42f0d160 (patch)
tree4c31ff93a872d87fe83c28933795bd8ca61b481e /meta/recipes-devtools
parent83a4c4b890a21b2dcafb0d2058982afc40a07369 (diff)
downloadpoky-97293e7cdef37765f129b0e482ffd5af42f0d160.tar.gz
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 <niko.mauno@vaisala.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb17
1 files changed, 15 insertions, 2 deletions
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() {
75 e2fsprogs_conf_fixup 75 e2fsprogs_conf_fixup
76} 76}
77 77
78do_install_append_class-target() {
79 mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.e2fsprogs
80 mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.e2fsprogs
81 mv ${D}${base_sbindir}/tune2fs ${D}${base_sbindir}/tune2fs.e2fsprogs
82}
83
78RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" 84RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
79RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" 85RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck"
80 86
@@ -83,8 +89,8 @@ PACKAGES =+ "libcomerr libss libe2p libext2fs"
83 89
84FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" 90FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*"
85FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" 91FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
86FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" 92FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.e2fsprogs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"
87FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label" 93FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs.e2fsprogs ${base_sbindir}/e2label"
88FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" 94FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
89FILES_libcomerr = "${base_libdir}/libcom_err.so.*" 95FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
90FILES_libss = "${base_libdir}/libss.so.*" 96FILES_libss = "${base_libdir}/libss.so.*"
@@ -100,6 +106,13 @@ ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
100ALTERNATIVE_${PN}-doc = "fsck.8" 106ALTERNATIVE_${PN}-doc = "fsck.8"
101ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" 107ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
102 108
109ALTERNATIVE_${PN}-mke2fs = "mke2fs mkfs.ext2"
110ALTERNATIVE_LINK_NAME[mke2fs] = "${base_sbindir}/mke2fs"
111ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2"
112
113ALTERNATIVE_${PN}-tune2fs = "tune2fs"
114ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
115
103RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash" 116RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash"
104 117
105do_compile_ptest() { 118do_compile_ptest() {