Skip to contentSkip to conversation

mandb: fix runtime problem and rootfs time problem

PATCH New Chen Qi 1 participant 3 messages Aug 13, 2018

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover mandb: fix runtime problem and rootfs time problem

The following changes since commit 028a292001f64ad86c6b960a05ba1f6fd72199de:

binutils: enable x86_64-pep for producing EFI binaries on x86-64 (2018-08-09 23:47:56 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/yocto12872
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/yocto12872

Chen Qi (2):
man-db: add volatile configuration file for sysvinit
man-db: rdepend on base-passwd to ensure installation order

 meta/recipes-extended/man-db/files/99_mandb  |  1 +
 meta/recipes-extended/man-db/man-db_2.8.3.bb | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/man-db/files/99_mandb
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/2 man-db: add volatile configuration file for sysvinit

Add volatile configuraiton file for man-db so that in sysvinit systems we don't get failure when running `mandb'. The error message is like below.

mandb: can't create index cache /var/cache/man/579: No such file or directory

[YOCTO #12872]

Signed-off-by Chen Qi <[email protected]>
---
 meta/recipes-extended/man-db/files/99_mandb  |  1 +
 meta/recipes-extended/man-db/man-db_2.8.3.bb | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/man-db/files/99_mandb
meta/recipes-extended/man-db/files/99_mandb new file +1 -0
new file mode 100644
index 0000000..9b8a171
@@ -0,0 +1 @@
+d man man 0755 /var/cache/man none
meta/recipes-extended/man-db/man-db_2.8.3.bb +11 -1
index a214bd7..e1a7ad9 100644
@@ -4,7 +4,8 @@ LICENSE = "LGPLv2.1 & GPLv2"
 LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
-SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz"
+SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
+           file://99_mandb"
 SRC_URI[md5sum] = "6f3055e18fdd1ce5cbbdb30403991ec7"
 SRC_URI[sha256sum] = "5932a1ca366e1ec61a3ece1a3afa0e92f2fdc125b61d236f20cc6ff9d80cc4ac"
 

@@ -17,6 +18,15 @@ inherit gettext pkgconfig autotools
 
 EXTRA_OECONF = "--with-pager=less"
 
+do_install() {
+	autotools_do_install
+
+	if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+	        install -d ${D}/etc/default/volatiles
+		install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles
+	fi
+}
+
 do_install_append_libc-musl() {
         rm -f ${D}${libdir}/charset.alias
 }
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/2 man-db: rdepend on base-passwd to ensure installation order

In reply to Chen Qi

Make man-db rdepend on base-passwd to ensure that base-passwd is installed before man-db at rootfs time. This is to avoid the following warning at rootfs time.

warning: user man does not exist - using root

Signed-off-by Chen Qi <[email protected]>
---
 meta/recipes-extended/man-db/man-db_2.8.3.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-extended/man-db/man-db_2.8.3.bb +1 -0
index e1a7ad9..97e5a3d 100644
@@ -10,6 +10,7 @@ SRC_URI[md5sum] = "6f3055e18fdd1ce5cbbdb30403991ec7"
 SRC_URI[sha256sum] = "5932a1ca366e1ec61a3ece1a3afa0e92f2fdc125b61d236f20cc6ff9d80cc4ac"
 
 DEPENDS = "libpipeline gdbm groff-native base-passwd"
+RDEPENDS_${PN} += "base-passwd"
 
 # | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr'
 USE_NLS_libc-musl = "no"
Signature · 1 line
1.9.1