[PATCH 0/7] Package upgrades

[PATCH 0/7] Package upgrades

[Laurentiu Palcu]

All packages were compiled for all major architectures, individually, and also
build tested on AB. Basic sanity tests were done using a core-image-sato for
qemux86. No issues spotted.

Laurentiu

The following changes since commit 9160f376065752e2e92c8b37ee9a80d0eb86b53b:

  bitbake: toaster: enable required classes in the toaster startup script (2013-11-04 09:36:22 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib lpalcu/upgrades
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/upgrades

Laurentiu Palcu (7):
  python-setuptools: upgrade to 1.1.7
  xf86-input-keyboard: upgrade to 1.8.0
  xtrans: upgrade to 1.3.0
  git: upgrade to 1.8.4.2
  xz: upgrade to 5.1.3alpha
  diffstat: upgrade to 1.58
  python-pycurl: upgrade to 7.19.0.2

 .../diffstat/diffstat/aclocal.patch                |   11 +++++----
 .../{diffstat_1.57.bb => diffstat_1.58.bb}         |    4 ++--
 .../git/{git_1.8.3.4.bb => git_1.8.4.2.bb}         |    4 ++--
 .../python/python-pycurl/no-static-link.patch      |   25 ++++++++++----------
 ...-pycurl_7.19.0.bb => python-pycurl_7.19.0.2.bb} |    7 +++---
 ...uptools_1.1.6.bb => python-setuptools_1.1.7.bb} |    4 ++--
 .../xz/{xz_5.1.2alpha.bb => xz_5.1.3alpha.bb}      |    4 ++--
 ...board_1.7.0.bb => xf86-input-keyboard_1.8.0.bb} |    4 ++--
 .../xorg-lib/{xtrans_1.2.7.bb => xtrans_1.3.0.bb}  |    4 ++--
 9 files changed, 33 insertions(+), 34 deletions(-)
 rename meta/recipes-devtools/diffstat/{diffstat_1.57.bb => diffstat_1.58.bb} (84%)
 rename meta/recipes-devtools/git/{git_1.8.3.4.bb => git_1.8.4.2.bb} (67%)
 rename meta/recipes-devtools/python/{python-pycurl_7.19.0.bb => python-pycurl_7.19.0.2.bb} (74%)
 rename meta/recipes-devtools/python/{python-setuptools_1.1.6.bb => python-setuptools_1.1.7.bb} (86%)
 rename meta/recipes-extended/xz/{xz_5.1.2alpha.bb => xz_5.1.3alpha.bb} (87%)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.7.0.bb => xf86-input-keyboard_1.8.0.bb} (73%)
 rename meta/recipes-graphics/xorg-lib/{xtrans_1.2.7.bb => xtrans_1.3.0.bb} (82%)

-- 
1.7.9.5

[PATCH 1/7] python-setuptools: upgrade to 1.1.7

[Laurentiu Palcu]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 ...uptools_1.1.6.bb => python-setuptools_1.1.7.bb} |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python-setuptools_1.1.6.bb => python-setuptools_1.1.7.bb} (86%)

diff --git a/meta/recipes-devtools/python/python-setuptools_1.1.6.bb b/meta/recipes-devtools/python/python-setuptools_1.1.7.bb
similarity index 86%
rename from meta/recipes-devtools/python/python-setuptools_1.1.6.bb
rename to meta/recipes-devtools/python/python-setuptools_1.1.7.bb
index ddaa303..c00738c 100644
--- a/meta/recipes-devtools/python/python-setuptools_1.1.6.bb
+++ b/meta/recipes-devtools/python/python-setuptools_1.1.7.bb
@@ -34,7 +34,7 @@ RDEPENDS_${PN}_class-native = "\
   python-compression \
 "
 
-SRC_URI[md5sum] = "ee82ea53def4480191061997409d2996"
-SRC_URI[sha256sum] = "e5a60b88138def225c29cbf13ee20f1c176f200450e286dcc7d192963a67723a"
+SRC_URI[md5sum] = "1f33594d25d574a1640ffb84667c6759"
+SRC_URI[sha256sum] = "b35e3d7c79cfdb5b38cfc71f4b0deab4350c1176fc4bb05bfa8945504ecfb028"
 
 BBCLASSEXTEND = "native"
-- 
1.7.9.5

[PATCH 2/7] xf86-input-keyboard: upgrade to 1.8.0

[Laurentiu Palcu]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 ...board_1.7.0.bb => xf86-input-keyboard_1.8.0.bb} |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.7.0.bb => xf86-input-keyboard_1.8.0.bb} (73%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.7.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.7.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb
index 7e9e377..f138918 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.7.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb
@@ -9,5 +9,5 @@ core keyboard."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10"
 
-SRC_URI[md5sum] = "97387046c5a450ff78793d5da8e66d5e"
-SRC_URI[sha256sum] = "0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c"
+SRC_URI[md5sum] = "ce936e219682bacf5a4a9c4ab940edb8"
+SRC_URI[sha256sum] = "41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b"
-- 
1.7.9.5

[PATCH 3/7] xtrans: upgrade to 1.3.0

[Laurentiu Palcu]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../xorg-lib/{xtrans_1.2.7.bb => xtrans_1.3.0.bb}  |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{xtrans_1.2.7.bb => xtrans_1.3.0.bb} (82%)

diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.2.7.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.3.0.bb
similarity index 82%
rename from meta/recipes-graphics/xorg-lib/xtrans_1.2.7.bb
rename to meta/recipes-graphics/xorg-lib/xtrans_1.3.0.bb
index 3c3f4dd..2ed365e 100644
--- a/meta/recipes-graphics/xorg-lib/xtrans_1.2.7.bb
+++ b/meta/recipes-graphics/xorg-lib/xtrans_1.3.0.bb
@@ -20,5 +20,5 @@ inherit gettext
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "84c66908cf003ad8c272b0eecbdbaee3"
-SRC_URI[sha256sum] = "7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6"
+SRC_URI[md5sum] = "1942deb831fd21703e30ebe47794d60c"
+SRC_URI[sha256sum] = "3ae7600e8553ccf2f5c46fbcc63d887729637a4b2a898927dcd339a13355bd4a"
-- 
1.7.9.5

[PATCH 4/7] git: upgrade to 1.8.4.2

[Laurentiu Palcu]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../git/{git_1.8.3.4.bb => git_1.8.4.2.bb}         |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/git/{git_1.8.3.4.bb => git_1.8.4.2.bb} (67%)

diff --git a/meta/recipes-devtools/git/git_1.8.3.4.bb b/meta/recipes-devtools/git/git_1.8.4.2.bb
similarity index 67%
rename from meta/recipes-devtools/git/git_1.8.3.4.bb
rename to meta/recipes-devtools/git/git_1.8.4.2.bb
index 124a98e..d162702 100644
--- a/meta/recipes-devtools/git/git_1.8.3.4.bb
+++ b/meta/recipes-devtools/git/git_1.8.4.2.bb
@@ -1,8 +1,8 @@
 require git.inc
 
 SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz"
-SRC_URI[md5sum] = "80eec3201a5d012913d287b85adaee8e"
-SRC_URI[sha256sum] = "dfa2cdf2df92b4abe956b1e7586030381c4e39e89161ab789a660d8d1f24d9d9"
+SRC_URI[md5sum] = "6f63d103465b86ca0ebe4189ea54731c"
+SRC_URI[sha256sum] = "6732278ce4870b314cfd83500ec15d5ee7a868be5b96549022d6f0972bf3dd2a"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-- 
1.7.9.5

[PATCH 5/7] xz: upgrade to 5.1.3alpha

[Laurentiu Palcu]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../xz/{xz_5.1.2alpha.bb => xz_5.1.3alpha.bb}      |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/xz/{xz_5.1.2alpha.bb => xz_5.1.3alpha.bb} (87%)

diff --git a/meta/recipes-extended/xz/xz_5.1.2alpha.bb b/meta/recipes-extended/xz/xz_5.1.3alpha.bb
similarity index 87%
rename from meta/recipes-extended/xz/xz_5.1.2alpha.bb
rename to meta/recipes-extended/xz/xz_5.1.3alpha.bb
index 92c3dd9..b49fbf7 100644
--- a/meta/recipes-extended/xz/xz_5.1.2alpha.bb
+++ b/meta/recipes-extended/xz/xz_5.1.3alpha.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
                     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"
+SRC_URI[md5sum] = "bbb2daa876c87fb2cf9fe4590af9694e"
+SRC_URI[sha256sum] = "9f94506e301d5b6863921bba861a99ba00de384dafb4e5f409679a93e41613d4"
 
 inherit autotools gettext
 
-- 
1.7.9.5

[PATCH 6/7] diffstat: upgrade to 1.58

[Laurentiu Palcu]

Adjusted aclocal.patch to apply correctly.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../diffstat/diffstat/aclocal.patch                |   11 ++++++-----
 .../{diffstat_1.57.bb => diffstat_1.58.bb}         |    4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename meta/recipes-devtools/diffstat/{diffstat_1.57.bb => diffstat_1.58.bb} (84%)

diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
index 37e518f..ff18f1b 100644
--- a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
+++ b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
@@ -11,11 +11,11 @@ The original macro name (AC_ACVERSION) leads to this error:
 Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
 
-diff --git a/aclocal.m4 b/aclocal.m4
-index 144a074..fce6eba 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -13,15 +13,15 @@ dnl ------------------
+Index: diffstat-1.58/aclocal.m4
+===================================================================
+--- diffstat-1.58.orig/aclocal.m4	2013-10-29 01:43:23.000000000 +0200
++++ diffstat-1.58/aclocal.m4	2013-11-04 11:22:53.461562567 +0200
+@@ -13,16 +13,16 @@
  dnl Conditionally generate script according to whether we're using a given autoconf.
  dnl
  dnl $1 = version to compare against
@@ -25,6 +25,7 @@ index 144a074..fce6eba 100644
 +dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1.
  define([CF_ACVERSION_CHECK],
  [
+ ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
  ifdef([m4_version_compare],
 -[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
 +[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])],
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.57.bb b/meta/recipes-devtools/diffstat/diffstat_1.58.bb
similarity index 84%
rename from meta/recipes-devtools/diffstat/diffstat_1.57.bb
rename to meta/recipes-devtools/diffstat/diffstat_1.58.bb
index c25005f..8f73bfc 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.57.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.58.bb
@@ -11,8 +11,8 @@ SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
            file://dirfix.patch \
            file://aclocal.patch"
 
-SRC_URI[md5sum] = "a70ae35e479ab91da7eb6023a4e9240a"
-SRC_URI[sha256sum] = "cb9845839d695f178d6b5458b08d3e04773e400f35c0c062c4c0102220fba1e6"
+SRC_URI[md5sum] = "6d6e13f7dcfe4db5da65c5175260ea47"
+SRC_URI[sha256sum] = "fad5135199c3b9aea132c5d45874248f4ce0ff35f61abb8d03c3b90258713793"
 
 S = "${WORKDIR}/diffstat-${PV}"
 
-- 
1.7.9.5

[PATCH 7/7] python-pycurl: upgrade to 7.19.0.2

[Laurentiu Palcu]

Refreshed no-static-link.patch to work with this release and changed the
lines/checksum (and the file) where the license can be found.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../python/python-pycurl/no-static-link.patch      |   25 ++++++++++----------
 ...-pycurl_7.19.0.bb => python-pycurl_7.19.0.2.bb} |    7 +++---
 2 files changed, 15 insertions(+), 17 deletions(-)
 rename meta/recipes-devtools/python/{python-pycurl_7.19.0.bb => python-pycurl_7.19.0.2.bb} (74%)

diff --git a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
index c97f5dc..e8c0005 100644
--- a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
+++ b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
@@ -1,16 +1,15 @@
 Upstream-Status: Pending
 
-Index: pycurl-7.18.2/setup.py
+Index: pycurl-7.19.0.2/setup.py
 ===================================================================
---- pycurl-7.18.2.orig/setup.py
-+++ pycurl-7.18.2/setup.py
-@@ -97,8 +97,7 @@ else:
-         else:
-             extra_compile_args.append(e)
-     libs = split_quoted(
--        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
--        os.popen("'%s' --static-libs" % CURL_CONFIG).read())
-+        os.popen("'%s' --libs" % CURL_CONFIG).read())
-     for e in libs:
-         if e[:2] == "-l":
-             libraries.append(e[2:])
+--- pycurl-7.19.0.2.orig/setup.py	2013-10-08 15:28:53.000000000 +0300
++++ pycurl-7.19.0.2/setup.py	2013-11-04 13:46:47.928292585 +0200
+@@ -101,7 +101,7 @@
+     # support one or the other of these curl-config options, so gracefully
+     # tolerate failure of either, but not both.
+     optbuf = ""
+-    for option in ["--libs", "--static-libs"]:
++    for option in ["--libs"]:
+         p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True,
+             stdout=subprocess.PIPE)
+         (stdout, stderr) = p.communicate()
diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb b/meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb
similarity index 74%
rename from meta/recipes-devtools/python/python-pycurl_7.19.0.bb
rename to meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb
index 122e1bd..fb57b49 100644
--- a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
+++ b/meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb
@@ -2,22 +2,21 @@ DESCRIPTION = "libcurl python bindings."
 HOMEPAGE = "http://pycurl.sourceforge.net/"
 SECTION = "devel/python"
 LICENSE = "LGPLv2.1+ | MIT"
