The append/override ordering was meaning that whilst the data was being picked
up later in the package processing, it wasn't being picked up by do_package.
This means changes to qemu options were not causing task signatures to change.
Fix the variable ordering with the append to correct this.
The whitespace fix is deliberate to cause output to change and hopefully avoid
hash invalidation issues from unchanged output.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
meta/classes/manpages.bbclass | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/manpages.bbclass b/meta/classes/manpages.bbclass
index 64b7d8c4222..5e09c77fe6f 100644
--- a/meta/classes/manpages.bbclass
+++ b/meta/classes/manpages.bbclass
@@ -12,13 +12,14 @@ MAN_PKG ?= "${PN}-doc"
# only add man-db to RDEPENDS when manual files are built and installed
RDEPENDS:${MAN_PKG} += "${@bb.utils.contains('PACKAGECONFIG', 'manpages',
'man-db', '', d)}"
-pkg_postinst:append:${MAN_PKG} () {
+pkg_postinst:${MAN_PKG}:append () {
# only update manual page index caches when manual files are built and
installed
if ${@bb.utils.contains('PACKAGECONFIG', 'manpages', 'true', 'false',
d)}; then
if test -n "$D"; then
- if ${@bb.utils.contains('MACHINE_FEATURES',
'qemu-usermode', 'true','false', d)}; then
+ if ${@bb.utils.contains('MACHINE_FEATURES',
'qemu-usermode', 'true', 'false', d)}; then
sed "s:\(\s\)/:\1$D/:g"
$D${sysconfdir}/man_db.conf | ${@qemu_run_binary(d, '$D', '${bindir}/mandb')}
-C - -u -q $D${mandir}
chown -R root:root $D${mandir}
+
mkdir -p $D${localstatedir}/cache/man
cd $D${mandir}
find . -name index.db | while read index; do
@@ -36,7 +37,7 @@ pkg_postinst:append:${MAN_PKG} () {
fi
}
-pkg_postrm:append:${MAN_PKG} () {
+pkg_postrm:${MAN_PKG}:append () {
# only update manual page index caches when manual files are built and
installed
if ${@bb.utils.contains('PACKAGECONFIG', 'manpages', 'true', 'false',
d)}; then
mandb -q
--
2.32.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159869):
https://lists.openembedded.org/g/openembedded-core/message/159869
Mute This Topic: https://lists.openembedded.org/mt/87857613/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
