summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2022-06-08 15:12:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-22 23:46:29 +0100
commit1cc03505ce370a4ff0b0aa951b660e90ced89218 (patch)
treeb277cea1a5d876b498e37576fef799ed889d5879
parentcb1444e7bd035025a80bf4da7b3669974d3d94df (diff)
downloadpoky-1cc03505ce370a4ff0b0aa951b660e90ced89218.tar.gz
e2fsprogs: add alternatives handling of lsattr as well
Building busybox with CONFIG_LSATTR=y and installing that in the same filesystem as e2fsprogs breaks: ERROR: ... do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} (). Deferring to first boot via 'exit 1' is no longer supported. Fix that by also alternatifying lsattr just as chattr already is. (From OE-Core rev: 8876f33f08e07480c93803c19b517b2bed4dfe4c) Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 96703961eeb3460e9da26503d7942cc965d1e573) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb
index ec48f419c7..5b2d1921f0 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb
@@ -51,6 +51,7 @@ do_install () {
51 oe_multilib_header ext2fs/ext2_types.h 51 oe_multilib_header ext2fs/ext2_types.h
52 install -d ${D}${base_bindir} 52 install -d ${D}${base_bindir}
53 mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs 53 mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
54 mv ${D}${bindir}/lsattr ${D}${base_bindir}/lsattr.e2fsprogs
54 55
55 install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/ 56 install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/
56 57
@@ -99,10 +100,12 @@ FILES:libe2p = "${base_libdir}/libe2p.so.*"
99FILES:libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" 100FILES:libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
100FILES:${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" 101FILES:${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds"
101 102
102ALTERNATIVE:${PN} = "chattr" 103ALTERNATIVE:${PN} = "chattr lsattr"
103ALTERNATIVE_PRIORITY = "100" 104ALTERNATIVE_PRIORITY = "100"
104ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" 105ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
105ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" 106ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
107ALTERNATIVE_LINK_NAME[lsattr] = "${base_bindir}/lsattr"
108ALTERNATIVE_TARGET[lsattr] = "${base_bindir}/lsattr.e2fsprogs"
106 109
107ALTERNATIVE:${PN}-doc = "fsck.8" 110ALTERNATIVE:${PN}-doc = "fsck.8"
108ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" 111ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"