diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2020-01-09 14:45:59 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-27 16:48:08 +0000 |
commit | c6b06adb7f4c9817dff6602a33b6256427580950 (patch) | |
tree | 2c82c99f85a9b018e5baffd3700b3c29a2df4956 /meta/classes | |
parent | 465efec5769e395e4862368324020bf1a9f154f2 (diff) | |
download | poky-c6b06adb7f4c9817dff6602a33b6256427580950.tar.gz |
manpages.bbclass: Fix rootfs host corruption
When running mandb we end up with files owned by the build user, correct
this. Also pick up non-default locales and relocate their index.db files
to /var/cache.
(From OE-Core rev: 844781c5b260a52e8c06b872c74a13a22689bdb9)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/manpages.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/manpages.bbclass b/meta/classes/manpages.bbclass index 50c254763e..1e66780646 100644 --- a/meta/classes/manpages.bbclass +++ b/meta/classes/manpages.bbclass | |||
@@ -18,8 +18,15 @@ pkg_postinst_append_${MAN_PKG} () { | |||
18 | if test -n "$D"; then | 18 | if test -n "$D"; then |
19 | if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true','false', d)}; then | 19 | if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true','false', d)}; then |
20 | sed "s:\(\s\)/:\1$D/:g" $D${sysconfdir}/man_db.conf | ${@qemu_run_binary(d, '$D', '${bindir}/mandb')} -C - -u -q $D${mandir} | 20 | sed "s:\(\s\)/:\1$D/:g" $D${sysconfdir}/man_db.conf | ${@qemu_run_binary(d, '$D', '${bindir}/mandb')} -C - -u -q $D${mandir} |
21 | chown -R root:root $D${mandir} | ||
21 | mkdir -p $D${localstatedir}/cache/man | 22 | mkdir -p $D${localstatedir}/cache/man |
22 | mv $D${mandir}/index.db $D${localstatedir}/cache/man | 23 | cd $D${mandir} |
24 | find . -name index.db | while read index; do | ||
25 | mkdir -p $D${localstatedir}/cache/man/$(dirname ${index}) | ||
26 | mv ${index} $D${localstatedir}/cache/man/${index} | ||
27 | chown man:man $D${localstatedir}/cache/man/${index} | ||
28 | done | ||
29 | cd - | ||
23 | else | 30 | else |
24 | $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} | 31 | $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} |
25 | fi | 32 | fi |