From 23f1dddbf9cf783d90040b67978d1291b16a13de Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 13 Jun 2014 10:40:21 -0700 Subject: e2fsprogs: use update-alt for chattr Both busybox and e2fsprogs provide chattr, ensure that they are delivered to the same location and use update-alternatives to ensure the correct links are there. [YOCTO #6407] Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb index 2bdd7246a2..530255474d 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb @@ -54,6 +54,8 @@ do_install () { fi oe_multilib_header ext2fs/ext2_types.h + install -d ${D}${base_bindir} + mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs } RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" @@ -73,3 +75,10 @@ FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so" BBCLASSEXTEND = "native" + +inherit update-alternatives + +ALTERNATIVE_${PN} = "chattr" +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" +ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" -- cgit 1.2.3-korg