[PATCH 00/10] Recipe upgrades

[PATCH 00/10] Recipe upgrades

[Paul Eggleton]

A bunch of unrelated upgrades for recipes in meta-oe.


The following changes since commit 2ea3a19a478c526baa04d6b9a9e8c9f42aae9d34:

  ctapi-common: Add new recipe (2014-12-31 16:38:22 +0100)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib paule/upgrades
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/upgrades

Paul Eggleton (10):
  iotop: update to 0.6
  lzip: update to 1.16
  ddrescue: update to 1.19
  lcdproc: update to 0.5.6
  libmodplug: update to 0.8.8.5
  protobuf: update to 2.5.0
  mariadb: update to 5.5.41
  rfkill: update to 0.5
  picocom: update to 1.7
  libssh: update to just after 0.6.4

 .../rfkill/{rfkill_0.4.bb => rfkill_0.5.bb}        |  8 ++--
 .../{protobuf_2.4.1.bb => protobuf_2.5.0.bb}       |  4 +-
 .../{ddrescue_1.16.bb => ddrescue_1.19.bb}         | 15 ++++---
 .../iotop/{iotop_0.4.4.bb => iotop_0.6.bb}         |  7 ++--
 .../lcdproc/lcdproc/automake-111-fix.patch         | 21 ----------
 .../lcdproc/{lcdproc_0.5.5.bb => lcdproc_0.5.6.bb} |  6 +--
 .../{libmodplug_0.8.7.bb => libmodplug_0.8.8.5.bb} |  4 +-
 .../libssh/{libssh_0.6.3.bb => libssh_git.bb}      |  4 +-
 .../lzip/{lzip_1.15.bb => lzip_1.16.bb}            | 14 +++----
 ...b-native_5.5.40.bb => mariadb-native_5.5.41.bb} |  0
 meta-oe/recipes-support/mysql/mariadb.inc          |  5 +--
 .../mysql/mariadb/revert-fix-for-MDEV-5120.patch   | 46 ----------------------
 .../mysql/{mariadb_5.5.40.bb => mariadb_5.5.41.bb} |  0
 .../picocom/{picocom_1.6.bb => picocom_1.7.bb}     |  7 ++--
 14 files changed, 37 insertions(+), 104 deletions(-)
 rename meta-oe/recipes-connectivity/rfkill/{rfkill_0.4.bb => rfkill_0.5.bb} (76%)
 rename meta-oe/recipes-devtools/protobuf/{protobuf_2.4.1.bb => protobuf_2.5.0.bb} (81%)
 rename meta-oe/recipes-extended/ddrescue/{ddrescue_1.16.bb => ddrescue_1.19.bb} (54%)
 rename meta-oe/recipes-extended/iotop/{iotop_0.4.4.bb => iotop_0.6.bb} (81%)
 delete mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch
 rename meta-oe/recipes-extended/lcdproc/{lcdproc_0.5.5.bb => lcdproc_0.5.6.bb} (75%)
 rename meta-oe/recipes-multimedia/libmodplug/{libmodplug_0.8.7.bb => libmodplug_0.8.8.5.bb} (80%)
 rename meta-oe/recipes-support/libssh/{libssh_0.6.3.bb => libssh_git.bb} (90%)
 rename meta-oe/recipes-support/lzip/{lzip_1.15.bb => lzip_1.16.bb} (64%)
 rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.40.bb => mariadb-native_5.5.41.bb} (100%)
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch
 rename meta-oe/recipes-support/mysql/{mariadb_5.5.40.bb => mariadb_5.5.41.bb} (100%)
 rename meta-oe/recipes-support/picocom/{picocom_1.6.bb => picocom_1.7.bb} (67%)

-- 
1.9.3

[PATCH 01/10] iotop: update to 0.6

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-extended/iotop/{iotop_0.4.4.bb => iotop_0.6.bb} | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-extended/iotop/{iotop_0.4.4.bb => iotop_0.6.bb} (81%)

diff --git a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb b/meta-oe/recipes-extended/iotop/iotop_0.6.bb
similarity index 81%
rename from meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
rename to meta-oe/recipes-extended/iotop/iotop_0.6.bb
index d629245..05eba3f 100644
--- a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
+++ b/meta-oe/recipes-extended/iotop/iotop_0.6.bb
@@ -4,14 +4,12 @@ DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \
     a table of current I/O usage by processes on the system."
 HOMEPAGE = "http://guichaz.free.fr/iotop/"
 
