[PATCH 0/6] Packages Upgrade

[PATCH 0/6] Packages Upgrade

[Robert Yang]

The following changes since commit 968973d55d4b33e1a929ed4cdf9387fcaba2d93f:

  qt4: unconditionally disable gstreamer 0.10 support in qt webkit (2015-05-30 22:25:12 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/PU
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/PU

Robert Yang (6):
  liberror-perl: 0.17023 -> 0.17024
  python-mako: 0.9.1 -> 1.0.1
  python-nose: 1.2.1 -> 1.3.6
  debianutils: 4.5 -> 4.5.1
  ethtool: 3.16 -> 4.0
  glib-2.0: 2.44.0 -> 2.44.1

 ...tModel-roll-back-use-of-type-redefinition.patch |   42 ----------------
 .../{glib-2.0_2.44.0.bb => glib-2.0_2.44.1.bb}     |    5 +-
 ...or-perl_0.17023.bb => liberror-perl_0.17024.bb} |    4 +-
 .../{python-mako_0.9.1.bb => python-mako_1.0.1.bb} |    7 +--
 .../{python-nose_1.2.1.bb => python-nose_1.3.6.bb} |    4 +-
 .../ethtool/ethtool/ethtool-uint.patch             |   50 --------------------
 .../ethtool/{ethtool_3.16.bb => ethtool_4.0.bb}    |    5 +-
 .../{debianutils_4.5.bb => debianutils_4.5.1.bb}   |    7 ++-
 8 files changed, 17 insertions(+), 107 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.44.0.bb => glib-2.0_2.44.1.bb} (76%)
 rename meta/recipes-devtools/perl/{liberror-perl_0.17023.bb => liberror-perl_0.17024.bb} (83%)
 rename meta/recipes-devtools/python/{python-mako_0.9.1.bb => python-mako_1.0.1.bb} (64%)
 rename meta/recipes-devtools/python/{python-nose_1.2.1.bb => python-nose_1.3.6.bb} (74%)
 delete mode 100644 meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch
 rename meta/recipes-extended/ethtool/{ethtool_3.16.bb => ethtool_4.0.bb} (85%)
 rename meta/recipes-support/debianutils/{debianutils_4.5.bb => debianutils_4.5.1.bb} (87%)

-- 
1.7.9.5

[PATCH 1/6] liberror-perl: 0.17023 -> 0.17024

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...or-perl_0.17023.bb => liberror-perl_0.17024.bb} |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/perl/{liberror-perl_0.17023.bb => liberror-perl_0.17024.bb} (83%)

diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17023.bb b/meta/recipes-devtools/perl/liberror-perl_0.17024.bb
similarity index 83%
rename from meta/recipes-devtools/perl/liberror-perl_0.17023.bb
rename to meta/recipes-devtools/perl/liberror-perl_0.17024.bb
index 87684e1..6ae0e7e 100644
--- a/meta/recipes-devtools/perl/liberror-perl_0.17023.bb
+++ b/meta/recipes-devtools/perl/liberror-perl_0.17024.bb
@@ -13,8 +13,8 @@ DEPENDS += "perl"
 
 SRC_URI = "http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "98524ffbd268013e00697a5826a83d37"
-SRC_URI[sha256sum] = "af48e19077d8837c6377d8a9ba2ce473c100caf5eeb7b53606c3f78a0e8b5d37"
+SRC_URI[md5sum] = "7e3676a7fb14f65f568f12d4b40a2a72"
+SRC_URI[sha256sum] = "074db7c783a67b0667eca64a4f6a0c3de94998afc92c01d6453163eb04b9150d"
 
 S = "${WORKDIR}/Error-${PV}"
 
-- 
1.7.9.5

[PATCH 2/6] python-mako: 0.9.1 -> 1.0.1

[Robert Yang]

The LIC_FILES_CHKSUM was changed because the year changed: 2013 -> 2015,
the license are the same.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../{python-mako_0.9.1.bb => python-mako_1.0.1.bb} |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/python/{python-mako_0.9.1.bb => python-mako_1.0.1.bb} (64%)

diff --git a/meta/recipes-devtools/python/python-mako_0.9.1.bb b/meta/recipes-devtools/python/python-mako_1.0.1.bb
similarity index 64%
rename from meta/recipes-devtools/python/python-mako_0.9.1.bb
rename to meta/recipes-devtools/python/python-mako_1.0.1.bb
index 57d4220..5d42b0c 100644
--- a/meta/recipes-devtools/python/python-mako_0.9.1.bb
+++ b/meta/recipes-devtools/python/python-mako_1.0.1.bb
@@ -1,11 +1,12 @@
 SUMMARY = "Templating library for Python"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=da2a9d126b93cab0996a8287dacc480b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=deb3ff8e4c17aaf7b80889b6b2bf4c83"
 
 SRC_URI = "https://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz"
