From: Ross Burton <[email protected]> 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 <[email protected]> --- ...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 --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 <[email protected]> - -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" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#189308): https://lists.openembedded.org/g/openembedded-core/message/189308 Mute This Topic: https://lists.openembedded.org/mt/102000298/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
