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} () {
                 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
-                                mv $D${mandir}/index.db $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 -
                         else
                                 $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX}
                         fi