-SRC_URI[md5sum] = "fe3f394ef714776d09ec6133923736a7"
-SRC_URI[sha256sum] = "ed74d72b720a97a51590dfa839f2048ceeb76cc80d1d9ea5731a5262384316ae"
+
+SRC_URI[md5sum] = "9f0aafd177b039ef67b90ea350497a54"
+SRC_URI[sha256sum] = "45f0869febea59dab7efd256fb451c377cbb7947bef386ff0bb44627c31a8d1c"
 
 S = "${WORKDIR}/Mako-${PV}"
 
-- 
1.7.9.5

[PATCH 3/6] python-nose: 1.2.1 -> 1.3.6

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../{python-nose_1.2.1.bb => python-nose_1.3.6.bb} |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python-nose_1.2.1.bb => python-nose_1.3.6.bb} (74%)

diff --git a/meta/recipes-devtools/python/python-nose_1.2.1.bb b/meta/recipes-devtools/python/python-nose_1.3.6.bb
similarity index 74%
rename from meta/recipes-devtools/python/python-nose_1.2.1.bb
rename to meta/recipes-devtools/python/python-nose_1.3.6.bb
index f55461d..d6e8fc1 100644
--- a/meta/recipes-devtools/python/python-nose_1.2.1.bb
+++ b/meta/recipes-devtools/python/python-nose_1.3.6.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://lgpl.txt;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
 SRC_URI = "http://pypi.python.org/packages/source/n/nose/nose-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "735e3f1ce8b07e70ee1b742a8a53585a"
-SRC_URI[sha256sum] = "2171e9202d118d302d5db1decb52dd862b79e2a626ca19653a6914574a6ca7d9"
+SRC_URI[md5sum] = "0ca546d81ca8309080fc80cb389e7a16"
+SRC_URI[sha256sum] = "f61e0909a743eed37b1207e38a8e7b4a2fe0a82185e36f2be252ef1b3f901758"
 
 S = "${WORKDIR}/nose-${PV}"
 
-- 
1.7.9.5

[PATCH 4/6] debianutils: 4.5 -> 4.5.1

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../{debianutils_4.5.bb => debianutils_4.5.1.bb}   |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta/recipes-support/debianutils/{debianutils_4.5.bb => debianutils_4.5.1.bb} (87%)

diff --git a/meta/recipes-support/debianutils/debianutils_4.5.bb b/meta/recipes-support/debianutils/debianutils_4.5.1.bb
similarity index 87%
rename from meta/recipes-support/debianutils/debianutils_4.5.bb
rename to meta/recipes-support/debianutils/debianutils_4.5.1.bb
index 3593cdb..9e5dd70 100644
--- a/meta/recipes-support/debianutils/debianutils_4.5.bb
+++ b/meta/recipes-support/debianutils/debianutils_4.5.1.bb
@@ -4,8 +4,11 @@ LICENSE = "GPLv2 & SMAIL_GPL"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz"
-SRC_URI[md5sum] = "43796250e927db531cdebe80c6b925ea"
-SRC_URI[sha256sum] = "7cfaa53caaaaf36dad16fa69b30dd2b78b8dafebd766aacd53a3c7c78a9d441f"
+
+SRC_URI[md5sum] = "487524518cd5833a6a4f7007b5d1bd5b"
+SRC_URI[sha256sum] = "a531c23e0105fe01cfa928457a8343a1e947e2621b3cd4d05f4e9656020c63b7"
+
+S = "${WORKDIR}/${BPN}"
 
 inherit autotools update-alternatives
 
-- 
1.7.9.5

[PATCH 5/6] ethtool: 3.16 -> 4.0

[Robert Yang]

Removed ethtool-uint.patch since it is already in the source.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../ethtool/ethtool/ethtool-uint.patch             |   50 --------------------
 .../ethtool/{ethtool_3.16.bb => ethtool_4.0.bb}    |    5 +-
 2 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch
 rename meta/recipes-extended/ethtool/{ethtool_3.16.bb => ethtool_4.0.bb} (85%)

