diff mbox series

man-db: remove inexplicable man_db.conf patch

Message ID 20231016170355.3505964-1-ross.burton@arm.com
State Accepted, archived
Commit 8d80cce2921346b60c11f5cba630b94103bf05f3
Headers show
Series man-db: remove inexplicable man_db.conf patch | expand

Commit Message

Ross Burton Oct. 16, 2023, 5:03 p.m. UTC 
From: Ross Burton <ross.burton@arm.com>

The patch we're applying to man_db.conf claims that the variable
@config_file_basename@ will be replaced with the package name, and that
this breaks multilib systems as that causes conflicts.

However, this suggests that both man-db and lib32-man-db are being
installed which is pointless, and the variable expands to the basename
which is just man_db.conf.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...nf-avoid-multilib-install-file-conflict.patch | 16 ----------------
 meta/recipes-extended/man-db/man-db_2.11.2.bb    |  3 +--
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch
diff mbox series

Patch

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
deleted file mode 100644
index 03273d3b49f..00000000000
--- a/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch
+++ /dev/null
@@ -1,16 +0,0 @@ 
-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/meta/recipes-extended/man-db/man-db_2.11.2.bb b/meta/recipes-extended/man-db/man-db_2.11.2.bb
index 76e3786b269..8941ffc013e 100644
--- a/meta/recipes-extended/man-db/man-db_2.11.2.bb
+++ b/meta/recipes-extended/man-db/man-db_2.11.2.bb
@@ -10,8 +10,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
            file://99_mandb \
            file://0001-man-Move-local-variable-declaration-to-function-scop.patch \
-           file://autoconf-2.73.patch \
-           file://man_db.conf-avoid-multilib-install-file-conflict.patch"
+           file://autoconf-2.73.patch"
 SRC_URI[sha256sum] = "cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d"
 
 DEPENDS = "libpipeline gdbm groff-native base-passwd"