6 files changed, 30 insertions, 7 deletions
diff --git a/external/poky/meta/recipes-core/readline/readline-7.0/configure-fix.patch b/external/poky/meta/recipes-core/readline/readline-8.0/configure-fix.patch
index ef3104f8..ef3104f8 100644
--- a/external/poky/meta/recipes-core/readline/readline-7.0/configure-fix.patch
+++ b/external/poky/meta/recipes-core/readline/readline-8.0/configure-fix.patch
diff --git a/external/poky/meta/recipes-core/readline/readline-7.0/norpath.patch b/external/poky/meta/recipes-core/readline/readline-8.0/norpath.patch
index 5d71582b..5d71582b 100644
--- a/external/poky/meta/recipes-core/readline/readline-7.0/norpath.patch
+++ b/external/poky/meta/recipes-core/readline/readline-8.0/norpath.patch
diff --git a/external/poky/meta/recipes-core/readline/readline-8.0/rl-native.map b/external/poky/meta/recipes-core/readline/readline-8.0/rl-native.map
new file mode 100644
index 00000000..5e7d49cd
--- /dev/null
+++ b/external/poky/meta/recipes-core/readline/readline-8.0/rl-native.map
@@ -0,0 +1,12 @@
+READLINE_6.3 {
+    rl_change_environment;
+    rl_clear_history;
+    rl_executing_key;
+    rl_executing_keyseq;
+    rl_filename_stat_hook;
+    rl_history_substr_search_backward;
+    rl_history_substr_search_forward;
+    rl_input_available_hook;
+    rl_print_last_kbd_macro;
+    rl_signal_event_hook;
+};
diff --git a/external/poky/meta/recipes-core/readline/readline.inc b/external/poky/meta/recipes-core/readline/readline.inc
index e9665228..052e2d5f 100644
--- a/external/poky/meta/recipes-core/readline/readline.inc
+++ b/external/poky/meta/recipes-core/readline/readline.inc
@@ -43,3 +43,14 @@ do_install_append () {
 BBCLASSEXTEND = "native nativesdk"
 
 CONFFILES_${PN} += "${sysconfdir}/inputrc"
+
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN}-doc = "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"
diff --git a/external/poky/meta/recipes-core/readline/readline_7.0.bb b/external/poky/meta/recipes-core/readline/readline_7.0.bb
deleted file mode 100644
index 85dfaa62..00000000
--- a/external/poky/meta/recipes-core/readline/readline_7.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require readline.inc
-
-SRC_URI += "file://configure-fix.patch \
-            file://norpath.patch"
-
-SRC_URI[archive.md5sum] = "205b03a87fc83dab653b628c59b9fc91"
-SRC_URI[archive.sha256sum] = "750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334"
diff --git a/external/poky/meta/recipes-core/readline/readline_8.0.bb b/external/poky/meta/recipes-core/readline/readline_8.0.bb
new file mode 100644
index 00000000..99d022a3
--- /dev/null
+++ b/external/poky/meta/recipes-core/readline/readline_8.0.bb
@@ -0,0 +1,7 @@
+require readline.inc
+
+SRC_URI += "file://configure-fix.patch \
+            file://norpath.patch"
+
+SRC_URI[archive.md5sum] = "7e6c1f16aee3244a69aba6e438295ca3"
+SRC_URI[archive.sha256sum] = "e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461"