Skip to contentSkip to conversation

lua5.1: Adopt new staging policy

PATCH In review Michael Stanger 1 participant 2 messages Mar 15, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lua5.1: Adopt new staging policy

Sorry about earlier thread-hijacking...

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

---

recipes/lua/lua5.1-native_5.1.4.bb |   11 -----------
recipes/lua/lua5.1_5.1.4.bb        |   10 +++-------
2 files changed, 3 insertions(+), 18 deletions(-)

delete mode 100644 recipes/lua/lua5.1-native_5.1.4.bb

(quoted diff) +0 -0

b/recipes/lua/lua5.1-native_5.1.4.bb
deleted file mode 100644
index 35afb55..0000000

recipes/lua/lua5.1-native_5.1.4.bb deleted +0 -9
@@ -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}/
-}
-

recipes/lua/lua5.1_5.1.4.bb +0 -0
index 8041def..e4a3c82 100644
@@ -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,6 @@ do_install () {
               'INSTALL_SHARE=${D}${datadir}/lua' \
               install
}

+NATIVE_INSTALL_WORKS = 1

+BBCLASSEXTEND = "native"
--
1.6.3.3

=======================================================================
This email, including any attachments, is only for the intended addressee. It is subject to copyright, is confidential and may be the subject of legal or other privilege, none of which is waived or lost by reason of this transmission.
If the receiver is not the intended addressee, please accept our apologies, notify us by return, delete all copies and perform no other act on the email.
Unfortunately, we cannot warrant that the email has not been altered or corrupted during transmission.
=======================================================================

#1 lore raw

Hi,

I noted that my patch is cut-off in patchwork,
does this matter and/or why did it happen?

Cheers,
Michael

Quoted 96 lines · Michael Stanger

Sorry about earlier thread-hijacking...

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

---

recipes/lua/lua5.1-native_5.1.4.bb |   11 -----------
recipes/lua/lua5.1_5.1.4.bb        |   10 +++-------
2 files changed, 3 insertions(+), 18 deletions(-)

delete mode 100644 recipes/lua/lua5.1-native_5.1.4.bb

recipes/lua/lua5.1-native_5.1.4.bb deleted +0 -9
deleted file mode 100644
index 35afb55..0000000
@@ -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}/

recipes/lua/lua5.1-native_5.1.4.bb deleted +0 -2
-}
-
recipes/lua/lua5.1_5.1.4.bb +0 -0
index 8041def..e4a3c82 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT"

HOMEPAGE = "http://www.lua.org/"

DEPENDS += "readline"

recipes/lua/lua5.1_5.1.4.bb +1 -1
-PR = "r4"
+PR = "r5"
SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
           file://lua5.1.pc"

S = "${WORKDIR}/lua-${PV}"

recipes/lua/lua5.1_5.1.4.bb +0 -4
@@ -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}/

recipes/lua/lua5.1_5.1.4.bb +0 -2
-}
-
do_install () {
       oe_runmake \
               'INSTALL_TOP=${D}${prefix}' \
recipes/lua/lua5.1_5.1.4.bb +2 -0
@@ -34,4 +28,6 @@ do_install () {
               'INSTALL_SHARE=${D}${datadir}/lua' \
               install
 }
+NATIVE_INSTALL_WORKS = 1
 
+BBCLASSEXTEND = "native"
Signature · 28 lines
1.6.3.3


=======================================================================
This email, including any attachments, is only for the intended
addressee.  It is subject to copyright, is confidential and may be
the subject of legal or other privilege, none of which is waived or
lost by reason of this transmission.
If the receiver is not the intended addressee, please accept our
apologies, notify us by return, delete all copies and perform no
other act on the email.
Unfortunately, we cannot warrant that the email has not been
altered or corrupted during transmission.
=======================================================================


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

______________________________________________________________________
This email has been scanned by the MessageLabs Email Security System.
For more information please visit http://www.messagelabs.com/email ______________________________________________________________________

______________________________________________________________________
This email has been scanned by the MessageLabs Email Security System.
For more information please visit http://www.messagelabs.com/email ______________________________________________________________________

=======================================================================
This email, including any attachments, is only for the intended addressee. It is subject to copyright, is confidential and may be the subject of legal or other privilege, none of which is waived or lost by reason of this transmission.
If the receiver is not the intended addressee, please accept our apologies, notify us by return, delete all copies and perform no other act on the email.
Unfortunately, we cannot warrant that the email has not been altered or corrupted during transmission.
=======================================================================