diff options
author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2022-06-08 15:12:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-14 10:04:02 +0100 |
commit | b63578f3d285dc4a42535e8a894c3295b16fed8f (patch) | |
tree | 1f98b22a232d74409d99df487b470ab2ec0887b1 | |
parent | c9ce23f04bb9d16d6b887f1af7f19ca7d6b2c77d (diff) | |
download | poky-b63578f3d285dc4a42535e8a894c3295b16fed8f.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: 96703961eeb3460e9da26503d7942cc965d1e573)
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>
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb | 5 |
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.*" | |||
99 | FILES:libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" | 100 | FILES:libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" |
100 | FILES:${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" | 101 | FILES:${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" |
101 | 102 | ||
102 | ALTERNATIVE:${PN} = "chattr" | 103 | ALTERNATIVE:${PN} = "chattr lsattr" |
103 | ALTERNATIVE_PRIORITY = "100" | 104 | ALTERNATIVE_PRIORITY = "100" |
104 | ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" | 105 | ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" |
105 | ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" | 106 | ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" |
107 | ALTERNATIVE_LINK_NAME[lsattr] = "${base_bindir}/lsattr" | ||
108 | ALTERNATIVE_TARGET[lsattr] = "${base_bindir}/lsattr.e2fsprogs" | ||
106 | 109 | ||
107 | ALTERNATIVE:${PN}-doc = "fsck.8" | 110 | ALTERNATIVE:${PN}-doc = "fsck.8" |
108 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" | 111 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" |