[PATCH][for-denzil 1/8] opkg-utils: bump SRCREV for Packages cache fix and other fixes

[PATCH][for-denzil 1/8] opkg-utils: bump SRCREV for Packages cache fix and other fixes

[Koen Kooi]

From: Martin Jansa <martin.jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../opkg-utils/opkg-utils/add-license-field.patch  |   39 -----------
 .../opkg-utils/arfile_header_split.patch           |   27 --------
 .../opkg-utils/index-ignore-filenotfound.patch     |   73 --------------------
 .../opkg-utils/opkg-utils/mtime-int.patch          |   30 --------
 .../opkg-utils/opkg-utils/shebang.patch            |   46 ------------
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    7 +-
 6 files changed, 1 insertion(+), 221 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch
 delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
 delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
 delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
 delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch
deleted file mode 100644
index 0d33459..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Add knowledge about License field in ipk headers
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: opkg-utils/opkg.py
-===================================================================
---- opkg-utils.orig/opkg.py	2010-11-01 04:52:35.000000000 -0700
-+++ opkg-utils/opkg.py	2011-07-13 15:18:03.900037344 -0700
-@@ -145,6 +145,7 @@
-         self.priority = None
-         self.tags = None
-         self.fn = fn
-+        self.license = None
- 
-         if fn:
-             # see if it is deb format
-@@ -319,6 +320,12 @@
-     def get_section(self, section):
-         return self.section
- 
-+    def set_license(self, license):
-+        self.license = license
-+
-+    def get_license(self, license):
-+        return self.license
-+
-     def get_file_list(self):
-         if not self.fn:
-             return []
-@@ -425,6 +432,7 @@
-         if self.description: out = out + "Description: %s\n" % (self.description)
-         if self.oe: out = out + "OE: %s\n" % (self.oe)
-         if self.homepage: out = out + "HomePage: %s\n" % (self.homepage)
-+        if self.license: out = out + "License: %s\n" % (self.license)
-         if self.priority: out = out + "Priority: %s\n" % (self.priority)
-         if self.tags: out = out + "Tags: %s\n" % (self.tags)
-         out = out + "\n"
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
deleted file mode 100644
index b679f8b..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Scott Anderson <o2e@saaworld.com>
-Subject: ipkg-utils: Make arfile.py handle six digit UIDs
-    
-    Essentially, the problem is that arfile.py is splitting the ar header with
-    white-space instead of fixed-width fields, so two fields would get treated
-    as a single field.  This makes things better than before as it now honors
-    the fixed field widths.
-    
-Upstream-Status: Pending (there is no upstream after openmoko imploded)
-
---- ipkg-utils/arfile.py.orig	2010-09-29 13:38:15.000000000 -0700
-+++ ipkg-utils/arfile.py	2010-10-01 16:06:00.000000000 -0700
-@@ -74,7 +74,12 @@
-             if l == "\n":
-                 l = self.f.readline()
-                 if not l: break
-             l = l.replace('`', '')
--            descriptor = l.split()
-+            # Field lengths from /usr/include/ar.h:
-+            ar_field_lens = [ 16, 12, 6, 6, 8, 10, 2 ]
-+            descriptor = []
-+            for field_len in ar_field_lens:
-+                descriptor.append(l[:field_len].strip())
-+                l = l[field_len:]
- #            print descriptor
-             size = int(descriptor[5])
-             memberName = descriptor[0][:-1]
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
deleted file mode 100644
index f0f0fcf..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-If we're building an image and some package rebuilds while this is happening
-some package can be removed/added to the ipk deploy directory. The image will
-not depend on this package so we can safely ignore these cases rather than 
-error out.
-
-RP - 26/8/09
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: opkg-utils/opkg-make-index
-===================================================================
---- opkg-utils.orig/opkg-make-index	2009-08-26 17:21:26.000000000 +0100
-+++ opkg-utils/opkg-make-index	2009-08-27 16:11:22.000000000 +0100
-@@ -96,6 +96,7 @@
- files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb')
- files.sort()
- for filename in files:
-+  try:
-      basename = os.path.basename(filename)
-      pkg = None
-      fnameStat = os.stat(filename)
-@@ -130,6 +131,12 @@
-                to_morgue(basename)
-           if opt_s:
-                print filename
-+  except OSError:
-+      sys.stderr.write("Package %s disappeared on us!\n" % (filename))
-+      continue
-+  except IOError:
-+      sys.stderr.write("Package %s disappeared on us!\n" % (filename))
-+      continue
- 
- pkgsStampsFile = open(stamplist_filename, "w")
- for f in pkgsStamps.keys():
-@@ -148,6 +155,7 @@
- names = packages.packages.keys()
- names.sort()
- for name in names:
-+  try:
-      pkg = packages.packages[name]
-      if locales_dir and pkg.depends:
-          depends = string.split(pkg.depends, ',')
-@@ -165,6 +173,13 @@
-      if (verbose):
-           sys.stderr.write("Writing info for package %s\n" % (pkg.package,))
-      print pkg
-+  except OSError:
-+      sys.stderr.write("Package %s disappeared on us!\n" % (name))
-+      continue
-+  except IOError:
-+      sys.stderr.write("Package %s disappeared on us!\n" % (name))
-+      continue
-+
- if packages_filename:
-      sys.stdout.close()
-      sys.stdout = old_stdout
-@@ -197,7 +197,15 @@
- names = packages.packages.keys()
- names.sort()
- for name in names:
--     for fn in packages[name].get_file_list():
-+     try:
-+          fnlist = packages[name].get_file_list()
-+     except OSError, e:
-+          sys.stderr.write("Package %s disappeared on us!\n" % (name))
-+          continue
-+     except IOError, e:
-+          sys.stderr.write("Package %s disappeared on us!\n" % (name))
-+          continue
-+     for fn in fnlist:
-           (h,t) = os.path.split(fn)
-           if not t: continue
-           if not files.has_key(t): files[t] = name+':'+fn
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
deleted file mode 100644
index 483a62a..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Convert mtime to int before comparing it
-
-The st_mtime attribute (which is a float) is compared against a value
-from the timestamp database, which was stored as an integer there.
-
-When working on a filesystem with precise timestamps the comparision
-will fail nearly everytime hence.
-
-Although it might be possible to enhance the database to store the
-fractional part too, this will complicate things more than we would
-gain by this change.
-
-Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
-
-Upstream-Status: Pending
-(Contacting the original author, no response yet.)
-
-Index: opkg-utils/opkg-make-index
-===================================================================
---- opkg-utils.orig/opkg-make-index
-+++ opkg-utils/opkg-make-index
-@@ -100,7 +100,7 @@ for filename in files:
-      pkg = None
-      fnameStat = os.stat(filename)
-      if old_pkg_hash.has_key(basename):
--          if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]:
-+          if pkgsStamps.has_key(basename) and int(fnameStat.st_mtime) == pkgsStamps[basename]:
-             if (verbose):
-                sys.stderr.write("Found %s in Packages\n" % (filename,))
-             pkg = old_pkg_hash[basename]
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
deleted file mode 100644
index f6a2ef9..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Use python via the PATH, rather than hardcoding /usr/bin/python
-
-Upstream-Status: Pending
-
-Signed-off-by: Christopher Larson <kergoth@gmail.com>
-
---- opkg-utils.orig/opkg-list-fields
-+++ opkg-utils/opkg-list-fields
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- 
- import sys, opkg
- 
---- opkg-utils.orig/opkg-make-index
-+++ opkg-utils/opkg-make-index
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- 
- import sys, os, posixpath
- from glob import glob
---- opkg-utils.orig/opkg-show-deps
-+++ opkg-utils/opkg-show-deps
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- 
- import sys, os, posixpath
- from glob import glob
---- opkg-utils.orig/opkg-unbuild
-+++ opkg-utils/opkg-unbuild
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- 
- import sys, os, re
- 
---- opkg-utils.orig/opkg-update-index
-+++ opkg-utils/opkg-update-index
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.1
-+#!/usr/bin/env python
- 
- import sys, os
- from glob import glob
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 4fe4038..1996c75 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -6,16 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
 RDEPENDS_${PN} = "python"
 RDEPENDS_${PN}_virtclass-native = ""
