Re: [oe] [meta-python][PATCH 1/3] Add python3 matplotlib
Tim, Ok good about matplotlib, this one is not an easy beast :p! Have you also planned to integrate pandas? Otherwise I will happily just send a better patch just for this one! Best regards, Guy On 09/27/2017 07:16 AM, Tim Orling wrote: FYI, I have a related series in progress, but I can and will happily rebase on top of yours. My series is much more complicated for reasons that I will send to the ML when I get a couple more dependent packages being picked up by matplotlib properly. It will be worth the wait :) —Tim On Sep 25, 2017, at 11:31 PM, Guy Morand wrote: Derek, Arrgg I just copied the recipe from my meta-layer that has a different structure! Sorry for wasting your time with my worthless patches, I'll try better! Thanks anyway for your feedbacks! Best regards, Guy On 09/26/2017 12:40 AM, Derek Straka wrote: Also, could you incorporate the changes into the existing python-* recipes so they both use the .inc files. It makes my automated updates easier. Thanks! -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-python][PATCH 1/3] Add python3 matplotlib
FYI, I have a related series in progress, but I can and will happily rebase on top of yours. My series is much more complicated for reasons that I will send to the ML when I get a couple more dependent packages being picked up by matplotlib properly. It will be worth the wait :) —Tim > On Sep 25, 2017, at 11:31 PM, Guy Morand wrote: > > Derek, > > Arrgg I just copied the recipe from my meta-layer that has a different > structure! Sorry for wasting your time with my worthless patches, I'll try > better! > > Thanks anyway for your feedbacks! > > Best regards, > > Guy > > On 09/26/2017 12:40 AM, Derek Straka wrote: >> Also, could you incorporate the changes into the existing python-* recipes >> so they both use the .inc files. It makes my automated updates easier. >> Thanks! >> -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] uftrace: update version to 0.8
Two patches are applied in upstream (v0.8)
Major release features
* event tracing support
* python scripting support
* nested libcall tracing
Signed-off-by: Changhyeok Bae
---
.../0001-Makefile-Add-LDFLAGS-in-export.patch | 31 --
...tils-Add-limits-header-to-fix-build-error.patch | 31 --
.../uftrace/{uftrace_0.7.bb => uftrace_0.8.bb} | 8 ++
3 files changed, 2 insertions(+), 68 deletions(-)
delete mode 100644
meta-oe/recipes-devtools/uftrace/uftrace/0001-Makefile-Add-LDFLAGS-in-export.patch
delete mode 100644
meta-oe/recipes-devtools/uftrace/uftrace/0002-utils-Add-limits-header-to-fix-build-error.patch
rename meta-oe/recipes-devtools/uftrace/{uftrace_0.7.bb => uftrace_0.8.bb}
(75%)
diff --git
a/meta-oe/recipes-devtools/uftrace/uftrace/0001-Makefile-Add-LDFLAGS-in-export.patch
b/meta-oe/recipes-devtools/uftrace/uftrace/0001-Makefile-Add-LDFLAGS-in-export.patch
deleted file mode 100644
index f665051..000
---
a/meta-oe/recipes-devtools/uftrace/uftrace/0001-Makefile-Add-LDFLAGS-in-export.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ec794945475d5792f2ae85afe461e64266613640 Mon Sep 17 00:00:00 2001
-From: Changhyeok Bae
-Date: Thu, 13 Jul 2017 16:44:52 +0900
-Subject: [PATCH 1/2] Makefile: Add LDFLAGS in export
-
-To use build with musl, need to argp library.
-So need to add LDFLAGS from outside.
-
-Upstream-Status: Accepted
-
-Signed-off-by:
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 67be2da..0ca649a 100644
a/Makefile
-+++ b/Makefile
-@@ -48,7 +48,7 @@ endif
- RM = rm -f
- INSTALL = install
-
--export ARCH CC AR LD RM srcdir objdir
-+export ARCH CC AR LD RM srcdir objdir LDFLAGS
-
- COMMON_CFLAGS := -O2 -g -D_GNU_SOURCE $(CFLAGS) $(CPPFLAGS)
- COMMON_CFLAGS += -iquote $(srcdir) -iquote $(objdir) -iquote
$(srcdir)/arch/$(ARCH)
---
-1.9.1
-
diff --git
a/meta-oe/recipes-devtools/uftrace/uftrace/0002-utils-Add-limits-header-to-fix-build-error.patch
b/meta-oe/recipes-devtools/uftrace/uftrace/0002-utils-Add-limits-header-to-fix-build-error.patch
deleted file mode 100644
index 2690011..000
---
a/meta-oe/recipes-devtools/uftrace/uftrace/0002-utils-Add-limits-header-to-fix-build-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3bda554766150705160fe2191d8761c7881e2433 Mon Sep 17 00:00:00 2001
-From: Changhyeok Bae
-Date: Thu, 13 Jul 2017 16:46:20 +0900
-Subject: [PATCH 2/2] utils: Add limits header to fix build error
-
-[Error]
-error: 'PATH_MAX' undeclared (first use in this function); did you mean
-'INT8_MAX'?
-
-Upstream-Status: Accepted
-
-Signed-off-by: Changhyeok Bae
- utils/utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/utils/utils.c b/utils/utils.c
-index 03522c9..30f9e81 100644
a/utils/utils.c
-+++ b/utils/utils.c
-@@ -6,6 +6,7 @@
- #include
- #include
- #include
-+#include
-
- #include "utils/utils.h"
-
---
-1.9.1
-
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.7.bb
b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb
similarity index 75%
rename from meta-oe/recipes-devtools/uftrace/uftrace_0.7.bb
rename to meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb
index 821d0bb..82b1795 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.7.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb
@@ -10,12 +10,8 @@ DEPENDS_append_libc-musl = " argp-standalone"
inherit autotools
-SRCREV = "712ad01fdde57893936d7e254451eec67ab41ca6"
-SRC_URI = "\
-git://github.com/namhyung/${BPN} \
-file://0001-Makefile-Add-LDFLAGS-in-export.patch \
-file://0002-utils-Add-limits-header-to-fix-build-error.patch \
-"
+SRCREV = "5af9ff9fa89c340617e52c8ed05798b352a7145c"
+SRC_URI = "git://github.com/namhyung/${BPN}"
S = "${WORKDIR}/git"
LDFLAGS_append_libc-musl = " -largp"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] lldpd: Update to version 0.9.8
- Remove json packageconfig. See commit:
https://github.com/vincentbernat/lldpd/commit/06987a24ce053cbb57f8853bbf544bc7c067c8aa
- Add patch to use mkdir from /bin/mkdir in systemd service.
- Update from lldpd (0.9.8)
* Changes:
+ "Station" capability is only set if no other bit is set.
+ Use ethtool to get permanent address for bonds and teams. This
might provide different results than the previous method. Some
devices may still use the previous method.
+ Don't run ethtool as root. Kernels older than 2.6.19 won't get
link information anymore.
+ Add "configure system hostname ." option to not use a FQDN
for system name.
+ Add "-f json0" to provide a more regular/machine-parsable output
to JSON output, even when not compiled with --enable-json0.
* Fixes:
+ Handle team interfaces like a bond. Real MAC address cannot be
retrieved yet.
- Updates from lldpd (0.9.7)
* Changes:
+ Attach remote TTL to port instead of chassis.
+ JSON support is now built-in and unconditionally enabled. Use
--enable-json0 to keep the pre-0.9.2 json-c format.
+ When logging to syslog and daemonizing, don't log to stderr.
+ vxlan interfaces are now ignored as they are multi-point interfaces.
+ Maximum number of neighbors for an interface is increased from 4 to 32.
Signed-off-by: Fabio Berton
---
...lldpd.service.in-Use-fixed-path-for-mkdir.patch | 32 ++
.../lldpd/{lldpd_0.9.6.bb => lldpd_0.9.8.bb} | 6 ++--
2 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644
meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch
rename meta-networking/recipes-daemons/lldpd/{lldpd_0.9.6.bb =>
lldpd_0.9.8.bb} (91%)
diff --git
a/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch
b/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch
new file mode 100644
index 0..4876e1794
--- /dev/null
+++
b/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch
@@ -0,0 +1,32 @@
+From f9f3e4dd31588cce5f655730da7b5c3f56a9bdc1 Mon Sep 17 00:00:00 2001
+From: Fabio Berton
+Date: Tue, 26 Sep 2017 09:19:51 -0300
+Subject: [PATCH] src/daemon/lldpd.service.in: Use fixed path for mkdir command
+Organization: O.S. Systems Software LTDA.
+
+@mkdir_p@ is expanded to host tools path ../build/tmp/hosttools/mkdir that
+doesn't exist on target. Remove @mkdir_p@ and use /bin/mkdir -p to
+create /var/run/lldpd directory.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Fabio Berton
+---
+ src/daemon/lldpd.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/lldpd.service.in b/src/daemon/lldpd.service.in
+index fdb7338..4291830 100644
+--- a/src/daemon/lldpd.service.in
b/src/daemon/lldpd.service.in
+@@ -9,7 +9,7 @@ Type=notify
+ NotifyAccess=main
+ EnvironmentFile=-/etc/default/lldpd
+ EnvironmentFile=-/etc/sysconfig/lldpd
+-ExecStartPre=@mkdir_p@ @PRIVSEP_CHROOT@
++ExecStartPre=/bin/mkdir -p @PRIVSEP_CHROOT@
+ ExecStart=@sbindir@/lldpd $DAEMON_ARGS $LLDPD_OPTIONS
+ Restart=on-failure
+ PrivateTmp=yes
+--
+2.14.2
diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_0.9.6.bb
b/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb
similarity index 91%
rename from meta-networking/recipes-daemons/lldpd/lldpd_0.9.6.bb
rename to meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb
index 0cd063720..dbd84cf67 100644
--- a/meta-networking/recipes-daemons/lldpd/lldpd_0.9.6.bb
+++ b/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb
@@ -9,10 +9,11 @@ SRC_URI = "\
http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \
file://lldpd.init.d \
file://lldpd.default \
+file://src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch \
"
-SRC_URI[md5sum] = "0dcdee7c1b3c62362d73f6508c11edae"
-SRC_URI[sha256sum] =
"e74e2dd7e2a233ca1ff385c925ddae2a916d302819d1433741407d2f8fb0ddd8"
+SRC_URI[md5sum] = "8809600492f6b73149eb19158e819c1f"
+SRC_URI[sha256sum] =
"9ee494e91bc33938575b2c09b26188c486ef8eac6e2155d250c189cc4e988c4f"
inherit autotools update-rc.d useradd systemd pkgconfig bash-completion
@@ -29,7 +30,6 @@ EXTRA_OECONF += "--without-embedded-libevent \
"
PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3"
-PACKAGECONFIG[json] = "--with-json,--without-json,jansson"
PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2"
PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp"
PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
--
2.14.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8-native: Fix sigsegv with gcc7
On Tue, Sep 26, 2017 at 4:52 PM, Maxin B. John wrote:
> Hi,
>
> On Tue, Sep 26, 2017 at 01:26:22PM +0200, Ricardo Ribalda Delgado wrote:
>> Ping?
>
> Pushed these 3 patches to master-next. Sorry for the delay.
No worries :) Just wanted to make sure the patches were not lost in the wind.
Best regards!
>
> Best Regards,
> Maxin
>
>> On Thu, Sep 7, 2017 at 10:51 AM, Ricardo Ribalda Delgado
>> wrote:
>> > OpenJDK does not build properly with GCC7. Add the same workaround that
>> > we have for GCC6.
>> >
>> > Without this patch:
>> >
>> > | #
>> > | # A fatal error has been detected by the Java Runtime Environment:
>> > | #
>> > | # SIGSEGV (0xb) at pc=0x7fcad0efcd5b, pid=17206,
>> > tid=0x7fcab264c700
>> > | #
>> > | # JRE version: OpenJDK Runtime Environment (8.0_102-b14) (build
>> > 1.8.0_102-internal-b14)
>> > | # Java VM: OpenJDK 64-Bit Server VM (25.102-b14 mixed mode linux-amd64
>> > compressed oops)
>> > | # Problematic frame:
>> > | # V [libjvm.so+0x78bd5b] Node::Node(unsigned int)+0x2b
>> > | #
>> > | # Failed to write core dump. Core dumps have been disabled. To enable
>> > core dumping, try "ulimit -c unlimited" before starting Java again
>> > | #
>> > | # An error report file with more information is saved as:
>> > | #
>> > /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/build/hs_err_pid17206.log
>> > | [thread 140508549912320 also had an error]
>> > |
>> > | [error occurred during error reporting , id 0xb]
>> > |
>> > | #
>> > | # If you would like to submit a bug report, please visit:
>> > | # http://bugreport.java.com/bugreport/crash.jsp
>> > | #
>> >
>> > Signed-off-by: Ricardo Ribalda Delgado
>> > ---
>> > recipes-core/openjdk/openjdk-8-common.inc | 7 ---
>> > 1 file changed, 4 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/recipes-core/openjdk/openjdk-8-common.inc
>> > b/recipes-core/openjdk/openjdk-8-common.inc
>> > index def779db4d59..0c5c2c3e3d2f 100644
>> > --- a/recipes-core/openjdk/openjdk-8-common.inc
>> > +++ b/recipes-core/openjdk/openjdk-8-common.inc
>> > @@ -218,10 +218,11 @@ EXTRA_OECONF_append = "\
>> > --with-update-version=${OPENJDK_UPDATE_VERSION} \
>> > "
>> >
>> > -# GCC 6 sets the default C++ standard to C++14 and introduces dead store
>> > -# elimination by default. OpenJDK 8 is not ready for either of these
>> > -# changes.
>> > +# Since v6, GCC sets the default C++ standard to C++14 and introduces
>> > +# dead store elimination by default. OpenJDK 8 is not ready for either
>> > +# of these changes.
>> > FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
>> > +FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
>> >
>> > # All supported cross compilers support the compiler flags that were
>> > # added to make compilation with gcc6 work. But the host compiler for
>> > --
>> > 2.14.1
>> >
>>
>>
>>
>> --
>> Ricardo Ribalda
>> --
>> ___
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Ricardo Ribalda
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8-native: Fix sigsegv with gcc7
Hi,
On Tue, Sep 26, 2017 at 01:26:22PM +0200, Ricardo Ribalda Delgado wrote:
> Ping?
Pushed these 3 patches to master-next. Sorry for the delay.
Best Regards,
Maxin
> On Thu, Sep 7, 2017 at 10:51 AM, Ricardo Ribalda Delgado
> wrote:
> > OpenJDK does not build properly with GCC7. Add the same workaround that
> > we have for GCC6.
> >
> > Without this patch:
> >
> > | #
> > | # A fatal error has been detected by the Java Runtime Environment:
> > | #
> > | # SIGSEGV (0xb) at pc=0x7fcad0efcd5b, pid=17206,
> > tid=0x7fcab264c700
> > | #
> > | # JRE version: OpenJDK Runtime Environment (8.0_102-b14) (build
> > 1.8.0_102-internal-b14)
> > | # Java VM: OpenJDK 64-Bit Server VM (25.102-b14 mixed mode linux-amd64
> > compressed oops)
> > | # Problematic frame:
> > | # V [libjvm.so+0x78bd5b] Node::Node(unsigned int)+0x2b
> > | #
> > | # Failed to write core dump. Core dumps have been disabled. To enable
> > core dumping, try "ulimit -c unlimited" before starting Java again
> > | #
> > | # An error report file with more information is saved as:
> > | #
> > /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/build/hs_err_pid17206.log
> > | [thread 140508549912320 also had an error]
> > |
> > | [error occurred during error reporting , id 0xb]
> > |
> > | #
> > | # If you would like to submit a bug report, please visit:
> > | # http://bugreport.java.com/bugreport/crash.jsp
> > | #
> >
> > Signed-off-by: Ricardo Ribalda Delgado
> > ---
> > recipes-core/openjdk/openjdk-8-common.inc | 7 ---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/recipes-core/openjdk/openjdk-8-common.inc
> > b/recipes-core/openjdk/openjdk-8-common.inc
> > index def779db4d59..0c5c2c3e3d2f 100644
> > --- a/recipes-core/openjdk/openjdk-8-common.inc
> > +++ b/recipes-core/openjdk/openjdk-8-common.inc
> > @@ -218,10 +218,11 @@ EXTRA_OECONF_append = "\
> > --with-update-version=${OPENJDK_UPDATE_VERSION} \
> > "
> >
> > -# GCC 6 sets the default C++ standard to C++14 and introduces dead store
> > -# elimination by default. OpenJDK 8 is not ready for either of these
> > -# changes.
> > +# Since v6, GCC sets the default C++ standard to C++14 and introduces
> > +# dead store elimination by default. OpenJDK 8 is not ready for either
> > +# of these changes.
> > FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
> > +FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
> >
> > # All supported cross compilers support the compiler flags that were
> > # added to make compilation with gcc6 work. But the host compiler for
> > --
> > 2.14.1
> >
>
>
>
> --
> Ricardo Ribalda
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-browser] [PATCH] meta: drop ${COREBASE}/LICENSE references
From: Ming Liu
The top level LICENSE file is not actually a license, it refers
other licenses that are used by Bitbake and Meta-data. Relying
on this file could cause problems for recipes when this file
changes, which it is about to.
Change-Id: Ie2ab9a79f3d9f451ed0424c7289de94de14707bf
Signed-off-by: Ming Liu
---
recipes-mozilla/firefox-addon/firefox-addon.inc | 2 +-
recipes-mozilla/firefox-l10n/firefox-l10n.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-mozilla/firefox-addon/firefox-addon.inc
b/recipes-mozilla/firefox-addon/firefox-addon.inc
index 45f079e..fd18adb 100644
--- a/recipes-mozilla/firefox-addon/firefox-addon.inc
+++ b/recipes-mozilla/firefox-addon/firefox-addon.inc
@@ -8,7 +8,7 @@ DEPENDS = "mozilla-devscripts-native"
LICENSE = "MPLv1 | GPLv2+ | LGPLv2.1+"
# Ugly hack for now; we need to check license per recipe later
-LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
S = "${WORKDIR}"
diff --git a/recipes-mozilla/firefox-l10n/firefox-l10n.inc
b/recipes-mozilla/firefox-l10n/firefox-l10n.inc
index 7b252a2..ec38ce6 100644
--- a/recipes-mozilla/firefox-l10n/firefox-l10n.inc
+++ b/recipes-mozilla/firefox-l10n/firefox-l10n.inc
@@ -8,7 +8,7 @@ DEPENDS = "mozilla-devscripts-native"
LICENSE = "MPLv1 | GPLv2+ | LGPLv2.1+"
# Ugly hack for now; we need to check license per recipe later
-LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
LANGUAGE = "${@get_language_name('${PN}')}"
PR = "r3"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH] openjdk-8-common: Fix warning evaluating CFLAGS
Ping?
On Thu, Sep 7, 2017 at 11:24 AM, Ricardo Ribalda Delgado
wrote:
> Code is (on my opinion) simpler, making use of the dumpversion flag, instead
> of calling the pre-processor via a pipe.
>
> Flag has been tested on both clang gcc:
>
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-4.8
> -dumpversion
> 4.8
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-4.9
> -dumpversion
> 4.9.3
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-5 -dumpversion
> 5.4.1
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-6 -dumpversion
> 6.4.0
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-7 -dumpversion
> 7
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ clang-4.0
> -dumpversion
> 4.2.1
>
> Without this patch:
>
> WARNING:
>
> /home/ricardo/curro/qt5022/build-qt5022-pyro/repo/yocto/../java/recipes-core/openjdk/openjdk-8-native_102b14.bb:
> Unable to export ${CXXFLAGS}: Failure expanding variable CXXFLAGS,
> expression was
>
> -isystem/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/recipe-sysroot-native/usr/include
> -O2 -pipe -D_GLIBCXX_USE_CXX11_ABI=0 ${@version_specific_cflags(d)}
> ${@jdk_cpp_options(d)} which triggered exception IndexError: string
> index out of range
> WARNING:
>
> /home/ricardo/curro/qt5022/build-qt5022-pyro/repo/yocto/../java/recipes-core/openjdk/openjdk-8-native_102b14.bb:
> Unable to export ${CFLAGS}: Failure expanding variable CFLAGS,
> expression was
>
> -isystem/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/recipe-sysroot-native/usr/include
> -O2 -pipe -Wno-error=deprecated-declarations
> ${@version_specific_cflags(d)} ${@jdk_cpp_options(d)} which triggered
> exception IndexError: string index out of range
>
> Signed-off-by: Ricardo Ribalda Delgado
> ---
> recipes-core/openjdk/openjdk-8-common.inc | 10 +++---
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/recipes-core/openjdk/openjdk-8-common.inc
> b/recipes-core/openjdk/openjdk-8-common.inc
> index 0c5c2c3e3d2f..83828e156fb6 100644
> --- a/recipes-core/openjdk/openjdk-8-common.inc
> +++ b/recipes-core/openjdk/openjdk-8-common.inc
> @@ -238,13 +238,9 @@ def version_specific_cflags(d):
> if bb.data.inherits_class('native', d):
> from subprocess import Popen, PIPE
>
> -cmd = d.expand('${CPP} -P -').split()
> -cc = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
> -# This check is GCC specific. Clang always returns 4. For Clang
> -# __clang_major__ and __clang_minor__ need to be checked. Ideally
> -# __GNUC_MINOR__ would be checked as well, but for this recipe
> -# GCC major is all we care about.
> -version = cc.communicate(b'__GNUC__')[0].decode('utf-8')[0]
> +cmd = d.expand('${CC} -dumpversion').split()
> +cc = Popen(cmd, stdout=PIPE, stderr=PIPE)
> +version = cc.communicate()[0].decode('utf-8')[0]
> else:
> # in the cross case, trust that GCCVERSION is correct. This won't
> # work if the native toolchain is Clang, but as of this writing that
> --
> 2.14.1
>
--
Ricardo Ribalda
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8-native: Fix sigsegv with gcc7
Ping?
On Thu, Sep 7, 2017 at 10:51 AM, Ricardo Ribalda Delgado
wrote:
> OpenJDK does not build properly with GCC7. Add the same workaround that
> we have for GCC6.
>
> Without this patch:
>
> | #
> | # A fatal error has been detected by the Java Runtime Environment:
> | #
> | # SIGSEGV (0xb) at pc=0x7fcad0efcd5b, pid=17206, tid=0x7fcab264c700
> | #
> | # JRE version: OpenJDK Runtime Environment (8.0_102-b14) (build
> 1.8.0_102-internal-b14)
> | # Java VM: OpenJDK 64-Bit Server VM (25.102-b14 mixed mode linux-amd64
> compressed oops)
> | # Problematic frame:
> | # V [libjvm.so+0x78bd5b] Node::Node(unsigned int)+0x2b
> | #
> | # Failed to write core dump. Core dumps have been disabled. To enable core
> dumping, try "ulimit -c unlimited" before starting Java again
> | #
> | # An error report file with more information is saved as:
> | #
> /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/build/hs_err_pid17206.log
> | [thread 140508549912320 also had an error]
> |
> | [error occurred during error reporting , id 0xb]
> |
> | #
> | # If you would like to submit a bug report, please visit:
> | # http://bugreport.java.com/bugreport/crash.jsp
> | #
>
> Signed-off-by: Ricardo Ribalda Delgado
> ---
> recipes-core/openjdk/openjdk-8-common.inc | 7 ---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-core/openjdk/openjdk-8-common.inc
> b/recipes-core/openjdk/openjdk-8-common.inc
> index def779db4d59..0c5c2c3e3d2f 100644
> --- a/recipes-core/openjdk/openjdk-8-common.inc
> +++ b/recipes-core/openjdk/openjdk-8-common.inc
> @@ -218,10 +218,11 @@ EXTRA_OECONF_append = "\
> --with-update-version=${OPENJDK_UPDATE_VERSION} \
> "
>
> -# GCC 6 sets the default C++ standard to C++14 and introduces dead store
> -# elimination by default. OpenJDK 8 is not ready for either of these
> -# changes.
> +# Since v6, GCC sets the default C++ standard to C++14 and introduces
> +# dead store elimination by default. OpenJDK 8 is not ready for either
> +# of these changes.
> FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
> +FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
>
> # All supported cross compilers support the compiler flags that were
> # added to make compilation with gcc6 work. But the host compiler for
> --
> 2.14.1
>
--
Ricardo Ribalda
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 1/2] icedtea-native: Fix segmentation build during build
Ping?
On Thu, Sep 7, 2017 at 10:51 AM, Ricardo Ribalda Delgado
wrote:
> Without this patch, icedtea-native do_compile() results in a SIGSEGV
> when compiled with GCC7
>
> Signed-off-by: Ricardo Ribalda Delgado
> ---
> recipes-core/icedtea/icedtea7-native.inc | 2 +
> .../openjdk-7-03b147/vframeArray_Fix_sigsegv.patch | 60
> ++
> 2 files changed, 62 insertions(+)
> create mode 100644
> recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
>
> diff --git a/recipes-core/icedtea/icedtea7-native.inc
> b/recipes-core/icedtea/icedtea7-native.inc
> index 55cb7e7a5024..7d625eb536ed 100644
> --- a/recipes-core/icedtea/icedtea7-native.inc
> +++ b/recipes-core/icedtea/icedtea7-native.inc
> @@ -43,6 +43,7 @@ SRC_URI = " \
>file://jaxws_fix_NullPointerException.patch;apply=no \
>file://timezoneszip.patch \
>file://sigsegv.patch;apply=no \
> + file://vframeArray_Fix_sigsegv.patch;apply=no \
>"
>
> S = "${WORKDIR}/${ICEDTEA}"
> @@ -154,6 +155,7 @@ do_configure_append() {
>
> patch -p1 < ${WORKDIR}/jaxws_fix_NullPointerException.patch
> patch -p1 < ${WORKDIR}/sigsegv.patch
> + patch -p1 < ${WORKDIR}/vframeArray_Fix_sigsegv.patch
> }
>
> EXTRA_OEMAKE = ' \
> diff --git
> a/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
> b/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
> new file mode 100644
> index ..62fe8b207011
> --- /dev/null
> +++ b/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
> @@ -0,0 +1,60 @@
> +Disable Optimization on vframeArray::unpack_to_stack
> +
> +GCC7 triggers a sigsegv while building:
> +
> +
> +|
> JAVA_HOME=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
>
> ANT_OPTS=-Djava.io.tmpdir='/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build/ant-tmp'
>
> /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/recipe-sysroot-native/usr/bin/ant
> -Djdk.version=1.7.0_03 -Dfull.version='1.7.0_03-icedtea-b21'
> -Drelease=1.7.0_03 -Dbuild.number=b21 -Djavac.debug=true
> -Ddebug.classfiles=true -Djavac.target=7 -Djavac.source=7
> -Dboot.java.home=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
>
> -Dimport.jdk=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/jdk
>
> +| Buildfile:
> /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make/build.xml
> +| #
> +| # A fatal error has been detected by the Java Runtime Environment:
> +| #
> +| # SIGSEGV (0xb) at pc=0x7fad7906e868, pid=9747, tid=140383055484672
> +| #
> +| # JRE version: 7.0_03-b21
> +| # Java VM: OpenJDK 64-Bit Server VM (22.0-b10 mixed mode linux-amd64
> compressed oops)
> +| # Derivative: IcedTea7 2.1.3
> +| # Distribution: Custom build (Thu Sep 7 09:36:21 CEST 2017)
> +| # Problematic frame:
> +| # V [libjvm.so+0x78b868] vframeArray::unpack_to_stack(frame&, int,
> int)+0x88
> +| #
> +| # Failed to write core dump. Core dumps have been disabled. To enable core
> dumping, try "ulimit -c unlimited" before starting Java again
> +| #
> +| # An error report file with more information is saved as:
> +| #
> /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make/hs_err_pid9747.log
> +| #
> +| # If you would like to submit a bug report, please include
> +| # instructions on how to reproduce the bug and visit:
> +| # http://icedtea.classpath.org/bugzilla
> +| #
> +| Aborted
> +
> +
> +Upstream-Status: Inappropriate
> +
> +Signed-off-by: Ricardo Ribalda Delgado
> +diff --git a/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
> b/build/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
> +index 52b080999224..81b6a09ea91a 100644
> +--- a/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
> b/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
> +@@ -500,7 +500,7 @@ void vframeArray::fill_in(JavaThread* thread,
> + }
> + }
> +
> +-void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int
> caller_actual_parameters) {
> ++void __attribute__((optimize("O0"))) vframeArray::unpack_to_stack(frame
> &unpack_frame, int exec_mode, int caller_actual_parameters) {
> + // stack picture
> + // unpack_frame
> + // [new interpreter frames ] (frames are skeletal but walkable)
> +diff --git a/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
> b/build/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
> +index 52b080999224..81b6a09ea91a 100644
[oe] [meta-python][PATCH 1/1] python-pyfirmata: move in from meta-intel-iot-middleware and upgrade
The following improvements have been made over the recipe that was in
meta-intel-iot-middleware (a layer which is no longer actively
maintained):
* Upgrade to 1.0.3
* Inherit from setuptools instead of distutils since that changed with
the upgrade
* Inherit pypi and also provide Python 3 version
* Use the correct LICENSE (changed BSD -> MIT back at version 0.9.5)
* Set short description in SUMMARY instead of DESCRIPTION
Signed-off-by: Paul Eggleton
---
meta-python/recipes-devtools/python/python-pyfirmata.inc| 13 +
.../recipes-devtools/python/python-pyfirmata_1.0.3.bb | 3 +++
.../recipes-devtools/python/python3-pyfirmata_1.0.3.bb | 3 +++
3 files changed, 19 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python-pyfirmata.inc
create mode 100644
meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb
create mode 100644
meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb
diff --git a/meta-python/recipes-devtools/python/python-pyfirmata.inc
b/meta-python/recipes-devtools/python/python-pyfirmata.inc
new file mode 100644
index 000..2365379
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pyfirmata.inc
@@ -0,0 +1,13 @@
+SUMMARY = "A Python interface for the Firmata protocol"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=84ddcef430b7c44caa22b2ff4b37a3df"
+PYPI_PACKAGE = "pyFirmata"
+
+RDEPENDS_${PN} = "\
+${PYTHON_PN}-pyserial \
+"
+
+SRC_URI[md5sum] = "ee4c23ca5c35d3091d550a63540811a3"
+SRC_URI[sha256sum] =
"b54d49d66a9d93c1ef9c72ca01264414cb2de177baac116c12d5cce0c380160c"
+
+inherit pypi
diff --git a/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb
b/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb
new file mode 100644
index 000..d77e0f3
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb
@@ -0,0 +1,3 @@
+inherit setuptools
+require python-pyfirmata.inc
+
diff --git a/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb
b/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb
new file mode 100644
index 000..25af1b5
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb
@@ -0,0 +1,3 @@
+inherit setuptools3
+require python-pyfirmata.inc
+
--
2.9.5
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 0/1] python-pyfirmata: move in from meta-intel-iot-middleware and upgrade
Move in python-pyfirmata from meta-intel-iot-middleware. The following changes since commit f841648657069051dffa1012a42eb1524b894d50: openwsman: Fix build with musl (2017-09-22 22:56:13 +) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib paule/python-pyfirmata http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=paule/python-pyfirmata Paul Eggleton (1): python-pyfirmata: move in from meta-intel-iot-middleware and upgrade meta-python/recipes-devtools/python/python-pyfirmata.inc| 13 + .../recipes-devtools/python/python-pyfirmata_1.0.3.bb | 3 +++ .../recipes-devtools/python/python3-pyfirmata_1.0.3.bb | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-pyfirmata.inc create mode 100644 meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb create mode 100644 meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb -- 2.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] mraa: move recipe from meta-refkit-core
Make this recipe a little more widely visible (has previously appeared
in meta-refkit-core and meta-intel-iot-middleware). Also make couple of
minor tweaks:
* Make SUMMARY more accurate by borrowing the first part of the short
description now in the mraa github repo
* Set HOMEPAGE
* Drop AUTHOR as this is field is only really intended for older
software where there is no real point of contact for upstream other
than an author's email address.
Signed-off-by: Paul Eggleton
---
meta-oe/recipes-extended/mraa/mraa_git.bb | 48 +++
1 file changed, 48 insertions(+)
create mode 100644 meta-oe/recipes-extended/mraa/mraa_git.bb
diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb
b/meta-oe/recipes-extended/mraa/mraa_git.bb
new file mode 100644
index 000..9b023ff
--- /dev/null
+++ b/meta-oe/recipes-extended/mraa/mraa_git.bb
@@ -0,0 +1,48 @@
+SUMMARY = "Linux Library for low speed I/O Communication"
+HOMEPAGE = "https://github.com/intel-iot-devkit/mraa";
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=66493d54e65bfc12c7983ff2e884f37f"
+
+SRCREV = "8ddbcde84e2d146bc0f9e38504d6c89c14291480"
+PV = "1.7.0-git${SRCPV}"
+
+SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http"
+
+S = "${WORKDIR}/git"
+
+inherit cmake distutils3-base
+
+DEPENDS += "json-c"
+
+EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON
-DCMAKE_SKIP_RPATH=ON"
+
+# Prepend mraa-utils to make sure bindir ends up in there
+PACKAGES =+ "${PN}-utils"
+
+FILES_${PN}-doc += "${datadir}/mraa/examples/"
+
+FILES_${PN}-utils = "${bindir}/"
+
+# override this in local.conf to get needed bindings.
+# BINDINGS_pn-mraa="python"
+# will result in only the python bindings being built/packaged.
+BINDINGS ??= "python ${@ 'nodejs' if oe.types.boolean(d.getVar('HAVE_NODEJS')
or '0') else '' }"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs',
'', d)} \
+ ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}"
+
+PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF,
swig-native ${PYTHON_PN},"
+PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native
nodejs-native,"
+PACKAGECONFIG[ft4222] = "-DUSBPLAT=ON -DFTDI4222=ON, -DUSBPLAT=OFF
-DFTDI4222=OFF,, libft4222"
+
+FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/"
+RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}"
+
+FILES_node-${PN} = "${prefix}/lib/node_modules/"
+RDEPENDS_node-${PN} += "nodejs"
+
+### Include desired language bindings ###
+PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}"
+PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}',
'', d)}"
--
2.9.5
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/2] Add mraa/upm recipes from meta-refkit-core
Move in recipes from meta-refkit-core for the mraa I/O library and upm sensor library. The following changes since commit f841648657069051dffa1012a42eb1524b894d50: openwsman: Fix build with musl (2017-09-22 22:56:13 +) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib paule/mraa http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=paule/mraa Paul Eggleton (2): mraa: move recipe from meta-refkit-core upm: add recipe from meta-refkit-core meta-oe/recipes-extended/mraa/mraa_git.bb | 48 +++ ...15-fixed-case-logic-in-getThresh-function.patch | 54 ++ meta-oe/recipes-extended/upm/upm_git.bb| 42 + 3 files changed, 144 insertions(+) create mode 100644 meta-oe/recipes-extended/mraa/mraa_git.bb create mode 100644 meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch create mode 100644 meta-oe/recipes-extended/upm/upm_git.bb -- 2.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] upm: add recipe from meta-refkit-core
Make this recipe a little more widely visible (has previously appeared
in meta-refkit-core and meta-intel-iot-middleware). Also make couple of
minor tweaks:
* Fix BINDINGS example to use the correct recipe name (copy-paste error)
* Set HOMEPAGE
* Drop AUTHOR as this is field is only really intended for older
software where there is no real point of contact for upstream other
than an author's email address.
Signed-off-by: Paul Eggleton
---
...15-fixed-case-logic-in-getThresh-function.patch | 54 ++
meta-oe/recipes-extended/upm/upm_git.bb| 42 +
2 files changed, 96 insertions(+)
create mode 100644
meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch
create mode 100644 meta-oe/recipes-extended/upm/upm_git.bb
diff --git
a/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch
b/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch
new file mode 100644
index 000..c617d14
--- /dev/null
+++
b/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch
@@ -0,0 +1,54 @@
+From c64d04d084f47b4cb3e1cdee6e96348fcc6a756e Mon Sep 17 00:00:00 2001
+From: Mihai Tudor Panu
+Date: Tue, 30 May 2017 15:14:09 -0700
+Subject: [PATCH 1/1] ads1x15: fixed case logic in getThresh() function
+
+Signed-off-by: Mihai Tudor Panu
+
+Upstream-Status: Backported [c64d04d084f47b4cb3e1cdee6e96348fcc6a756e]
+
+Signed-off-by: Patrick Ohly
+
+---
+ src/ads1x15/ads1x15.cxx | 4 ++--
+ src/ads1x15/ads1x15.hpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ads1x15/ads1x15.cxx b/src/ads1x15/ads1x15.cxx
+index 35782709..47701b2a 100644
+--- a/src/ads1x15/ads1x15.cxx
b/src/ads1x15/ads1x15.cxx
+@@ -116,7 +116,7 @@ ADS1X15::setContinuous(bool mode){
+
+ float
+ ADS1X15::getThresh(ADSTHRESH reg){
+- if( THRESH_HIGH && THRESH_LOW) return getLastSample(reg);
++ if(reg == THRESH_HIGH || reg == THRESH_LOW) return getLastSample(reg);
+ else return 0.0;
+ }
+
+@@ -137,7 +137,7 @@ ADS1X15::setThresh(ADSTHRESH reg, float value){
+ case 2:
+ case 3:
+ set_value = value / getMultiplier();
+- set_value = set_value << m_bitShift;
++ set_value = set_value << m_bitShift;
+ if(i2c->writeWordReg(reg, swapWord(set_value)) != mraa::SUCCESS){
+ throw std::runtime_error(std::string(__FUNCTION__) + ":
I2c.write() failed");
+ return;
+diff --git a/src/ads1x15/ads1x15.hpp b/src/ads1x15/ads1x15.hpp
+index 7524572d..efd8c8ec 100644
+--- a/src/ads1x15/ads1x15.hpp
b/src/ads1x15/ads1x15.hpp
+@@ -390,7 +390,7 @@ namespace upm {
+ * @param reg ADSTHRES enum value.
+ * Returns 0.0 unless THRESH_HIGH or THRESH_LOW requested.
+ */
+-float getThresh(ADSTHRESH reg = THRESH_LOW);
++float getThresh(ADSTHRESH reg = THRESH_DEFAULT);
+
+ /**
+ * Sets threshold levels or configures for conversion ready
+--
+2.11.0
+
diff --git a/meta-oe/recipes-extended/upm/upm_git.bb
b/meta-oe/recipes-extended/upm/upm_git.bb
new file mode 100644
index 000..6587d32
--- /dev/null
+++ b/meta-oe/recipes-extended/upm/upm_git.bb
@@ -0,0 +1,42 @@
+SUMMARY = "Sensor/Actuator repository for Mraa"
+HOMEPAGE = "https://github.com/intel-iot-devkit/upm";
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f"
+
+DEPENDS = "libjpeg-turbo mraa"
+
+SRCREV = "106b6c706268522ab0168a4ddb19e89ce832e084"
+PV = "1.3.0-git${SRCPV}"
+
+SRC_URI = " \
+git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
+file://ads1x15-fixed-case-logic-in-getThresh-function.patch \
+"
+
+S = "${WORKDIR}/git"
+
+inherit distutils3-base cmake
+
+
+# override this in local.conf to get needed bindings.
+# BINDINGS_pn-upm="python"
+# will result in only the python bindings being built/packaged.
+BINDINGS ??= "python ${@ 'nodejs' if oe.types.boolean(d.getVar('HAVE_NODEJS')
or '0') else '' }"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs',
'', d)} \
+ ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}"
+
+PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF,
swig-native ${PYTHON_PN},"
+PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native
nodejs-native,"
+
+FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
+RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}"
+
+FILES_node-${PN} = "${prefix}/lib/node_modules/"
+RDEPENDS_node-${PN} += "nodejs"
+
+### Include desired language bindings ###
+PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}"
+PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}',
'', d)}"
--
2.9.5
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembe
