Skip to contentSkip to conversation

Recipe upgrades

PATCH In review Paul Eggleton 2 participants 5 messages Jul 9, 2019 – Jul 10, 2019

lore
Share & tools
lore
#0 lore raw

cover Recipe upgrades

The following changes since commit 64974b8779291419486338f75f229a732e450d78:

xfce4-screensaver: 0.1.4 -> 0.1.5 (2019-06-21 06:22:19 -0700)

are available in the Git repository at:

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

Paul Eggleton (3):
mraa: update to 2.0.0
upm: update to 2.0.0
picocom: update to 3.1

 meta-oe/recipes-extended/mraa/mraa_git.bb     |   4 +-
 .../0001-Replace-strncpy-with-memcpy.patch    |  49 ------
 .../upm/upm/0001-Use-stdint-types.patch       | 139 ++++++++++++++++++
 ...lude-sys-types.h-for-uint-definition.patch |  33 -----
 meta-oe/recipes-extended/upm/upm_git.bb       |   7 +-
 .../recipes-support/picocom/picocom_git.bb    |   8 +-
 6 files changed, 148 insertions(+), 92 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch
 create mode 100644 meta-oe/recipes-extended/upm/upm/0001-Use-stdint-types.patch
 delete mode 100644 meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/3 mraa: update to 2.0.0

Changelog:

https://github.com/intel-iot-devkit/mraa/blob/master/docs/changelog.md

Also tweak PV to match convention for git recipes (+git rather than
-git).

---
 meta-oe/recipes-extended/mraa/mraa_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-extended/mraa/mraa_git.bb +2 -2
index 737c13427a..17ca262734 100644
@@ -5,8 +5,8 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4b92a3b497d7943042a6db40c088c3f2"
 
-SRCREV = "fbb7d9232067eac3f4508a37a8f7ea0c4fcebacb"
-PV = "1.9.0-git${SRCPV}"
+SRCREV = "967585c9ea0e1a8818d2172d2395d8502f6180a2"
+PV = "2.0.0+git${SRCPV}"
 
 SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
            "
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/3 upm: update to 2.0.0

In reply to Paul Eggleton

Changelog:

https://github.com/intel-iot-devkit/upm/blob/master/docs/changelog.md

Dropped a couple of patches merged upstream and updated PV to match convention for git recipes (+git rather than -git).

---
 .../0001-Replace-strncpy-with-memcpy.patch    |  49 ------
 .../upm/upm/0001-Use-stdint-types.patch       | 139 ++++++++++++++++++
 ...lude-sys-types.h-for-uint-definition.patch |  33 -----
 meta-oe/recipes-extended/upm/upm_git.bb       |   7 +-
 4 files changed, 142 insertions(+), 86 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch
 create mode 100644 meta-oe/recipes-extended/upm/upm/0001-Use-stdint-types.patch
 delete mode 100644 meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch
meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch deleted +0 -49
deleted file mode 100644
index 4b17087ef8..0000000000
@@ -1,49 +0,0 @@
-From d314f26e024aaf15bf4ab22ceb98501148d0eac8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 7 May 2018 19:53:33 -0700
-Subject: [PATCH] Replace strncpy with memcpy
-
-gcc8 detects that strncpy is overwiritng the null terminating character
-the source strings are already initialized to 0 so memcpy would do the same
-job
-
-Fixes
-rn2903.c:153:5: error: 'strncpy' output may be truncated copying 16 bytes from a string of length 511 [-Werror=stringop-truncation]
-     strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64);
-     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Khem Raj <[email protected]>
----
- src/ecezo/ecezo.c   | 2 +-
- src/rn2903/rn2903.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ecezo/ecezo.c b/src/ecezo/ecezo.c
-index 6a195fc1..56c6dab3 100644
---- a/src/ecezo/ecezo.c
-+++ b/src/ecezo/ecezo.c
-@@ -488,7 +488,7 @@ int ecezo_send_command(const ecezo_context dev, char *cmd, char *buffer,
-     // our write buffer
-     char writeBuffer[ECEZO_MAX_BUFFER_LEN];
- 
--    strncpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN);
-+    memcpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN-1);
-     writeBuffer[ECEZO_MAX_BUFFER_LEN - 1] = 0;
- 
-     int writelen = strlen(writeBuffer);
-diff --git a/src/rn2903/rn2903.c b/src/rn2903/rn2903.c
-index f30a33ae..01a011da 100644
---- a/src/rn2903/rn2903.c
-+++ b/src/rn2903/rn2903.c
-@@ -150,7 +150,7 @@ static rn2903_context _rn2903_postinit(rn2903_context dev,
-         rn2903_close(dev);
-         return NULL;
-     }
--    strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64);
-+    memcpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64);
- 
-     return dev;
- }
--- 
-2.17.0
-
meta-oe/recipes-extended/upm/upm/0001-Use-stdint-types.patch new file +139 -0