-SRCREV = "16665959c330b5958c0f0f4624a9ca7f823f98de"
+SRCREV = "44df9dd3dc411ca1255cb4b23bde7eb71aed4778"
 PV = "0.1.8+git${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \
-           file://index-ignore-filenotfound.patch \
-           file://mtime-int.patch \
-           file://add-license-field.patch \
-           file://arfile_header_split.patch \
-           file://shebang.patch \
            "
 
 S = "${WORKDIR}/git"
-- 
1.7.10

[PATCH][for-denzil 2/8] curl: enable ssl support

[Koen Kooi]

From: Saul Wold <sgw@linux.intel.com>

This patch enables ssl support for curl to allow git to clone from
https / ssl sites. We do not want to enable gnutls for native or
nativesdk, as it adds additional dependency and increase build time

[YOCTO #2532]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/curl/curl_7.24.0.bb |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.24.0.bb
index 12e95c9..f9dce7d 100644
--- a/meta/recipes-support/curl/curl_7.24.0.bb
+++ b/meta/recipes-support/curl/curl_7.24.0.bb
@@ -5,10 +5,10 @@ SECTION = "console/network"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
 
-DEPENDS = "zlib gnutls"
-DEPENDS_virtclass-native = "zlib-native"
-DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-PR = "r0"
+DEPENDS = "zlib gnutls openssl"
+DEPENDS_virtclass-native = "zlib-native openssl-native"
+DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk"
+PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://noldlibpath.patch \
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
 inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
-                --without-ssl \
+		--with-ssl \
                 --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \
-- 
1.7.10

[PATCH][for-denzil 3/8] curl: Use gnutls for target and openssl for native

[Koen Kooi]

From: Saul Wold <sgw@linux.intel.com>

Since gnutls is available on the target use it, but we do not build gnutls for
the native side as it adds too many dependecies, so use openssl.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/curl/curl_7.24.0.bb |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.24.0.bb
index f9dce7d..2c5369c 100644
--- a/meta/recipes-support/curl/curl_7.24.0.bb
+++ b/meta/recipes-support/curl/curl_7.24.0.bb
@@ -5,10 +5,10 @@ SECTION = "console/network"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
 
-DEPENDS = "zlib gnutls openssl"
+DEPENDS = "zlib gnutls"
 DEPENDS_virtclass-native = "zlib-native openssl-native"
-DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk"
-PR = "r1"
+DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
+PR = "r2"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://noldlibpath.patch \
@@ -20,7 +20,6 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
 inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
-		--with-ssl \
                 --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \
@@ -28,9 +27,9 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 ${CURLGNUTLS} \
 		"
 
-CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../"
-CURLGNUTLS_virtclass-native = "--without-gnutls"
-CURLGNUTLS_virtclass-nativesdk = "--without-gnutls"
+CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl"
+CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl"
+CURLGNUTLS_virtclass-nativesdk = "--without-gnutls --without-ssl"
 
 do_configure_prepend() {
 	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
-- 
1.7.10

[PATCH][for-denzil 4/8] xz: updated to version 5.1.1alpha

[Koen Kooi]

From: Valentin Popa <valentin.popa@intel.com>

The licenses are the same, only some white spaces added/removed.

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-extended/xz/xz_5.0.3.bb      |   28 ----------------------------
 meta/recipes-extended/xz/xz_5.1.1alpha.bb |   28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 meta/recipes-extended/xz/xz_5.0.3.bb
 create mode 100644 meta/recipes-extended/xz/xz_5.1.1alpha.bb

diff --git a/meta/recipes-extended/xz/xz_5.0.3.bb b/meta/recipes-extended/xz/xz_5.0.3.bb
deleted file mode 100644
index e8f96b6..0000000
--- a/meta/recipes-extended/xz/xz_5.0.3.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "utils for managing LZMA compressed files"
-HOMEPAGE = "http://tukaani.org/xz/"
-SECTION = "base"
-
-LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
-                    file://COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe \
-                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LGPLv2.1;md5=fbc093901857fcd118f065f900982c24 \
-                    file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 "
-
-SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "fefe52f9ecd521de2a8ce38c21a27574"
-SRC_URI[sha256sum] = "10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf"
-
-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"
diff --git a/meta/recipes-extended/xz/xz_5.1.1alpha.bb b/meta/recipes-extended/xz/xz_5.1.1alpha.bb
new file mode 100644
index 0000000..7fa7177
--- /dev/null
+++ b/meta/recipes-extended/xz/xz_5.1.1alpha.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "utils for managing LZMA compressed files"
+HOMEPAGE = "http://tukaani.org/xz/"
+SECTION = "base"
+
+LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
+                    file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
+                    file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 "
+
+SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "bb24436fa12780808e1c142980484104"
+SRC_URI[sha256sum] = "54e59a83690a4a0ec88a7d7c3bdef90c6b196c892a93463863c71c24fe87951a"
+
+PR = "r0"
+
+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"
-- 
1.7.10

[PATCH][for-denzil 5/8] xz: update to 5.1.2alpha

[Koen Kooi]

This contains bugfixes from the 5.0.3 and 5.0.4 releases

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/xz/xz_5.1.1alpha.bb |   28 ----------------------------
 meta/recipes-extended/xz/xz_5.1.2alpha.bb |   25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 meta/recipes-extended/xz/xz_5.1.1alpha.bb
 create mode 100644 meta/recipes-extended/xz/xz_5.1.2alpha.bb

diff --git a/meta/recipes-extended/xz/xz_5.1.1alpha.bb b/meta/recipes-extended/xz/xz_5.1.1alpha.bb
deleted file mode 100644
index 7fa7177..0000000
--- a/meta/recipes-extended/xz/xz_5.1.1alpha.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "utils for managing LZMA compressed files"
-HOMEPAGE = "http://tukaani.org/xz/"
-SECTION = "base"
-
-LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
-                    file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
-                    file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 "
-
-SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "bb24436fa12780808e1c142980484104"
-SRC_URI[sha256sum] = "54e59a83690a4a0ec88a7d7c3bdef90c6b196c892a93463863c71c24fe87951a"
-
-PR = "r0"
-
-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"
diff --git a/meta/recipes-extended/xz/xz_5.1.2alpha.bb b/meta/recipes-extended/xz/xz_5.1.2alpha.bb
new file mode 100644
index 0000000..9d68720
--- /dev/null
+++ b/meta/recipes-extended/xz/xz_5.1.2alpha.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "utils for managing LZMA compressed files"
+HOMEPAGE = "http://tukaani.org/xz/"
+SECTION = "base"
+
+LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
+                    file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
+                    file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 "
+
+SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
+SRC_URI[md5sum] = "9bad1e249537ce69b206815cf28ca87b"
+SRC_URI[sha256sum] = "70e792d2a67cfbb8f2dffd0feab6ca6e5a4a618d65070fb44a367629d1ba94e5"
+
+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"
-- 
1.7.10

[PATCH][for-denzil 6/8] image_types.bbclass: Fix COMPRESS_CMD for xz to redirect compressed data to file

[Koen Kooi]

From: Andrei Gherzan <andrei@gherzan.ro>

Having -c modifier makes xz to output the compressed data to stdout. In this
way the needed data will be in the do_rootfs log.
Redirect data to ${IMAGE_NAME}.rootfs.${type}.xz .

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/image_types.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index b590ae1..007c8a5 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -215,7 +215,7 @@ COMPRESSIONTYPES = "gz bz2 lzma xz"
 COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}"
 COMPRESS_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.gz"
 COMPRESS_CMD_bz2 = "bzip2 -f -k ${IMAGE_NAME}.rootfs.${type}"
-COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type}"
+COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.xz"
 COMPRESS_DEPENDS_lzma = "xz-native"
 COMPRESS_DEPENDS_gz = ""
 COMPRESS_DEPENDS_bz2 = ""
