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-22 23:46:32 +0100 |
commit | a2805141e99d371002b3406d61dccbd2b2f18b8a (patch) | |
tree | e7b9d49937473562043f8136f82639053779fd04 /meta/recipes-devtools/e2fsprogs | |
parent | 7d9d97368b666199f8b0c9fa7a1d36d45555aa27 (diff) | |
download | poky-a2805141e99d371002b3406d61dccbd2b2f18b8a.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: 28090d32c88d99ea36a03f3bb723838746001e4b)
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>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb index 3e6faf4cb8..b1abf6b858 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb | |||
@@ -54,6 +54,7 @@ do_install () { | |||
54 | oe_multilib_header ext2fs/ext2_types.h | 54 | oe_multilib_header ext2fs/ext2_types.h |
55 | install -d ${D}${base_bindir} | 55 | install -d ${D}${base_bindir} |
56 | mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs | 56 | mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs |
57 | mv ${D}${bindir}/lsattr ${D}${base_bindir}/lsattr.e2fsprogs | ||
57 | 58 | ||
58 | install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/ | 59 | install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/ |
59 | 60 | ||
@@ -102,10 +103,12 @@ FILES_libe2p = "${base_libdir}/libe2p.so.*" | |||
102 | FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" | 103 | FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" |
103 | FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" | 104 | FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" |
104 | 105 | ||
105 | ALTERNATIVE_${PN} = "chattr" | 106 | ALTERNATIVE_${PN} = "chattr lsattr" |
106 | ALTERNATIVE_PRIORITY = "100" | 107 | ALTERNATIVE_PRIORITY = "100" |
107 | ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" | 108 | ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" |
108 | ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" | 109 | ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" |
110 | ALTERNATIVE_LINK_NAME[lsattr] = "${base_bindir}/lsattr" | ||
111 | ALTERNATIVE_TARGET[lsattr] = "${base_bindir}/lsattr.e2fsprogs" | ||
109 | 112 | ||
110 | ALTERNATIVE_${PN}-doc = "fsck.8" | 113 | ALTERNATIVE_${PN}-doc = "fsck.8" |
111 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" | 114 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" |