139 lines not on this page · raw message

meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch deleted +0 -33
deleted file mode 100644
index a0a47411d7..0000000000
@@ -1,33 +0,0 @@
-From 48a580bd402cf6a3ee9e42013653219bfeb3caf6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 21 Jun 2018 18:39:16 -0700
-Subject: [PATCH] include sys/types.h for uint definition
-
-uint is defined in sys/types.h, therefore this
-header needs to be included, it gets exposed with
-musl where this header is not getting included indirectly
-as it is happening when building on glibc
-
-Fixes build errors on musl e.g.
-upm/src/kx122/kx122.hpp:456:31: error: 'uint' has not been declared
-|        void setBufferThreshold(uint samples);
-|                                ^~~~
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Submitted [https://github.com/intel-iot-devkit/upm/pull/656]
- src/kx122/kx122.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/kx122/kx122.h b/src/kx122/kx122.h
-index 1622ed50..56e5215e 100644
---- a/src/kx122/kx122.h
-+++ b/src/kx122/kx122.h
-@@ -31,6 +31,7 @@ extern "C"{
- #include <assert.h>
- #include <unistd.h>
- #include <math.h>
-+#include <sys/types.h>
- 
- #include <mraa/i2c.h>
- #include <mraa/spi.h>
meta-oe/recipes-extended/upm/upm_git.bb +3 -4
index 8854a33bcb..a6b379ec36 100644
@@ -7,13 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f"
 
 DEPENDS = "libjpeg-turbo mraa"
 
-SRCREV = "dc45cd78595c7c24c8a8574c63bb48b5bb99c5aa"
-PV = "1.6.0-git${SRCPV}"
+SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d"
+PV = "2.0.0+git${SRCPV}"
 
 SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
-           file://0001-Replace-strncpy-with-memcpy.patch \
-           file://0001-include-sys-types.h-for-uint-definition.patch \
            file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \
+           file://0001-Use-stdint-types.patch \
            "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.20.1
#3 lore raw

PATCH 3/3 picocom: update to 3.1

In reply to Paul Eggleton

There have been a couple of releases since we last upgraded, including a number of additional features. Changelog is here:

https://github.com/npat-efault/picocom/releases

Also tweak SUMMARY - I don't think this has been 20k in a while; with this upgrade the binary alone went from 60k to 70k.

---
 meta-oe/recipes-support/picocom/picocom_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta-oe/recipes-support/picocom/picocom_git.bb +4 -4
index e091094cf4..0d65453b7c 100644
@@ -1,13 +1,13 @@
-SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
+SUMMARY = "Lightweight and minimal dumb-terminal emulation program"
 SECTION = "console/utils"
 LICENSE = "GPLv2+"
-HOMEPAGE = "http://code.google.com/p/picocom/"
+HOMEPAGE = "https://github.com/npat-efault/picocom"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a"
 
-BASEPV = "2.2"
+BASEPV = "3.1"
 PV = "${BASEPV}+git${SRCPV}"
 
-SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc"
+SRCREV = "90385aabe2b51f39fa130627d46b377569f82d4a"
 
 SRC_URI = "git://github.com/npat-efault/picocom"
 
Signature · 1 line
2.20.1
#4 lore raw

Re: [meta-oe][PATCH 3/3] picocom: update to 3.1

Hi Paul

This fails to build on musl

see
https://errors.yoctoproject.org/Errors/Details/251294/

I think we need a fix similar to this one
https://github.com/serialport/node-serialport/commit/02e2bfecf0b32037121abb5bc2925dcb83785934

can you try it out and send a v2 if it works ?

Quoted 44 lines · Paul Eggleton

There have been a couple of releases since we last upgraded, including a number of additional features. Changelog is here:

https://github.com/npat-efault/picocom/releases

Also tweak SUMMARY - I don't think this has been 20k in a while; with this upgrade the binary alone went from 60k to 70k.

---
 meta-oe/recipes-support/picocom/picocom_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta-oe/recipes-support/picocom/picocom_git.bb +4 -5
index e091094cf4..0d65453b7c 100644
@@ -1,13 +1,13 @@
-SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
+SUMMARY = "Lightweight and minimal dumb-terminal emulation program"
 SECTION = "console/utils"
 LICENSE = "GPLv2+"
-HOMEPAGE = "http://code.google.com/p/picocom/"
+HOMEPAGE = "https://github.com/npat-efault/picocom"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a"
 
-BASEPV = "2.2"
+BASEPV = "3.1"
 PV = "${BASEPV}+git${SRCPV}"
 
-SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc"
+SRCREV = "90385aabe2b51f39fa130627d46b377569f82d4a"
 
 SRC_URI = "git://github.com/npat-efault/picocom"
 
--

2.20.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel