On 2/22/20 7:54 PM, Jeremy A. Puhlman wrote:
From: Jeremy Puhlman <jpuhl...@mvista.com>
file /usr/share/man/man3/history.3 conflicts between attempted installs of
libedit-doc-20191231+3.1-r0.corei7_64 and readline-doc-8.0-r0.corei7_64
Signed-off-by: Jeremy A. Puhlman <jpuhl...@mvista.com>
---
meta/recipes-core/readline/readline.inc | 8 +++++++-
meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 6 ++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/readline/readline.inc
b/meta/recipes-core/readline/readline.inc
index 07f54a76f1..4babcbd69a 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -44,7 +44,13 @@ BBCLASSEXTEND = "native nativesdk"
CONFFILES_${PN} += "${sysconfdir}/inputrc"
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "history.3"
+ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
+
# OpenSuse injects versions into libreadline leading to conficits between our
native one and theirs
# see their spec file for where this is injected. Extra versioning is
harmless so we just do the same.
SRC_URI_append_class-native = " file://rl-native.map"
-LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map"
\ No newline at end of file
+LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map"
diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
index 7116c9ddbc..267fdcc54a 100644
--- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
+++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
@@ -17,3 +17,9 @@ SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416"
SRC_URI[sha256sum] =
"dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071"
BBCLASSEXTEND = "native nativesdk"
+
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE_${PN} = "history.3"
+ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
With this change (I think), I now get a file
+lrwxrwxrwx root root 38 ./usr/share/man/man3/history.3 ->
/usr/share/man/man3/history.3.readline
in my rootfs, which is wierd since I don't have any other man pages in
my image..
/Jacob
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
