diff options
Diffstat (limited to 'poky/meta/recipes-extended/man-db')
| -rw-r--r-- | poky/meta/recipes-extended/man-db/files/99_mandb | 1 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch | 16 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/man-db/man-db_2.8.3.bb (renamed from poky/meta/recipes-extended/man-db/man-db_2.8.1.bb) | 22 |
3 files changed, 34 insertions, 5 deletions
diff --git a/poky/meta/recipes-extended/man-db/files/99_mandb b/poky/meta/recipes-extended/man-db/files/99_mandb new file mode 100644 index 000000000..9b8a1712b --- /dev/null +++ b/poky/meta/recipes-extended/man-db/files/99_mandb @@ -0,0 +1 @@ +d man man 0755 /var/cache/man none diff --git a/poky/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch b/poky/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch new file mode 100644 index 000000000..03273d3b4 --- /dev/null +++ b/poky/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch @@ -0,0 +1,16 @@ +The first line of man_db.conf will be replaced by package name. And it causes +multilib install file conflict. Remove the line to avoid the issue. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +diff --git a/src/man_db.conf.in b/src/man_db.conf.in +index bc8bb7e..04cfb31 100644 +--- a/src/man_db.conf.in ++++ b/src/man_db.conf.in +@@ -1,4 +1,3 @@ +-# @config_file_basename@ + # + # This file is used by the man-db package to configure the man and cat paths. + # It is also used to provide a manpath for those without one by examining diff --git a/poky/meta/recipes-extended/man-db/man-db_2.8.1.bb b/poky/meta/recipes-extended/man-db/man-db_2.8.3.bb index 8328a671f..cd8d27c33 100644 --- a/poky/meta/recipes-extended/man-db/man-db_2.8.1.bb +++ b/poky/meta/recipes-extended/man-db/man-db_2.8.3.bb @@ -4,18 +4,30 @@ 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[md5sum] = "51842978e06686286421f9498d1009b7" -SRC_URI[sha256sum] = "a6aec641ca3d9942b054cc0e9c3f05cb46a3a992bc0006795755e2fed1357f3e" +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ + file://99_mandb \ + file://man_db.conf-avoid-multilib-install-file-conflict.patch" +SRC_URI[md5sum] = "6f3055e18fdd1ce5cbbdb30403991ec7" +SRC_URI[sha256sum] = "5932a1ca366e1ec61a3ece1a3afa0e92f2fdc125b61d236f20cc6ff9d80cc4ac" -DEPENDS = "libpipeline gdbm groff-native" +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" inherit gettext pkgconfig autotools -EXTRA_OECONF = "--with-pager=less --disable-cache-owner" +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 |