-- 
1.7.10

[PATCH][for-denzil 7/8] image_types.bbclass: Add XZ variable to set number of threads to be used while compressing

[Koen Kooi]

From: Andrei Gherzan <andrei@gherzan.ro>

Default this variable to 0. This will make xz use as many threads as there are CPU
cores on the system.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/image_types.bbclass |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 007c8a5..258be63 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -118,6 +118,7 @@ def imagetypes_getdepends(d):
 
 XZ_COMPRESSION_LEVEL ?= "-e -9"
 XZ_INTEGRITY_CHECK ?= "crc32"
+XZ_THREADS ?= "-T 0"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 -n ${EXTRA_IMAGECMD}"
 IMAGE_CMD_sum.jffs2 = "${IMAGE_CMD_jffs2} && sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
@@ -215,7 +216,7 @@ COMPRESSIONTYPES = "gz bz2 lzma xz"
 COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}"
 COMPRESS_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.gz"
 COMPRESS_CMD_bz2 = "bzip2 -f -k ${IMAGE_NAME}.rootfs.${type}"
-COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.xz"
+COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.xz"
 COMPRESS_DEPENDS_lzma = "xz-native"
 COMPRESS_DEPENDS_gz = ""
 COMPRESS_DEPENDS_bz2 = ""
