4 files changed, 8 insertions, 16 deletions
diff --git a/recipes/ncurses/ncurses-native_5.4.bb b/recipes/ncurses/ncurses-native_5.4.bb
deleted file mode 100644
index 749e1c487a..0000000000
--- a/recipes/ncurses/ncurses-native_5.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require ncurses_${PV}.bb
-inherit native
-EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
-DEPENDS = ""
-
-SRC_URI[md5sum] = "069c8880072060373290a4fefff43520"
-SRC_URI[sha256sum] = "5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36"
diff --git a/recipes/ncurses/ncurses-sdk_5.4.bb b/recipes/ncurses/ncurses-sdk_5.4.bb
deleted file mode 100644
index fb69c1ec7d..0000000000
--- a/recipes/ncurses/ncurses-sdk_5.4.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require ncurses_${PV}.bb
-inherit sdk
-EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
diff --git a/recipes/ncurses/ncurses.inc b/recipes/ncurses/ncurses.inc
index 337d670cc5..48412c1998 100644
--- a/recipes/ncurses/ncurses.inc
+++ b/recipes/ncurses/ncurses.inc
@@ -3,13 +3,12 @@ HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html"
 LICENSE = "MIT"
 SECTION = "libs"
 DEPENDS = "ncurses-native"
+INC_PR = "r20"
 
 inherit autotools
 
 PARALLEL_MAKE=""
 
-FILESPATH = "${FILE_DIRNAME}/local:${FILE_DIRNAME}/ncurses-${PV}-${PR}:${FILE_DIRNAME}/ncurses-${PV}:${FILE_DIRNAME}/ncurses:${FILE_DIRNAME}"
-
 EXTRA_OECONF = "\
   --enable-static \
   --with-shared \
@@ -112,8 +111,7 @@ FILES_${PN}-tools = "\
 FILES_${PN}-terminfo = "\
   ${datadir}/terminfo \
 "
-RSUGGESTS_${PN} = "ncurses-terminfo"
+RSUGGESTS_${PN} = "${PN}-terminfo"
 RPROVIDES_${PN} = "libncurses5"
 RCONFLICTS_${PN} = "libncurses5"
 RREPLACES_${PN} = "libncurses5"
-
diff --git a/recipes/ncurses/ncurses_5.4.bb b/recipes/ncurses/ncurses_5.4.bb
index 8c0f62c48a..d358e162ec 100644
--- a/recipes/ncurses/ncurses_5.4.bb
+++ b/recipes/ncurses/ncurses_5.4.bb
@@ -1,5 +1,3 @@
-PR = "r20"
-
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
            file://makefile_tweak.patch \
            file://use_ldflags.patch \
@@ -7,8 +5,14 @@ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
 S = "${WORKDIR}/ncurses-${PV}"
 
 require ncurses.inc
+PR = "${INC_PR}.0"
 
 LEAD_SONAME = "libncurses.so.5"
 
 SRC_URI[md5sum] = "069c8880072060373290a4fefff43520"
 SRC_URI[sha256sum] = "5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36"
+
+BBCLASSEXTEND = "native sdk"
+DEPENDS_virtclass-native = ""
+EXTRA_OEMAKE_virtclass-native = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
+EXTRA_OEMAKE_virtclass-sdk = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'