Patchwork libsdl 1.2.14: fix packaging

login
register
mail settings
Submitter Koen Kooi
Date Dec. 18, 2011, 9:32 a.m.
Message ID <1324200731-10753-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/17195/
State New
Headers show

Comments

Koen Kooi - Dec. 18, 2011, 9:32 a.m.
For some reason the -config script was shipped in ${PN} leading to shlibs renaming issues:

What we want, and how meta-oe used to do it:
	libsdl-1.2-0_1.2.14-r0.0_armv7a.ipk

Current OE-core status:
	libsdl_1.2.14-r2_armv7a.ipk

With this commit we get both proper shlib renaming and the -dev package now has all the dev files

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-graphics/libsdl/libsdl_1.2.14.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Koen Kooi - Dec. 18, 2011, 9:43 a.m.
Op 18 dec. 2011, om 10:32 heeft Koen Kooi het volgende geschreven:

> For some reason the -config script was shipped in ${PN} leading to shlibs renaming issues:
> 
> What we want, and how meta-oe used to do it:
> 	libsdl-1.2-0_1.2.14-r0.0_armv7a.ipk
> 
> Current OE-core status:
> 	libsdl_1.2.14-r2_armv7a.ipk
> 
> With this commit we get both proper shlib renaming and the -dev package now has all the dev files
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

I had trouble finding something in OE-core that actually used libsdl, besides 2 tasks and qemu-native, which is why there are no PR bumps for recipes using the target package: there aren't any. The meta-oe story is different, I sent a patch to bump PR on the things that are broken in the angstrom feeds because of this.

regards,

Koen
Martin Jansa - Dec. 18, 2011, 9:50 a.m.
On Sun, Dec 18, 2011 at 10:32:11AM +0100, Koen Kooi wrote:
> For some reason the -config script was shipped in ${PN} leading to shlibs renaming issues:
> 
> What we want, and how meta-oe used to do it:
> 	libsdl-1.2-0_1.2.14-r0.0_armv7a.ipk
> 
> Current OE-core status:
> 	libsdl_1.2.14-r2_armv7a.ipk
> 
> With this commit we get both proper shlib renaming and the -dev package now has all the dev files
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-graphics/libsdl/libsdl_1.2.14.bb |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> index a28a88a..761995e 100644
> --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> @@ -15,7 +15,7 @@ PROVIDES = "virtual/libsdl"
>  DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib"
>  DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
>  
> -PR = "r2"
> +PR = "r3"
>  
>  SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
>             file://configure_tweak.patch \
> @@ -57,4 +57,6 @@ do_configure_prepend() {
>          export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
>  }
>  
> +FILES_${PN}-dev += "${bindir}/sdl-config""

Looks like extra quote                      ^

Cheers,

> +
>  BBCLASSEXTEND = "nativesdk"
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Koen Kooi - Dec. 18, 2011, 10:01 a.m.
Op 18 dec. 2011, om 10:50 heeft Martin Jansa het volgende geschreven:

> On Sun, Dec 18, 2011 at 10:32:11AM +0100, Koen Kooi wrote:
>> For some reason the -config script was shipped in ${PN} leading to shlibs renaming issues:
>> 
>> What we want, and how meta-oe used to do it:
>> 	libsdl-1.2-0_1.2.14-r0.0_armv7a.ipk
>> 
>> Current OE-core status:
>> 	libsdl_1.2.14-r2_armv7a.ipk
>> 
>> With this commit we get both proper shlib renaming and the -dev package now has all the dev files
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta/recipes-graphics/libsdl/libsdl_1.2.14.bb |    4 +++-
>> 1 files changed, 3 insertions(+), 1 deletions(-)
>> 
>> diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
>> index a28a88a..761995e 100644
>> --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
>> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
>> @@ -15,7 +15,7 @@ PROVIDES = "virtual/libsdl"
>> DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib"
>> DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
>> 
>> -PR = "r2"
>> +PR = "r3"
>> 
>> SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
>>            file://configure_tweak.patch \
>> @@ -57,4 +57,6 @@ do_configure_prepend() {
>>         export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
>> }
>> 
>> +FILES_${PN}-dev += "${bindir}/sdl-config""
> 
> Looks like extra quote                      ^

indeed and I have a better fix for the packaging problem, v2 coming up.

Patch

diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index a28a88a..761995e 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -15,7 +15,7 @@  PROVIDES = "virtual/libsdl"
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib"
 DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
            file://configure_tweak.patch \
@@ -57,4 +57,6 @@  do_configure_prepend() {
         export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
 }
 
+FILES_${PN}-dev += "${bindir}/sdl-config""
+
 BBCLASSEXTEND = "nativesdk"