-- 
1.7.10

[PATCH][for-denzil 8/8] image_types.bbclass: Default XZ_COMPRESSION_LEVEL to -e -6

[Koen Kooi]

From: Andrei Gherzan <andrei@gherzan.ro>

Having XZ_COMPRESSION_LEVEL on -e -9 and -T 0 will make xz eat more
than 6Gb memory. Reduce this to -6 to make xz to use about 471Mb
on the tested machine.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/image_types.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 258be63..8869a5e 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -116,7 +116,7 @@ def imagetypes_getdepends(d):
     return depstr
 
 
-XZ_COMPRESSION_LEVEL ?= "-e -9"
+XZ_COMPRESSION_LEVEL ?= "-e -6"
 XZ_INTEGRITY_CHECK ?= "crc32"
 XZ_THREADS ?= "-T 0"
 
-- 
1.7.10

Re: [PATCH][for-denzil 1/8] opkg-utils: bump SRCREV for Packages cache fix and other fixes

[Martin Jansa]

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

On Tue, Aug 07, 2012 at 09:44:41AM +0200, Koen Kooi wrote:
> From: Martin Jansa <martin.jansa@gmail.com>
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  .../opkg-utils/opkg-utils/add-license-field.patch  |   39 -----------
>  .../opkg-utils/arfile_header_split.patch           |   27 --------
>  .../opkg-utils/index-ignore-filenotfound.patch     |   73 --------------------
>  .../opkg-utils/opkg-utils/mtime-int.patch          |   30 --------
>  .../opkg-utils/opkg-utils/shebang.patch            |   46 ------------
>  meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    7 +-
>  6 files changed, 1 insertion(+), 221 deletions(-)
>  delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch
>  delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
>  delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
>  delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
>  delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index 4fe4038..1996c75 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -6,16 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
>                      file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
>  RDEPENDS_${PN} = "python"
>  RDEPENDS_${PN}_virtclass-native = ""
> -SRCREV = "16665959c330b5958c0f0f4624a9ca7f823f98de"
> +SRCREV = "44df9dd3dc411ca1255cb4b23bde7eb71aed4778"

