summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/man-db
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-10-03 00:27:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-04 14:21:41 +0100
commit077532d20d4b14f4ccd354cb80d5f8bd5a749ab6 (patch)
treeb39f8a6931be5c833969a7d83b46359627c132c5 /meta/recipes-extended/man-db
parent9f28e2d38062e4347a4e2134dee3a12e291c469f (diff)
downloadpoky-077532d20d4b14f4ccd354cb80d5f8bd5a749ab6.tar.gz
man-db: fix multilib install file conflict
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>
Diffstat (limited to 'meta/recipes-extended/man-db')
-rw-r--r--meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch16
-rw-r--r--meta/recipes-extended/man-db/man-db_2.8.3.bb3
2 files changed, 18 insertions, 1 deletions
diff --git a/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch b/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch
new file mode 100644
index 0000000000..03273d3b49
--- /dev/null
+++ b/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch
@@ -0,0 +1,16 @@
1The first line of man_db.conf will be replaced by package name. And it causes
2multilib install file conflict. Remove the line to avoid the issue.
3
4Upstream-Status: Pending
5
6Signed-off-by: Kai Kang <kai.kang@windriver.com>
7
8diff --git a/src/man_db.conf.in b/src/man_db.conf.in
9index bc8bb7e..04cfb31 100644
10--- a/src/man_db.conf.in
11+++ b/src/man_db.conf.in
12@@ -1,4 +1,3 @@
13-# @config_file_basename@
14 #
15 # This file is used by the man-db package to configure the man and cat paths.
16 # It is also used to provide a manpath for those without one by examining
diff --git a/meta/recipes-extended/man-db/man-db_2.8.3.bb b/meta/recipes-extended/man-db/man-db_2.8.3.bb
index 97e5a3d6fb..cd8d27c33e 100644
--- a/meta/recipes-extended/man-db/man-db_2.8.3.bb
+++ b/meta/recipes-extended/man-db/man-db_2.8.3.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343
5 file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a" 5 file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a"
6 6
7SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ 7SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
8 file://99_mandb" 8 file://99_mandb \
9 file://man_db.conf-avoid-multilib-install-file-conflict.patch"
9SRC_URI[md5sum] = "6f3055e18fdd1ce5cbbdb30403991ec7" 10SRC_URI[md5sum] = "6f3055e18fdd1ce5cbbdb30403991ec7"
10SRC_URI[sha256sum] = "5932a1ca366e1ec61a3ece1a3afa0e92f2fdc125b61d236f20cc6ff9d80cc4ac" 11SRC_URI[sha256sum] = "5932a1ca366e1ec61a3ece1a3afa0e92f2fdc125b61d236f20cc6ff9d80cc4ac"
11 12