readline: Split GPLv2 version from shared inc file

Do not share common inc file with GPLv3 version of recipe
Fix the issue of multiple provider warning

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>

2 files changed, 32 insertions, 3 deletions

diff --git a/meta/packages/readline/readline.inc b/meta/packages/readline/readline.inc
index 966def992d..35bc7ed946 100644
--- a/meta/packages/readline/readline.inc
+++ b/meta/packages/readline/readline.inc
@@ -10,7 +10,6 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS += "ncurses"
-RPROVIDES_${PN} += "readline"
 
 SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \
            file://configure-fix.patch \
diff --git a/meta/packages/readline/readline_5.2.bb b/meta/packages/readline/readline_5.2.bb
index 10f88ce196..a62345c45e 100644
--- a/meta/packages/readline/readline_5.2.bb
+++ b/meta/packages/readline/readline_5.2.bb
@@ -1,5 +1,35 @@
-require readline.inc
+DESCRIPTION = "The GNU Readline library provides a set of functions for use by applications that allow users to edit \
+command lines as they are typed in. Both Emacs and vi editing modes are available. The Readline library includes  \
+additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those   \
+lines, and perform csh-like history expansion on previous commands."
+SECTION = "libs"
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=03b36fdd84f74b8d8189a202b980b67f"
-PR = "r5"
+
+DEPENDS += "ncurses"
+PRIORITY = "optional"
+
+PR = "r6"
+
+SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \
+           file://configure-fix.patch \
+           file://acinclude.m4"
+
+S = "${WORKDIR}/${BPN}-${PV}"
+
+inherit autotools
+
+LEAD_SONAME = "libreadline.so"
+
+do_configure_prepend () {
+        install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_install_append () {
+        # Make install doesn't properly install these
+        oe_libinstall -so -C shlib libhistory ${D}${libdir}
+        oe_libinstall -so -C shlib libreadline ${D}${libdir}
+}
+
+BBCLASSEXTEND = "native nativesdk"