summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-06-13 10:40:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-14 08:43:55 +0100
commitbcef58953abd45c8d4d34e93f2666d6ad61a836f (patch)
treecf31227b08abbb53036011d22129c21f9971c9e7 /meta
parent03def887a44b7850b30186c96fa3f6fcf7146159 (diff)
downloadpoky-bcef58953abd45c8d4d34e93f2666d6ad61a836f.tar.gz
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] (From OE-Core rev: 23f1dddbf9cf783d90040b67978d1291b16a13de) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb9
1 files changed, 9 insertions, 0 deletions
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 () {
54 fi 54 fi
55 55
56 oe_multilib_header ext2fs/ext2_types.h 56 oe_multilib_header ext2fs/ext2_types.h
57 install -d ${D}${base_bindir}
58 mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
57} 59}
58 60
59RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" 61RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
@@ -73,3 +75,10 @@ FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
73FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so" 75FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so"
74 76
75BBCLASSEXTEND = "native" 77BBCLASSEXTEND = "native"
78
79inherit update-alternatives
80
81ALTERNATIVE_${PN} = "chattr"
82ALTERNATIVE_PRIORITY = "100"
83ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
84ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"