-PR = "r1"
-
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
 
 SRC_URI = "http://guichaz.free.fr/iotop/files/${BP}.tar.bz2"
-SRC_URI[md5sum] = "cdd38b276cbf238676f5d2bcf098ba9c"
-SRC_URI[sha256sum] = "46f3279fb1a7dfc129b5d00950c6e8389e4aedeb58880e848b88d686483df0b0"
+SRC_URI[md5sum] = "5ef9456b26d7694abf3101a72e1e0d1d"
+SRC_URI[sha256sum] = "3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b"
 
 inherit distutils
 
@@ -20,6 +18,7 @@ do_install_append() {
     rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py  || true
 }
 
+FILES_${PN} += "${sbindir}"
 RDEPENDS_${PN} = "python-curses python-textutils \
                   python-codecs python-ctypes python-pprint \
                   python-shell"
-- 
1.9.3

[PATCH 02/10] lzip: update to 1.16

[Paul Eggleton]

* License changed to GPLv2+
* Trim SUMMARY
* gz file is definitely being provided for download upstream, so drop
  comment saying it isn't

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-support/lzip/{lzip_1.15.bb => lzip_1.16.bb}    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
 rename meta-oe/recipes-support/lzip/{lzip_1.15.bb => lzip_1.16.bb} (64%)

diff --git a/meta-oe/recipes-support/lzip/lzip_1.15.bb b/meta-oe/recipes-support/lzip/lzip_1.16.bb
similarity index 64%
rename from meta-oe/recipes-support/lzip/lzip_1.15.bb
rename to meta-oe/recipes-support/lzip/lzip_1.16.bb
index 3d64695..af0b6ae 100644
--- a/meta-oe/recipes-support/lzip/lzip_1.15.bb
+++ b/meta-oe/recipes-support/lzip/lzip_1.16.bb
@@ -1,16 +1,14 @@
-SUMMARY = "Lzip is a lossless data compressor based on the LZMA algorithm"
+SUMMARY = "Lossless data compressor based on the LZMA algorithm"
 HOMEPAGE = "http://lzip.nongnu.org/lzip.html"
 SECTION = "console/utils"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
+                    file://decoder.cc;endline=16;md5=0809128ac32163252846e09a70c8b80b"
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz"
 
-# Only the latest version is available in .tar.gz format from savannah.gnu.org,
-# FreeBSD distfiles is known to have version 1.13.
-
-SRC_URI[md5sum] = "e83a364c8544fc66cccb552369d93220"
-SRC_URI[sha256sum] = "7cd3fcda68fc9900efcf7784313e3bdd1303fef1a0546db9723f5e5564dd05b6"
+SRC_URI[md5sum] = "716a9876dc595ec52d4f3bda81e42471"
+SRC_URI[sha256sum] = "128cc25baf92c8b69700831e6f984d954016318cc78edca87870d0c033112751"
 
 CONFIGUREOPTS = "\
     '--srcdir=${S}' \
-- 
1.9.3

[PATCH 03/10] ddrescue: update to 1.19

[Paul Eggleton]

* License changed to GPLv2+
* Upstream now only releases .lz files for new releases

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../ddrescue/{ddrescue_1.16.bb => ddrescue_1.19.bb}       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-extended/ddrescue/{ddrescue_1.16.bb => ddrescue_1.19.bb} (54%)

diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
similarity index 54%
rename from meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
rename to meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
index a36c250..dc485b3 100644
--- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
+++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
@@ -4,14 +4,17 @@ DESCRIPTION = "GNU ddrescue is a data recovery tool. It copies data \
     trying hard to rescue data in case of read errors."
 HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html"
 SECTION = "console"
-LICENSE = "GPLv3+"
+LICENSE = "GPLv2+"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
-                    file://main_common.cc;beginline=5;endline=16;md5=b5a59150a33658cc1ffc31b1a4ffb9f2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
+                    file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f"
 
-SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz"
-SRC_URI[md5sum] = "57b67407e882c6418531d48a2f20d16b"
-SRC_URI[sha256sum] = "76b3f2e5fb0306d24f2632c3e168cccb73dc0a348e3a7089cd9230748ff23de6"
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz"
+SRC_URI[md5sum] = "ed6b5b82d74cbd925db2b829350e74b1"
+SRC_URI[sha256sum] = "ed8d0c9d9aac80a9110e9cb0d0a91a7390d3bf9f816b67a62ca4eb140f4747b8"
+
+# This isn't already added by base.bbclass
+do_unpack[depends] += "lzip-native:do_populate_sysroot"
 
 inherit autotools
 
