fix staging (this time for real)

sometimes oebuild is too fault-tolerant, i.e. commands in the shell can just fail but it continues the build.

BKrev: 400ec4adDqnrxOLYkvgtnLiQwxzodA

diff --git a/libsdl/libsdl-image_1.2.3.oe b/libsdl/libsdl-image_1.2.3.oe
index e69de29..ba8a080 100644 (file)
--- a/libsdl/libsdl-image_1.2.3.oe
+++ b/libsdl/libsdl-image_1.2.3.oe
@@ -0,0 +1,16 @@
+SECTION="NET"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+RDEPENDS=libc6 libjpeg62 libpng3 zlib1g libsdl
+DEPENDS=virtual/libc base/zlib base/libpng base/jpeg base/libsdl
+
+SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz
+S = ${WORKDIR}/SDL_image-${PV}
+
+inherit autotools libtool
+
+do_stage() {
+       oe_soinstall .libs/libSDL_image-1.2.so.0.1.2 ${STAGING_LIBDIR}
+       install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h
+}
+

diff --git a/libsdl/libsdl-mixer_1.2.5.oe b/libsdl/libsdl-mixer_1.2.5.oe
index e69de29..9f5605b 100644 (file)
--- a/libsdl/libsdl-mixer_1.2.5.oe
+++ b/libsdl/libsdl-mixer_1.2.5.oe
@@ -0,0 +1,16 @@
+SECTION="NET"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+RDEPENDS=libc6 libsdl
+DEPENDS=virtual/libc base/libsdl
+
+SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz
+S = ${WORKDIR}/SDL_mixer-${PV}
+
+inherit autotools libtool
+
+do_stage() {
+       oe_soinstall .libs/libSDL_mixer-1.2.so.0.2.3 ${STAGING_LIBDIR}
+       install -m 0644 SDL_mixer.h ${STAGING_INCDIR}/SDL/SDL_mixer.h
+}
+

diff --git a/libsdl/libsdl-net_1.2.5.oe b/libsdl/libsdl-net_1.2.5.oe
index e69de29..7ed47a0 100644 (file)
--- a/libsdl/libsdl-net_1.2.5.oe
+++ b/libsdl/libsdl-net_1.2.5.oe
@@ -0,0 +1,16 @@
+SECTION="NET"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+RDEPENDS=libc6 libsdl
+DEPENDS=virtual/libc base/libsdl
+
+SRC_URI=http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz
+S = ${WORKDIR}/SDL_net-${PV}
+
+inherit autotools libtool
+
+do_stage() {
+       oe_soinstall .libs/libSDL_net-1.2.so.0.0.5 ${STAGING_LIBDIR}
+       install -m 0644 SDL_net.h ${STAGING_INCDIR}/SDL/SDL_net.h
+}
+

diff --git a/libsdl/smpeg_cvs.oe b/libsdl/smpeg_cvs.oe
index 21eebf2..1caaf1f 100644 (file)
--- a/libsdl/smpeg_cvs.oe
+++ b/libsdl/smpeg_cvs.oe
@@ -12,7 +12,7 @@ inherit autotools libtool
 EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x --without-gtk"
 
 do_stage() {
-       oe_soinstall libsmpeg-0.4.so.0.1.4 ${STAGING_LIBDIR}
+       oe_soinstall .libs/libsmpeg-0.4.so.0.1.4 ${STAGING_LIBDIR}
 
        for f in `find . -name "MPEG*.h"`
        do