diff --git a/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch b/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch
deleted file mode 100644
index bb96a18..0000000
--- a/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix build with musl by using correct uint type names.
-
-This patch is taken from Sabotage Linux, the license statement for patches and
-build scripts in Sabotage Linux says:
-
-    To the extent possible under law, Christian Neukirchen has waived
-    all copyright and related or neighboring rights to this work.
-
-    http://creativecommons.org/publicdomain/zero/1.0/
-
-Therefore this should be good to include in OpenEmbedded.
-
-Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
-
-Upstream-status: Pending
-
-diff -u ethtool-3.14.org/internal.h ethtool-3.14/internal.h
---- ethtool-3.14.org/internal.h
-+++ ethtool-3.14/internal.h
-@@ -7,6 +7,7 @@
- #include "ethtool-config.h"
- #endif
- #include <stdio.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-@@ -17,16 +18,16 @@
- 
- /* ethtool.h expects these to be defined by <linux/types.h> */
- #ifndef HAVE_BE_TYPES
--typedef __uint16_t __be16;
--typedef __uint32_t __be32;
-+typedef uint16_t __be16;
-+typedef uint32_t __be32;
- typedef unsigned long long __be64;
- #endif
- 
- typedef unsigned long long u64;
--typedef __uint32_t u32;
--typedef __uint16_t u16;
--typedef __uint8_t u8;
--typedef __int32_t s32;
-+typedef uint32_t u32;
-+typedef uint16_t u16;
-+typedef uint8_t u8;
-+typedef int32_t s32;
- 
- #include "ethtool-copy.h"
- #include "net_tstamp-copy.h"
diff --git a/meta/recipes-extended/ethtool/ethtool_3.16.bb b/meta/recipes-extended/ethtool/ethtool_4.0.bb
similarity index 85%
rename from meta/recipes-extended/ethtool/ethtool_3.16.bb
rename to meta/recipes-extended/ethtool/ethtool_4.0.bb
index 92a0704..13f2b1c 100644
--- a/meta/recipes-extended/ethtool/ethtool_3.16.bb
+++ b/meta/recipes-extended/ethtool/ethtool_4.0.bb
@@ -9,11 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
            file://run-ptest \
            file://avoid_parallel_tests.patch \
-           file://ethtool-uint.patch \
            "
 
-SRC_URI[md5sum] = "3806bae34c153e2b9e2859e85c54788d"
-SRC_URI[sha256sum] = "a6f1433824af7b390ed4e66dfc7cee047d6d1f56dbb8ceef9fe905d63aef5275"
+SRC_URI[md5sum] = "0a1c78787c7dcf077016ed86372a472f"
+SRC_URI[sha256sum] = "e200516727cc9583e8b63fd6e72f667f9ed41bb4f0577ff4803b60c64cfd1dbc"
 
 inherit autotools ptest
 RDEPENDS_${PN}-ptest += "make"
-- 
1.7.9.5

[PATCH 6/6] glib-2.0: 2.44.0 -> 2.44.1

[Robert Yang]

Removed 0001-GListModel-roll-back-use-of-type-redefinition.patch since
it is a backport patch.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...tModel-roll-back-use-of-type-redefinition.patch |   42 --------------------
 .../{glib-2.0_2.44.0.bb => glib-2.0_2.44.1.bb}     |    5 +--
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.44.0.bb => glib-2.0_2.44.1.bb} (76%)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch
deleted file mode 100644
index 7d95743..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4a292721bcf2943bfc05c6a1c859992f28e3efec Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Wed, 25 Mar 2015 09:29:49 -0400
-Subject: [PATCH] GListModel: roll back use of type redefinition
-
-We declare the typedefs for GListModel and GListStore in giotypes.h, as
-a matter of convention.  This is not actually required, since the
-typedef is emitted as part of the G_DECLARE_* macros.
-
-The giotypes.h approach is only used to avoid cyclic dependencies
-between headers, which is not a problem in this case.
-
-Type redefinition is a C11 feature, and although it was around in some
-compilers before then, gcc 4.2.1 (from 2007) is apparently still in wide
-use, being the default compiler for OpenBSD.
-
-Eventually, we will probably hit a case where we actually need to
-redefine a type, but since we're not there yet, let's back off a bit.
-
-Upstream-Status: Backport
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- gio/giotypes.h |    2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/gio/giotypes.h b/gio/giotypes.h
-index 4342d47..53f8cc9 100644
---- a/gio/giotypes.h
-+++ b/gio/giotypes.h
-@@ -61,8 +61,6 @@ typedef struct _GPermission                   GPermission;
- 
- typedef struct _GMenuModel                    GMenuModel;
- typedef struct _GNotification                 GNotification;
--typedef struct _GListModel                    GListModel;
--typedef struct _GListStore                    GListStore;
- 
- /**
-  * GDrive:
--- 
-1.7.9.5
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
similarity index 76%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
index 227e1b4..8eaccfb 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
@@ -14,10 +14,9 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://uclibc.patch \
            file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
            file://allow-run-media-sdX-drive-mount-if-username-root.patch \
-           file://0001-GListModel-roll-back-use-of-type-redefinition.patch \
           "
 
 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
 
-SRC_URI[md5sum] = "74cf7b4ea200b76e42a4c22c8daf0f93"
-SRC_URI[sha256sum] = "f2d362b106a08fa801770d41829a06fcfe287a00421018869eebf5efc796f5b9"
+SRC_URI[md5sum] = "83efba4722a9674b97437d1d99af79db"
+SRC_URI[sha256sum] = "8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07"
-- 
1.7.9.5