lua: Adopt new staging and BBCLASSEXTEND

* Removed do_stage from recipes
* Set NATIVE_INSTALL_WORKS=1
* lua5.1-native now stages lua executable
* Removed -native recipe, use BBCLASSEXTENDS instead

Signed-off-by: Michael Stanger <michael.stanger@taitradio.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/lua/lua-native_5.0.2.bb b/recipes/lua/lua-native_5.0.2.bb
deleted file mode 100644 (file)
index bf70f84..0000000
--- a/recipes/lua/lua-native_5.0.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require lua.inc
-
-PR = "r2"
-DEPENDS += "readline-native"
-SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
-          file://debian.patch;patch=1 \
-          file://make.patch;patch=1 \
-          file://advanced-readline.patch;patch=1"
-#         http://lua-users.org/files/wiki_insecure/power_patches/5.0/advanced-readline.patch;patch=1"
-S = "${WORKDIR}/lua-${PV}"
-FILESPATH = "${FILE_DIRNAME}/lua-${PV}:${FILE_DIRNAME}/lua:${FILE_DIRNAME}/files"
-
-inherit native
-require lua-build.inc
-

diff --git a/recipes/lua/lua5.1-native_5.1.4.bb b/recipes/lua/lua5.1-native_5.1.4.bb
deleted file mode 100644 (file)
index 35afb55..0000000
--- a/recipes/lua/lua5.1-native_5.1.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require lua5.1_${PV}.bb
-inherit native
-
-DEPENDS = "readline-native"
-
-do_stage () {
-    oe_libinstall -C src liblua ${STAGING_LIBDIR}/
-    install -d ${STAGING_INCDIR}/
-    install -m 0644 src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h ${STAGING_INCDIR}/
-}  
-

diff --git a/recipes/lua/lua5.1_5.1.4.bb b/recipes/lua/lua5.1_5.1.4.bb
index 8041def..7452c06 100644 (file)
--- a/recipes/lua/lua5.1_5.1.4.bb
+++ b/recipes/lua/lua5.1_5.1.4.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 HOMEPAGE = "http://www.lua.org/"
 
 DEPENDS += "readline"
-PR = "r4"
+PR = "r5"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
            file://lua5.1.pc"
 S = "${WORKDIR}/lua-${PV}"
@@ -19,12 +19,6 @@ do_compile () {
        oe_runmake linux
 }
 
-do_stage () {
-       oe_libinstall -C src liblua ${STAGING_LIBDIR}/
-       install -d ${STAGING_INCDIR}/
-       install -m 0644 src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h ${STAGING_INCDIR}/
-}
-
 do_install () {
        oe_runmake \
                'INSTALL_TOP=${D}${prefix}' \
@@ -34,4 +28,5 @@ do_install () {
                'INSTALL_SHARE=${D}${datadir}/lua' \
                install
 }
-
+NATIVE_INSTALL_WORKS = 1
+BBCLASSEXTEND = "native"

diff --git a/recipes/lua/lua_5.0.2.bb b/recipes/lua/lua_5.0.2.bb
index bb989c0..a12ae99 100644 (file)
--- a/recipes/lua/lua_5.0.2.bb
+++ b/recipes/lua/lua_5.0.2.bb
@@ -1,7 +1,7 @@
 require lua.inc
 
 DEPENDS += "readline"
-PR = "r4"
+PR = "r5"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
           file://debian.patch;patch=1 \
           file://make.patch;patch=1 \
@@ -12,3 +12,5 @@ FILESPATH = "${FILE_DIRNAME}/lua-${PV}:${FILE_DIRNAME}/lua:${FILE_DIRNAME}/files
 
 require lua-build.inc
 inherit binconfig
+NATIVE_INSTALL_WORKS = 1
+BBCLASSEXTEND = "native"