-- 
1.9.3

Re: [PATCH 03/10] ddrescue: update to 1.19

[Martin Jansa]

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

On Mon, Jan 05, 2015 at 11:00:47AM +0000, Paul Eggleton wrote:
> * License changed to GPLv2+
> * Upstream now only releases .lz files for new releases

Is .lz working correctly now with current bitbake+oe-core (it didn't
last time I've re-tried)? Shouldn't we wait for base.bbclass change to
be merged as you mention above do_unpack?

Duplicates http://patchwork.openembedded.org/patch/82165/
can you send incremental patch on top of this if needed?

> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  .../ddrescue/{ddrescue_1.16.bb => ddrescue_1.19.bb}       | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
>  rename meta-oe/recipes-extended/ddrescue/{ddrescue_1.16.bb => ddrescue_1.19.bb} (54%)
> 
> diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
> similarity index 54%
> rename from meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
> rename to meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
> index a36c250..dc485b3 100644
> --- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
> +++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
> @@ -4,14 +4,17 @@ DESCRIPTION = "GNU ddrescue is a data recovery tool. It copies data \
>      trying hard to rescue data in case of read errors."
>  HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html"
>  SECTION = "console"
> -LICENSE = "GPLv3+"
> +LICENSE = "GPLv2+"
>  
> -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
> -                    file://main_common.cc;beginline=5;endline=16;md5=b5a59150a33658cc1ffc31b1a4ffb9f2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
> +                    file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f"
>  
> -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz"
> -SRC_URI[md5sum] = "57b67407e882c6418531d48a2f20d16b"
> -SRC_URI[sha256sum] = "76b3f2e5fb0306d24f2632c3e168cccb73dc0a348e3a7089cd9230748ff23de6"
> +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz"
> +SRC_URI[md5sum] = "ed6b5b82d74cbd925db2b829350e74b1"
> +SRC_URI[sha256sum] = "ed8d0c9d9aac80a9110e9cb0d0a91a7390d3bf9f816b67a62ca4eb140f4747b8"
> +
> +# This isn't already added by base.bbclass
> +do_unpack[depends] += "lzip-native:do_populate_sysroot"
>  
>  inherit autotools
>  
> -- 
> 1.9.3
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

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

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

Re: [PATCH 03/10] ddrescue: update to 1.19

[Paul Eggleton]

On Monday 05 January 2015 13:35:52 Martin Jansa wrote:
> On Mon, Jan 05, 2015 at 11:00:47AM +0000, Paul Eggleton wrote:
> > * License changed to GPLv2+
> > * Upstream now only releases .lz files for new releases
> 
> Is .lz working correctly now with current bitbake+oe-core (it didn't
> last time I've re-tried)? Shouldn't we wait for base.bbclass change to
> be merged as you mention above do_unpack?

Well, it worked for me, but you do need the lzip recipe which we do have in 
meta-oe. We don't necessarily have to wait since even when base.bbclass has 
been updated the line I added won't cause any issues.

> Duplicates http://patchwork.openembedded.org/patch/82165/
> can you send incremental patch on top of this if needed?

Ah, I missed that. As it happens, the only difference is the aforementioned 
depends line.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 03/10] ddrescue: update to 1.19

[Martin Jansa]

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

On Mon, Jan 05, 2015 at 01:31:15PM +0000, Paul Eggleton wrote:
> On Monday 05 January 2015 13:35:52 Martin Jansa wrote:
> > On Mon, Jan 05, 2015 at 11:00:47AM +0000, Paul Eggleton wrote:
> > > * License changed to GPLv2+
> > > * Upstream now only releases .lz files for new releases
> > 
> > Is .lz working correctly now with current bitbake+oe-core (it didn't
> > last time I've re-tried)? Shouldn't we wait for base.bbclass change to
> > be merged as you mention above do_unpack?
> 
> Well, it worked for me, but you do need the lzip recipe which we do have in 
> meta-oe. We don't necessarily have to wait since even when base.bbclass has 
> been updated the line I added won't cause any issues.
> 
> > Duplicates http://patchwork.openembedded.org/patch/82165/
> > can you send incremental patch on top of this if needed?
> 
> Ah, I missed that. As it happens, the only difference is the aforementioned 
> depends line.

Rebasing your change on top of Koen's shows bigger diff:

diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
index a605249..dc485b3 100644
--- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
+++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
@@ -13,30 +13,9 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz"
 SRC_URI[md5sum] = "ed6b5b82d74cbd925db2b829350e74b1"
 SRC_URI[sha256sum] = "ed8d0c9d9aac80a9110e9cb0d0a91a7390d3bf9f816b67a62ca4eb140f4747b8"
 
-CONFIGUREOPTS = "\
-    '--srcdir=${S}' \
-    '--prefix=${prefix}' \
-    '--exec-prefix=${exec_prefix}' \
-    '--bindir=${bindir}' \
-    '--datadir=${datadir}' \
-    '--infodir=${infodir}' \
-    '--sysconfdir=${sysconfdir}' \
-    'CXX=${CXX}' \
-    'CPPFLAGS=${CPPFLAGS}' \
-    'CXXFLAGS=${CXXFLAGS}' \
-    'LDFLAGS=${LDFLAGS}' \
-"
-EXTRA_OEMAKE = ""
+# This isn't already added by base.bbclass
+do_unpack[depends] += "lzip-native:do_populate_sysroot"
 
-do_configure () {
-    ${S}/configure ${CONFIGUREOPTS}
-}
-
-do_install () {
-    oe_runmake 'DESTDIR=${D}' install
-    # Info dir listing isn't interesting at this point so remove it if it exists.
-    if [ -e "${D}${infodir}/dir" ]; then
-        rm -f ${D}${infodir}/dir
-    fi
-}
+inherit autotools
 
+EXTRA_OECONF = "'CXX=${CXX}' 'CPPFLAGS=${CPPFLAGS}' 'CXXFLAGS=${CXXFLAGS}' 'LDFLAGS=${LDFLAGS}'"

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

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

Re: [PATCH 03/10] ddrescue: update to 1.19

[Paul Eggleton]

On Tuesday 06 January 2015 12:25:02 Martin Jansa wrote:
> On Mon, Jan 05, 2015 at 01:31:15PM +0000, Paul Eggleton wrote:
> > On Monday 05 January 2015 13:35:52 Martin Jansa wrote:
> > > On Mon, Jan 05, 2015 at 11:00:47AM +0000, Paul Eggleton wrote:
> > > > * License changed to GPLv2+
> > > > * Upstream now only releases .lz files for new releases
> > > 
> > > Is .lz working correctly now with current bitbake+oe-core (it didn't
> > > last time I've re-tried)? Shouldn't we wait for base.bbclass change to
> > > be merged as you mention above do_unpack?
> > 
> > Well, it worked for me, but you do need the lzip recipe which we do have
> > in
> > meta-oe. We don't necessarily have to wait since even when base.bbclass
> > has
> > been updated the line I added won't cause any issues.
> > 
> > > Duplicates http://patchwork.openembedded.org/patch/82165/
> > > can you send incremental patch on top of this if needed?
> > 
> > Ah, I missed that. As it happens, the only difference is the
> > aforementioned depends line.
> 
> Rebasing your change on top of Koen's shows bigger diff:
> 
> diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
> b/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb index a605249..dc485b3
> 100644
> --- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
> +++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb
> @@ -13,30 +13,9 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz"
>  SRC_URI[md5sum] = "ed6b5b82d74cbd925db2b829350e74b1"
>  SRC_URI[sha256sum] =
> "ed8d0c9d9aac80a9110e9cb0d0a91a7390d3bf9f816b67a62ca4eb140f4747b8"
> 
> -CONFIGUREOPTS = "\
> -    '--srcdir=${S}' \
> -    '--prefix=${prefix}' \
> -    '--exec-prefix=${exec_prefix}' \
> -    '--bindir=${bindir}' \
> -    '--datadir=${datadir}' \
> -    '--infodir=${infodir}' \
> -    '--sysconfdir=${sysconfdir}' \
> -    'CXX=${CXX}' \
> -    'CPPFLAGS=${CPPFLAGS}' \
> -    'CXXFLAGS=${CXXFLAGS}' \
> -    'LDFLAGS=${LDFLAGS}' \
> -"
> -EXTRA_OEMAKE = ""
> +# This isn't already added by base.bbclass
> +do_unpack[depends] += "lzip-native:do_populate_sysroot"
> 
> -do_configure () {
> -    ${S}/configure ${CONFIGUREOPTS}
> -}
> -
> -do_install () {
> -    oe_runmake 'DESTDIR=${D}' install
> -    # Info dir listing isn't interesting at this point so remove it if it
> exists. -    if [ -e "${D}${infodir}/dir" ]; then
> -        rm -f ${D}${infodir}/dir
> -    fi
> -}
> +inherit autotools
> 
> +EXTRA_OECONF = "'CXX=${CXX}' 'CPPFLAGS=${CPPFLAGS}' 'CXXFLAGS=${CXXFLAGS}'
> 'LDFLAGS=${LDFLAGS}'"

OK, perhaps I wasn't clear - I meant that that was the only addition that my 
change made that his did not.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

[PATCH 04/10] lcdproc: update to 0.5.6

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../lcdproc/lcdproc/automake-111-fix.patch          | 21 ---------------------
 .../lcdproc/{lcdproc_0.5.5.bb => lcdproc_0.5.6.bb}  |  6 ++----
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch
 rename meta-oe/recipes-extended/lcdproc/{lcdproc_0.5.5.bb => lcdproc_0.5.6.bb} (75%)

diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch
deleted file mode 100644
index 061cc22..0000000
--- a/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: With automake 1.11.3, pkglib_PROGRAMS is not valid anymore, 
- so work around this by using my_execbin_PROGRAMS.
-Author: Andreas Moog <amoog@ubuntu.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/934265
-
-Upstream-Status: Backport 
-
-Index: lcdproc-0.5.5/server/drivers/Makefile.am
-===================================================================
---- lcdproc-0.5.5.orig/server/drivers/Makefile.am	2012-02-26 14:04:37.000000000 +0100
-+++ lcdproc-0.5.5/server/drivers/Makefile.am	2012-02-26 14:13:17.764467350 +0100
-@@ -20,7 +20,8 @@
- 
- ## Keep the lists sorted!
- 
--pkglib_PROGRAMS = @DRIVERS@
-+my_execbindir = $(pkglibdir)
-+my_execbin_PROGRAMS = @DRIVERS@
- EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 xosd i2500vfd irtrans
- noinst_LIBRARIES = libLCD.a libbignum.a
- 
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb
similarity index 75%
rename from meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
rename to meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb
index 6d66af6..4761ef7 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb
@@ -1,9 +1,7 @@
 require lcdproc5.inc
 
-SRC_URI += "file://automake-111-fix.patch"
-
-SRC_URI[md5sum] = "c92d4529d36eeec6d9d6fd0a4aa3ec82"
-SRC_URI[sha256sum] = "b136b47d7bf585a003334f432d8730a36ef5ed1cd520084b919667d825e48d42"
+SRC_URI[md5sum] = "df4f5c2c7285eaf6979b9c7768b4877f"
+SRC_URI[sha256sum] = "bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
-- 
1.9.3

[PATCH 05/10] libmodplug: update to 0.8.8.5

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../libmodplug/{libmodplug_0.8.7.bb => libmodplug_0.8.8.5.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-multimedia/libmodplug/{libmodplug_0.8.7.bb => libmodplug_0.8.8.5.bb} (80%)

diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb
similarity index 80%
rename from meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb
rename to meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb
index 2361875..1070246 100644
--- a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb
+++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb
@@ -5,8 +5,8 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz"
-SRC_URI[md5sum] = "d2d9ccd8da22412999caed076140f786"
-SRC_URI[sha256sum] = "3cfdebb60833a082e2f2b8faa3892bc9201d05c64051503e8007d8c98ae9e4c2"
+SRC_URI[md5sum] = "5f30241db109d647781b784e62ddfaa1"
+SRC_URI[sha256sum] = "77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad"
 
 inherit autotools pkgconfig
 
-- 
1.9.3

[PATCH 06/10] protobuf: update to 2.5.0

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../protobuf/{protobuf_2.4.1.bb => protobuf_2.5.0.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-devtools/protobuf/{protobuf_2.4.1.bb => protobuf_2.5.0.bb} (81%)

diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_2.4.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf_2.5.0.bb
similarity index 81%
rename from meta-oe/recipes-devtools/protobuf/protobuf_2.4.1.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_2.5.0.bb
index 8386206..a0db7bf 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_2.4.1.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_2.5.0.bb
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=af6809583bfde9a31595a58bb4a24514"
 
 SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "dc84e9912ea768baa1976cb7bbcea7b5"
-SRC_URI[sha256sum] = "eac6969b617f397247e805267da2b0db3ff9e5a9163b123503a192fbb5776567"
+SRC_URI[md5sum] = "b751f772bdeb2812a2a8e7202bf1dae8"
+SRC_URI[sha256sum] = "c55aa3dc538e6fd5eaf732f4eb6b98bdcb7cedb5b91d3b5bdcf29c98c293f58e"
 
 EXTRA_OECONF += " --with-protoc=echo"
 
-- 
1.9.3

[PATCH 07/10] mariadb: update to 5.5.41

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 ...b-native_5.5.40.bb => mariadb-native_5.5.41.bb} |  0
 meta-oe/recipes-support/mysql/mariadb.inc          |  5 +--
 .../mysql/mariadb/revert-fix-for-MDEV-5120.patch   | 46 ----------------------
 .../mysql/{mariadb_5.5.40.bb => mariadb_5.5.41.bb} |  0
 4 files changed, 2 insertions(+), 49 deletions(-)
 rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.40.bb => mariadb-native_5.5.41.bb} (100%)
 delete mode 100644 meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch
 rename meta-oe/recipes-support/mysql/{mariadb_5.5.40.bb => mariadb_5.5.41.bb} (100%)

diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.41.bb
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.41.bb
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index a04288d..cacb0d5 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -11,11 +11,10 @@ SRC_URI = "http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$
            file://my.cnf \
            file://mysqld.service \
            file://configure.cmake-fix-valgrind.patch \
-           file://revert-fix-for-MDEV-5120.patch \
           "
 
-SRC_URI[md5sum] = "561bede89a8bd19c374dad2d8f24fdfe"
-SRC_URI[sha256sum] = "cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a"
+SRC_URI[md5sum] = "d2415efc6a6d73d7a58f3c79bb42f2e8"
+SRC_URI[sha256sum] = "a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332"
 
 S = "${WORKDIR}/mariadb-${PV}"
 
diff --git a/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch b/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch
deleted file mode 100644
index 41493a1..0000000
--- a/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Revert mariadb commit revno 4300 in branch 5.5 which fixes
-https://mariadb.atlassian.net/browse/MDEV-5120.
-
-------------------------------------------------------------
-revno: 4300
-fixes bug: https://mariadb.atlassian.net/browse/MDEV-5120
-committer: Sergei Golubchik <sergii@pisem.net>
-branch nick: 5.5
-timestamp: Thu 2014-10-02 11:57:40 +0200
-message:
-  MDEV-5120 Test suite test maria-no-logging fails
-  
-  stat structure (from <sys/stat.h>) is conditionally defined
-  to have different layout and size depending on the defined macros.
-  The correct macro is defined in my_config.h, which means it MUST be
-  included first (or, at least before <features.h> - so, practically,
-  before including any system headers).
-------------------------------------------------------------
-
-It causes modphp fails to build. Bug MDEV-5120 is an test suite test
-maria-no-logging fails. There is no side effect to revert it.
-
-Upstream-Status: Backport
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
---- mariadb-5.5.40/config.h.cmake.orig	2014-11-13 14:23:50.868147145 +0800
-+++ mariadb-5.5.40/config.h.cmake	2014-11-13 14:24:23.372148031 +0800
-@@ -641,17 +641,4 @@
- #cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@
- #cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@
- 
--/*
--  stat structure (from <sys/stat.h>) is conditionally defined
--  to have different layout and size depending on the defined macros.
--  The correct macro is defined in my_config.h, which means it MUST be
--  included first (or at least before <features.h> - so, practically,
--  before including any system headers).
--
--  __GLIBC__ is defined in <features.h>
--*/
--#ifdef __GLIBC__
--#error <my_config.h> MUST be included first!
--#endif
--
- #endif
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.40.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.41.bb
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb_5.5.40.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.41.bb
-- 
1.9.3

[PATCH 08/10] rfkill: update to 0.5

[Paul Eggleton]

Also make SUMMARY a bit more useful.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-connectivity/rfkill/{rfkill_0.4.bb => rfkill_0.5.bb}  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-connectivity/rfkill/{rfkill_0.4.bb => rfkill_0.5.bb} (76%)

diff --git a/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb b/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
similarity index 76%
rename from meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb
rename to meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
index 3b2943c..3e64476 100644
--- a/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb
+++ b/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
@@ -1,20 +1,20 @@
-SUMMARY = "rfkill CLI utility"
+SUMMARY = "Radio enable/disable command line utility"
 HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/rfkill"
 SECTION = "base"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94"
-PR = "r1"
 
 SRC_URI = "http://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.bz2 \
            file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch \
            file://dont.call.git.rev-parse.on.parent.dir.patch"
 
-SRC_URI[md5sum] = "727892c0fb35c80ee3849fbe89b45350"
-SRC_URI[sha256sum] = "ca10e4827a5f0a36e093aee6ad81b5febf81f8097d7d858889ac51ff364168c1"
+SRC_URI[md5sum] = "b957713a6cfbcd8ac0e94420aeddcf1a"
+SRC_URI[sha256sum] = "3e160cca504a53679f2b3254f31c53a4fb38a021bc50fed8eb57a436d33dfa07"
 
 do_compile() {
     oe_runmake
 }
+
 do_install() {
     oe_runmake DESTDIR=${D} install
 }
-- 
1.9.3

[PATCH 09/10] picocom: update to 1.7

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-support/picocom/{picocom_1.6.bb => picocom_1.7.bb} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/picocom/{picocom_1.6.bb => picocom_1.7.bb} (67%)

diff --git a/meta-oe/recipes-support/picocom/picocom_1.6.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb
similarity index 67%
rename from meta-oe/recipes-support/picocom/picocom_1.6.bb
rename to meta-oe/recipes-support/picocom/picocom_1.7.bb
index 6b5200c..8141106 100644
--- a/meta-oe/recipes-support/picocom/picocom_1.6.bb
+++ b/meta-oe/recipes-support/picocom/picocom_1.7.bb
@@ -4,7 +4,10 @@ LICENSE = "GPLv2+"
 HOMEPAGE = "http://code.google.com/p/picocom/"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=393a5ca445f6965873eca0259a17f833"
 
-SRC_URI = "http://picocom.googlecode.com/files/picocom-1.6.tar.gz"
+SRC_URI = "http://picocom.googlecode.com/files/picocom-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef"
+SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9a2348c89e02a84935517002b3bc2c1129e"
 
 CPPFLAGS_append = '-DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR=\\"/var/lock\\" -DHIGH_BAUD'
 
@@ -13,5 +16,3 @@ do_install () {
     install -m 0755 ${PN} pcasc pcxm pcym pczm ${D}${bindir}/
 }
 
-SRC_URI[md5sum] = "426c3d30b82cbc80b0dafdccd6020c6c"
-SRC_URI[sha256sum] = "df5774072de805ff06c6b1420dbcc932b1b00e919b49e22a7be14bcad5a0b3a1"
-- 
1.9.3

[PATCH 10/10] libssh: update to just after 0.6.4

[Paul Eggleton]

Among other things, includes a fix for CVE-2014-8132.

(There are a couple of useful-looking fixes after 0.6.4 in the 0.6
branch, hence I have renamed the recipe to _git and set PV to the
standard format.)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-support/libssh/{libssh_0.6.3.bb => libssh_git.bb} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libssh/{libssh_0.6.3.bb => libssh_git.bb} (90%)

diff --git a/meta-oe/recipes-support/libssh/libssh_0.6.3.bb b/meta-oe/recipes-support/libssh/libssh_git.bb
similarity index 90%
rename from meta-oe/recipes-support/libssh/libssh_0.6.3.bb
rename to meta-oe/recipes-support/libssh/libssh_git.bb
index 771a47a..d21bdc3 100644
--- a/meta-oe/recipes-support/libssh/libssh_0.6.3.bb
+++ b/meta-oe/recipes-support/libssh/libssh_git.bb
@@ -8,9 +8,11 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139"
 
 SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-6"
-SRCREV = "87145387aa12b720b52d6bc75b4dd6cd058c868a"
+SRCREV = "3880a8ed80a4b1e2c052bd62f328bba2f869d5ae"
 S = "${WORKDIR}/git"
 
+PV = "0.6.4+git${SRCPV}"
+
 EXTRA_OECMAKE = " \
     -DWITH_GCRYPT=1 \
     -DWITH_PCAP=1 \
-- 
1.9.3