Patchwork [CONSOLIDATED,PULL,17/20] xz: split out liblzma as seperate packages

login
register
mail settings
Submitter Saul Wold
Date March 6, 2012, 5:03 p.m.
Message ID <b00d6f957a3ac9bcdab9dda1e887ad36b3bab852.1331053126.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/22801/
State New
Headers show

Comments

Saul Wold - March 6, 2012, 5:03 p.m.
From: Koen Kooi <koen@dominion.thruhere.net>

As usual, this creates problems for upgrade paths, but splitting out the lib is worth the short term hassle

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-extended/xz/xz_5.0.3.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
Andreas Oberritter - March 6, 2012, 9:01 p.m.
On 06.03.2012 18:03, Saul Wold wrote:
> From: Koen Kooi <koen@dominion.thruhere.net>
> 
> As usual, this creates problems for upgrade paths, but splitting out the lib is worth the short term hassle

Sorry, if I'm missing the obvious, but how is this different than the
patch I submitted to do the same thing with bzip2 and libbz2, which got
rejected by Koen?

See http://patches.openembedded.org/patch/22015/ .

Regards,
Andreas

> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-extended/xz/xz_5.0.3.bb |    9 ++++++++-
>  1 files changed, 8 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-extended/xz/xz_5.0.3.bb b/meta/recipes-extended/xz/xz_5.0.3.bb
> index bae71ec..e8f96b6 100644
> --- a/meta/recipes-extended/xz/xz_5.0.3.bb
> +++ b/meta/recipes-extended/xz/xz_5.0.3.bb
> @@ -14,8 +14,15 @@ SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
>  SRC_URI[md5sum] = "fefe52f9ecd521de2a8ce38c21a27574"
>  SRC_URI[sha256sum] = "10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf"
>  
> -PR = "r0"
> +PR = "r1"
>  
>  inherit autotools gettext
>  
> +PACKAGES =+ "liblzma liblzma-dev liblzma-staticdev liblzma-dbg"
> +
> +FILES_liblzma = "${libdir}/liblzma*${SOLIBS}"
> +FILES_liblzma-dev = "${includedir}/lzma* ${libdir}/liblzma*${SOLIBSDEV} ${libdir}/liblzma.la ${libdir}/pkgconfig/liblzma.pc"
> +FILES_liblzma-staticdev = "${libdir}/liblzma.a"
> +FILES_liblzma-dbg = "${libdir}/.debug/liblzma*"
> +
>  BBCLASSEXTEND = "native"
Khem Raj - March 6, 2012, 10 p.m.
On Tue, Mar 6, 2012 at 1:01 PM, Andreas Oberritter <obi@opendreambox.org> wrote:
> On 06.03.2012 18:03, Saul Wold wrote:
>> From: Koen Kooi <koen@dominion.thruhere.net>
>>
>> As usual, this creates problems for upgrade paths, but splitting out the lib is worth the short term hassle
>
> Sorry, if I'm missing the obvious, but how is this different than the
> patch I submitted to do the same thing with bzip2 and libbz2, which got
> rejected by Koen?
>
> See http://patches.openembedded.org/patch/22015/ .
>

yes they are doing same things for different recipes. I think
now that we use OEBasicHash it should do rebuilds of dependencies
but for feeds it still needs the PR bumps that holds true for
both the recipes. It could be that one has less dependencies
than the other.

> Regards,
> Andreas
>
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>>  meta/recipes-extended/xz/xz_5.0.3.bb |    9 ++++++++-
>>  1 files changed, 8 insertions(+), 1 deletions(-)
>>
>> diff --git a/meta/recipes-extended/xz/xz_5.0.3.bb b/meta/recipes-extended/xz/xz_5.0.3.bb
>> index bae71ec..e8f96b6 100644
>> --- a/meta/recipes-extended/xz/xz_5.0.3.bb
>> +++ b/meta/recipes-extended/xz/xz_5.0.3.bb
>> @@ -14,8 +14,15 @@ SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
>>  SRC_URI[md5sum] = "fefe52f9ecd521de2a8ce38c21a27574"
>>  SRC_URI[sha256sum] = "10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf"
>>
>> -PR = "r0"
>> +PR = "r1"
>>
>>  inherit autotools gettext
>>
>> +PACKAGES =+ "liblzma liblzma-dev liblzma-staticdev liblzma-dbg"
>> +
>> +FILES_liblzma = "${libdir}/liblzma*${SOLIBS}"
>> +FILES_liblzma-dev = "${includedir}/lzma* ${libdir}/liblzma*${SOLIBSDEV} ${libdir}/liblzma.la ${libdir}/pkgconfig/liblzma.pc"
>> +FILES_liblzma-staticdev = "${libdir}/liblzma.a"
>> +FILES_liblzma-dbg = "${libdir}/.debug/liblzma*"
>> +
>>  BBCLASSEXTEND = "native"
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Koen Kooi - March 7, 2012, 5:55 a.m.
Op 6 mrt. 2012, om 22:01 heeft Andreas Oberritter het volgende geschreven:

> On 06.03.2012 18:03, Saul Wold wrote:
>> From: Koen Kooi <koen@dominion.thruhere.net>
>> 
>> As usual, this creates problems for upgrade paths, but splitting out the lib is worth the short term hassle
> 
> Sorry, if I'm missing the obvious, but how is this different than the
> patch I submitted to do the same thing with bzip2 and libbz2, which got
> rejected by Koen?

It's different because there's a matching patch to meta-oe that bumps the PR for affected packages. Squashfstools has its own internal lzma lib, so no linking problems in oe-core.

regards,

Koen


> 
> See http://patches.openembedded.org/patch/22015/ .
> 
> Regards,
> Andreas
> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta/recipes-extended/xz/xz_5.0.3.bb |    9 ++++++++-
>> 1 files changed, 8 insertions(+), 1 deletions(-)
>> 
>> diff --git a/meta/recipes-extended/xz/xz_5.0.3.bb b/meta/recipes-extended/xz/xz_5.0.3.bb
>> index bae71ec..e8f96b6 100644
>> --- a/meta/recipes-extended/xz/xz_5.0.3.bb
>> +++ b/meta/recipes-extended/xz/xz_5.0.3.bb
>> @@ -14,8 +14,15 @@ SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
>> SRC_URI[md5sum] = "fefe52f9ecd521de2a8ce38c21a27574"
>> SRC_URI[sha256sum] = "10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf"
>> 
>> -PR = "r0"
>> +PR = "r1"
>> 
>> inherit autotools gettext
>> 
>> +PACKAGES =+ "liblzma liblzma-dev liblzma-staticdev liblzma-dbg"
>> +
>> +FILES_liblzma = "${libdir}/liblzma*${SOLIBS}"
>> +FILES_liblzma-dev = "${includedir}/lzma* ${libdir}/liblzma*${SOLIBSDEV} ${libdir}/liblzma.la ${libdir}/pkgconfig/liblzma.pc"
>> +FILES_liblzma-staticdev = "${libdir}/liblzma.a"
>> +FILES_liblzma-dbg = "${libdir}/.debug/liblzma*"
>> +
>> BBCLASSEXTEND = "native"
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Paul Menzel - March 7, 2012, 9:45 a.m.
Dear Saul,


there is a typo in the commit summary: sep*a*rate.


Thanks,

Paul

Patch

diff --git a/meta/recipes-extended/xz/xz_5.0.3.bb b/meta/recipes-extended/xz/xz_5.0.3.bb
index bae71ec..e8f96b6 100644
--- a/meta/recipes-extended/xz/xz_5.0.3.bb
+++ b/meta/recipes-extended/xz/xz_5.0.3.bb
@@ -14,8 +14,15 @@  SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
 SRC_URI[md5sum] = "fefe52f9ecd521de2a8ce38c21a27574"
 SRC_URI[sha256sum] = "10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf"
 
-PR = "r0"
+PR = "r1"
 
 inherit autotools gettext
 
+PACKAGES =+ "liblzma liblzma-dev liblzma-staticdev liblzma-dbg"
+
+FILES_liblzma = "${libdir}/liblzma*${SOLIBS}"
+FILES_liblzma-dev = "${includedir}/lzma* ${libdir}/liblzma*${SOLIBSDEV} ${libdir}/liblzma.la ${libdir}/pkgconfig/liblzma.pc"
+FILES_liblzma-staticdev = "${libdir}/liblzma.a"
+FILES_liblzma-dbg = "${libdir}/.debug/liblzma*"
+
 BBCLASSEXTEND = "native"