Better to use latest for this (only 3 commits, 2 of them fixing
python-2.6)

>  PV = "0.1.8+git${SRCPV}"
>  PR = "r1"
>  
>  SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \
> -           file://index-ignore-filenotfound.patch \
> -           file://mtime-int.patch \
> -           file://add-license-field.patch \
> -           file://arfile_header_split.patch \
> -           file://shebang.patch \
>             "
>  
>  S = "${WORKDIR}/git"
> -- 
> 1.7.10
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH][for-denzil 1/8] opkg-utils: bump SRCREV for Packages cache fix and other fixes

[Koen Kooi]

Op 7 aug. 2012, om 10:17 heeft Martin Jansa <martin.jansa@gmail.com> het volgende geschreven:

> On Tue, Aug 07, 2012 at 09:44:41AM +0200, Koen Kooi wrote:
>> From: Martin Jansa <martin.jansa@gmail.com>
>> 
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> .../opkg-utils/opkg-utils/add-license-field.patch  |   39 -----------
>> .../opkg-utils/arfile_header_split.patch           |   27 --------
>> .../opkg-utils/index-ignore-filenotfound.patch     |   73 --------------------
>> .../opkg-utils/opkg-utils/mtime-int.patch          |   30 --------
>> .../opkg-utils/opkg-utils/shebang.patch            |   46 ------------
>> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    7 +-
>> 6 files changed, 1 insertion(+), 221 deletions(-)
>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch
>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
>> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>> index 4fe4038..1996c75 100644
>> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>> @@ -6,16 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
>>                     file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
>> RDEPENDS_${PN} = "python"
>> RDEPENDS_${PN}_virtclass-native = ""
>> -SRCREV = "16665959c330b5958c0f0f4624a9ca7f823f98de"
>> +SRCREV = "44df9dd3dc411ca1255cb4b23bde7eb71aed4778"
> 
> Better to use latest for this (only 3 commits, 2 of them fixing
> python-2.6)

Should I cherry-pick them from master to keep history or just make a single, new update to latest SRCREV for the denzil branch?

regards,

Koen

Re: [PATCH][for-denzil 1/8] opkg-utils: bump SRCREV for Packages cache fix and other fixes

[Scott Garman]

