mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

man-db: fix multilib install file conflict

Browse Source 
The first line of config file man_db.conf is the package name. It causes
multilib install file conflict. So add a patch to remove the line.

(From OE-Core rev: d138b1ec4aef88a3b0c4f1d698ed2a224c93b889)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2018-10-03 00:27:12 +08:00
committed by Richard Purdie
parent 9f28e2d380
commit 077532d20d
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch Normal file
View File

@@ -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

3
meta/recipes-extended/man-db/man-db_2.8.3.bb
View File

@@ -5,7 +5,8 @@ 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 \
file://99_mandb"
file://99_mandb \
file://man_db.conf-avoid-multilib-install-file-conflict.patch"
SRC_URI[md5sum] = "6f3055e18fdd1ce5cbbdb30403991ec7"
SRC_URI[sha256sum] = "5932a1ca366e1ec61a3ece1a3afa0e92f2fdc125b61d236f20cc6ff9d80cc4ac"