Re: [PATCH 8/8] xz: add xz package

[Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3590 bytes --]

On Thu, Feb 11, 2010 at 12:53:01PM +0000, Phil Blundell wrote:
>On Wed, 2010-02-10 at 21:13 +0100, Bernhard Reutner-Fischer wrote:
>> xz is the lzma successor
>> tested with automake-1.11.1, autoconf-2.65
>
>Thanks for the patch.  I think this could use a little cleanup before it
>is committed, though; please see below.

I flagged it as RFC in the summary, so yes, like the summary said, still
needs love..
>
>> index 0000000..bc5e9ff
>> --- /dev/null
>> +++ b/recipes/xz/xz-native.inc
>> @@ -0,0 +1,2 @@
>> +inherit native
>> +require xz_${PV}.bb
>
>You could consider using BBCLASSEXTEND to eliminate the need for this
>separate recipe.

Thanks for that, good thing. This will trim down alot on the number of
recipes in the tree!
>
>> diff --git a/recipes/xz/xz-native_4.999.9beta.bb b/recipes/xz/xz-native_4.999.9beta.bb
>> new file mode 100644
>> index 0000000..c4f0da9
>> --- /dev/null
>> +++ b/recipes/xz/xz-native_4.999.9beta.bb
>> @@ -0,0 +1,3 @@
>> +PV = "4.999.9beta"
>> +
>> +require xz-native.inc
>
>Is it necessary to set PV here?  I would have thought base.bbclass would
>infer that same value from the filename.

It was needed since above xz-native.inc had
require xz_${PV}.inc
in it, and if i didn't set PV before it, it defaulted to 1.0, breaking
horribly for obvious reasons. BBCLASSEXTEND nullifies this. Ditched.
>
>> diff --git a/recipes/xz/xz-native_git.bb b/recipes/xz/xz-native_git.bb
>> new file mode 100644
>> index 0000000..006b9d7
>> --- /dev/null
>> +++ b/recipes/xz/xz-native_git.bb
>> @@ -0,0 +1,7 @@
>> +# XZ_BASE should be the latest released version of xz.
>> +# It can be set in the distro file.
>> +#XZ_BASE ?= "4.999.9"
>> +#SRCREV = "HEAD"
>> +#PV = "${XZ_BASE}+gitr${SRCREV}"
>
>Please don't leave this sort of stuff commented out in the file.  If
>it's not needed, just delete those lines.

dropped.
>
>> +#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xz-${PV}"
>
>Likewise for that.

ditto (RFC..)
>
>> --- /dev/null
>> +++ b/recipes/xz/xz_4.999.9beta.bb
>> @@ -0,0 +1,8 @@
>> +PV = "4.999.9beta"
>
>See above regarding PV.
>
>> +
>> +require xz.inc
>> +PR = "${INC_PR}.0"
>> +SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz"
>
>Wouldn't that SRC_URI be better in the .inc file?  Presumably this is
>the correct URI for everything except the _git version.

It would indeed. Can i somehow say
file1: SRC="http:://one.ext/one.tar.xz"
       SRC[md5sum]=md5
       SRC[sha256sum]=sha256
       or, perhaps it's the basename if there was no ;name=
       SRC[one.tar.xz.md5sum]=md5
       SRC[one.tar.xz.sha256sum]=sha256
file2: SRC="git://two"
inc: FOO_SRC ?= SRC
     SRC_URI += FOO_SRC

?
>
>> +SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161"
>> +SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c"
>> +EXTRA_OECONF = "--enable-shared"
>
>Likewise for that EXTRA_OECONF, I would have thought that would also
>belong in the .inc really.

the EXTRA_OECONF can. Done.
Revised patch is attached, but:
it works for the 4.999beta9 version (literally, since that's how
upstream calls the tarball; Is this a problem with the version-naming
like Koon indicates?) but not if you
PREFERRED_VERSION_xz = "git"
PREFERRED_VERSION_xz-native = "git"
and then bake xz-native:
NOTE: Task failed: Fetch failed: [snip]; git read-tree 1 failed with
signal 128, output:
fatal: Not a valid object name 1

since: $ ls -a ../sources/git/ctrl.tukaani.org.xz.git/
.  ..  1  .git

"1" ?!

[-- Attachment #2: 0007-xz-add-xz-package.00b.patch --]
[-- Type: text/x-diff, Size: 1265 bytes --]

diff --git a/recipes/xz/xz.inc b/recipes/xz/xz.inc
new file mode 100644
index 0000000..cc4f966
--- /dev/null
+++ b/recipes/xz/xz.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "XZ Utils is free general-purpose data compression software with high compression ratio.  XZ Utils are the successor to LZMA Utils."
+SECTION = "console/utils"
+LICENSE = "Public Domain"
+INC_PR = "r0"
+S ?= "${WORKDIR}/xz-${PV}"
+EXTRA_OECONF = "--enable-shared"
+BBCLASSEXTEND = "native"
+
+inherit autotools
diff --git a/recipes/xz/xz_4.999.9beta.bb b/recipes/xz/xz_4.999.9beta.bb
new file mode 100644
index 0000000..8733023
--- /dev/null
+++ b/recipes/xz/xz_4.999.9beta.bb
@@ -0,0 +1,5 @@
+require xz.inc
+PR = "${INC_PR}.0"
+SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz"
+SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161"
+SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c"
diff --git a/recipes/xz/xz_git.bb b/recipes/xz/xz_git.bb
new file mode 100644
index 0000000..8950a08
--- /dev/null
+++ b/recipes/xz/xz_git.bb
@@ -0,0 +1,6 @@
+S = "${WORKDIR}/git"
+require xz.inc
+PV = "git"
+PR = "${INC_PR}.0"
+SRC_URI = "git://ctrl.tukaani.org/xz.git;branch=master;protocol=git"
+DEFAULT_PREFERENCE = "-1"