On 08/07/2012 01:19 AM, Koen Kooi wrote:
>
> Op 7 aug. 2012, om 10:17 heeft Martin Jansa <martin.jansa@gmail.com> het volgende geschreven:
>
>> On Tue, Aug 07, 2012 at 09:44:41AM +0200, Koen Kooi wrote:
>>> From: Martin Jansa <martin.jansa@gmail.com>
>>>
>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>> ---
>>> .../opkg-utils/opkg-utils/add-license-field.patch  |   39 -----------
>>> .../opkg-utils/arfile_header_split.patch           |   27 --------
>>> .../opkg-utils/index-ignore-filenotfound.patch     |   73 --------------------
>>> .../opkg-utils/opkg-utils/mtime-int.patch          |   30 --------
>>> .../opkg-utils/opkg-utils/shebang.patch            |   46 ------------
>>> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    7 +-
>>> 6 files changed, 1 insertion(+), 221 deletions(-)
>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch
>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
>>> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>>> index 4fe4038..1996c75 100644
>>> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>>> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>>> @@ -6,16 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
>>>                      file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
>>> RDEPENDS_${PN} = "python"
>>> RDEPENDS_${PN}_virtclass-native = ""
>>> -SRCREV = "16665959c330b5958c0f0f4624a9ca7f823f98de"
>>> +SRCREV = "44df9dd3dc411ca1255cb4b23bde7eb71aed4778"
>>
>> Better to use latest for this (only 3 commits, 2 of them fixing
>> python-2.6)
>
> Should I cherry-pick them from master to keep history or just make a single, new update to latest SRCREV for the denzil branch?

I slightly favor cherry-picks from master when possible.

Thanks,

Scott

-- 
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center

Re: [PATCH][for-denzil 1/8] opkg-utils: bump SRCREV for Packages cache fix and other fixes

[Koen Kooi]

Op 7 aug. 2012, om 18:07 heeft Scott Garman <scott.a.garman@intel.com> het volgende geschreven:

> On 08/07/2012 01:19 AM, Koen Kooi wrote:
>> 
>> Op 7 aug. 2012, om 10:17 heeft Martin Jansa <martin.jansa@gmail.com> het volgende geschreven:
>> 
>>> On Tue, Aug 07, 2012 at 09:44:41AM +0200, Koen Kooi wrote:
>>>> From: Martin Jansa <martin.jansa@gmail.com>
>>>> 
>>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>> ---
>>>> .../opkg-utils/opkg-utils/add-license-field.patch  |   39 -----------
>>>> .../opkg-utils/arfile_header_split.patch           |   27 --------
>>>> .../opkg-utils/index-ignore-filenotfound.patch     |   73 --------------------
>>>> .../opkg-utils/opkg-utils/mtime-int.patch          |   30 --------
>>>> .../opkg-utils/opkg-utils/shebang.patch            |   46 ------------
>>>> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    7 +-
>>>> 6 files changed, 1 insertion(+), 221 deletions(-)
>>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/add-license-field.patch
>>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
>>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
>>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
>>>> delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
>>>> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>>>> index 4fe4038..1996c75 100644
>>>> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>>>> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>>>> @@ -6,16 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
>>>>                     file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
>>>> RDEPENDS_${PN} = "python"
>>>> RDEPENDS_${PN}_virtclass-native = ""
>>>> -SRCREV = "16665959c330b5958c0f0f4624a9ca7f823f98de"
>>>> +SRCREV = "44df9dd3dc411ca1255cb4b23bde7eb71aed4778"
>>> 
>>> Better to use latest for this (only 3 commits, 2 of them fixing
>>> python-2.6)
>> 
>> Should I cherry-pick them from master to keep history or just make a single, new update to latest SRCREV for the denzil branch?
> 
> I slightly favor cherry-picks from master when possible.

Since the cherry-picks would be incremental, can these 8 be queued and extra cherrypicks be added at a later point? I need to actually test those before submitting :)

Re: [PATCH][for-denzil 1/8] opkg-utils: bump SRCREV for Packages cache fix and other fixes

[Scott Garman]

On 08/07/2012 11:19 AM, Koen Kooi wrote:
>>>>>
RDEPENDS_${PN} = "python"
>>>>> RDEPENDS_${PN}_virtclass-native = "" -SRCREV =
>>>>> "16665959c330b5958c0f0f4624a9ca7f823f98de" +SRCREV =
>>>>> "44df9dd3dc411ca1255cb4b23bde7eb71aed4778"
>>>>
>>>> Better to use latest for this (only 3 commits, 2 of them
>>>> fixing python-2.6)
>>>
>>> Should I cherry-pick them from master to keep history or just
>>> make a single, new update to latest SRCREV for the denzil
>>> branch?
>>
>> I slightly favor cherry-picks from master when possible.
>
> Since the cherry-picks would be incremental, can these 8 be queued
> and extra cherrypicks be added at a later point? I need to actually
> test those before submitting :)

Appreciate that - this works for me.

Scott

-- 
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center