From d138b1ec4aef88a3b0c4f1d698ed2a224c93b889 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 3 Oct 2018 00:27:12 +0800 Subject: 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. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- ...an_db.conf-avoid-multilib-install-file-conflict.patch | 16 ++++++++++++++++ meta/recipes-extended/man-db/man-db_2.8.3.bb | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch (limited to 'meta/recipes-extended') 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 @@ +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 + +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/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 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" -- cgit 1.2.3-korg