diff options
| author |   Ross Burton <ross.burton@arm.com> | 2023-03-07 15:56:06 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-08 10:20:17 +0000 |
| commit | fbd8a57aa307bfda70a08cb78af3c97f05c39a3a (patch) | |
| tree | ae6c2c18887d40e19acb3bab009121d26c117aa4 | |
| parent | 0f8baa36fa99c66dbf305da355b665cb053c3ef4 (diff) | |
| download | openembedded-core-fbd8a57aa307bfda70a08cb78af3c97f05c39a3a.tar.gz | |
manpages: use an intercept to run mandb
If you build an image with lots of manpages in, then each package will
run mandb inside qemu-user at rootfs time. This is a slow operation
and should be done once when all of the packages have installed using an
intercept instead.
The call to mandb has been changed too. mandb doesn't actually allow
the configuration file to be read from stdin so that was being ignored,
instead write the file to a temporary file and use that.
This means we then don't need to tell it where to search explicitly, and
it writes the indexes to the correct paths so we don't need to move
files afterwards either.
Sadly we do still need to run mandb inside qemu-user, as the underlying
database is a gdbm file and they are byte-order dependent.
For my test case of core-image-base with api-documentation
DISTRO_FEATURES and doc-pkgs IMAGE_FEATURES enabled, the performance
gain is significant:
core-image-base do_rootfs -1303.1s -73.6% 1771.6s -> 468.5s
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
| -rw-r--r-- | meta/classes-recipe/manpages.bbclass | 12 | ||||
| -rw-r--r-- | scripts/postinst-intercepts/update_mandb | 16 |
2 files changed, 17 insertions, 11 deletions
diff --git a/meta/classes-recipe/manpages.bbclass b/meta/classes-recipe/manpages.bbclass index 693fb53671..e9ca2f895b 100644 --- a/meta/classes-recipe/manpages.bbclass +++ b/meta/classes-recipe/manpages.bbclass @@ -23,17 +23,7 @@ pkg_postinst:${MAN_PKG}:append () { 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 - 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 - mkdir -p $D${localstatedir}/cache/man/$(dirname ${index}) - mv ${index} $D${localstatedir}/cache/man/${index} - chown man:man $D${localstatedir}/cache/man/${index} - done - cd - + $INTERCEPT_DIR/postinst_intercept update_mandb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} bindir=${bindir} sysconfdir=${sysconfdir} mandir=${mandir} else $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} fi diff --git a/scripts/postinst-intercepts/update_mandb b/scripts/postinst-intercepts/update_mandb new file mode 100644 index 0000000000..a061bb426a --- /dev/null +++ b/scripts/postinst-intercepts/update_mandb @@ -0,0 +1,16 @@ +#!/bin/sh +# +# SPDX-License-Identifier: MIT +# + +set -eu + +# Create a temporary man_db.conf with paths to the rootfs, as mandb needs absolute paths +CONFIG=$(mktemp --tmpdir update-mandb.XXXXX) +sed "s:\(\s\)/:\1$D/:g" $D${sysconfdir}/man_db.conf > $CONFIG + +PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${bindir}/mandb --config-file $CONFIG --create + +rm -f $CONFIG + +chown -R man:man $D${localstatedir}/cache/man/ |