-LIC_FILES_CHKSUM = "file://README;endline=13;md5=fbfe545b1869617123a08c0983ef17b2 \
+LIC_FILES_CHKSUM = "file://README.rst;beginline=97;endline=111;md5=b5a5e531d80812bcbecbeb240fde63ef \
                     file://COPYING;md5=3579a9fd0221d49a237aaa33492f988c \
                     file://COPYING2;md5=ffaa1e283b7f9bf5aafd8d45db6f7518"
 
 DEPENDS = "curl python"
 RDEPENDS_${PN} = "python-core curl"
 SRCNAME = "pycurl"
-PR = "r3"
 
 SRC_URI = "\
   http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \
   file://no-static-link.patch \
 "
 
-SRC_URI[archive.md5sum] = "919d58fe37e69fe87ce4534d8b6a1c7b"
-SRC_URI[archive.sha256sum] = "eb782dfcc5a7c023539a077462b83c167e178128ee9f7201665b9fbb1a8b0642"
+SRC_URI[archive.md5sum] = "518be33976dbc6838e42495ada64b43f"
+SRC_URI[archive.sha256sum] = "7a9e793b9181654d5eef3f6d22c244c57d2b51d38feb4c1b71d68efda99b0547"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
-- 
1.7.9.5

Re: [PATCH 6/7] diffstat: upgrade to 1.58

[Burton, Ross]

On 5 November 2013 09:25, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> -diff --git a/aclocal.m4 b/aclocal.m4

How does this work, considering do_configure should be replacing this file?

Ross

Re: [PATCH 6/7] diffstat: upgrade to 1.58

[Laurentiu Palcu]

On Tue, Nov 05, 2013 at 12:16:55PM +0000, Burton, Ross wrote:
> On 5 November 2013 09:25, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> > -diff --git a/aclocal.m4 b/aclocal.m4
> 
> How does this work, considering do_configure should be replacing this file?
For diffstat, in particular, aclocal.m4 is explicitly renamed to
acinclude.m4 in do_configure ().

Laurentiu
> 
> Ross

Re: [PATCH 6/7] diffstat: upgrade to 1.58

[Burton, Ross]

On 5 November 2013 13:01, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> On Tue, Nov 05, 2013 at 12:16:55PM +0000, Burton, Ross wrote:
>> On 5 November 2013 09:25, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
>> > -diff --git a/aclocal.m4 b/aclocal.m4
>>
>> How does this work, considering do_configure should be replacing this file?
> For diffstat, in particular, aclocal.m4 is explicitly renamed to
> acinclude.m4 in do_configure ().

Fair enough, thanks. :)

Ross