diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-20 11:10:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-20 15:28:57 +0000 |
| commit | 407793a0fd4e562b626ff07024c5bbdc2a65b20e (patch) | |
| tree | 603ba9a8b92b6fb58d87bd81918acbe000be3677 | |
| parent | 22e84cdd05870f1a19c6389b66c4dfd5e9b418f7 (diff) | |
| download | openembedded-core-contrib-407793a0fd4e562b626ff07024c5bbdc2a65b20e.tar.gz | |
manpages: Fix override/append ordering and hence task signatures
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.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/manpages.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/manpages.bbclass b/meta/classes/manpages.bbclass index 64b7d8c422..5e09c77fe6 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 |