e2fsprogs: Ensure we use the right mke2fs.conf when restoring from sstate

If we don't do this, we can use an mke2fs.conf from a different path which
may contain incompatible flags and lead to obtuse build failures such as:

Invalid filesystem option set: has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize

To fix this, wrap the mke2fs binary and its hardlinks and point at the
correct configuration file.

In particular this fixes conflicts between master and jethro builds
affecting the main autobuilder.

(From OE-Core rev: 11a6227759515da433230eb44eca1a4cb2ac3b14)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2016-02-05 10:52:39 +00:00
parent 66a6ec2e9a
commit 00ccf51f17
1 changed files with 15 additions and 0 deletions

View File

@ -50,12 +50,27 @@ do_install () {
install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/
}
# Need to find the right mke2fs.conf file
e2fsprogs_conf_fixup () {
for i in mke2fs mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.ext4dev; do
create_wrapper ${D}${base_sbindir}/$i MKE2FS_CONFIG=${sysconfdir}/mke2fs.conf
done
}
do_install_append_class-target() {
# Clean host path in compile_et, mk_cmds
sed -i -e "s,ET_DIR=\"${S}/lib/et\",ET_DIR=\"${datadir}/et\",g" ${D}${bindir}/compile_et
sed -i -e "s,SS_DIR=\"${S}/lib/ss\",SS_DIR=\"${datadir}/ss\",g" ${D}${bindir}/mk_cmds
}
do_install_append_class-native() {
e2fsprogs_conf_fixup
}
do_install_append_class-nativesdk() {
e2fsprogs_conf_fixup
}
RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck"