* Re: [PATCH][RFC] classes: add gitupstream class
From: Burton, Ross @ 2016-11-17 16:07 UTC (permalink / raw)
To: OE-core
In-Reply-To: <1479397835-26630-1-git-send-email-ross.burton@intel.com>
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
On 17 November 2016 at 15:50, Ross Burton <ross.burton@intel.com> wrote:
> BBCLASSEXTEND = "gitupstream"
> SRC_URI_class-gitupstream = "git://git.example.com/example"
> SRCREV_class-gitupstream = "abcd1234"
>
This isn't quite right, if you don't want to patch bitbake then use
BBCLASSEXTEND="gitupstream:foo".
I have patches to extend this to native recipes but they're rather ugly so
are not ready yet.
Ross
[-- Attachment #2: Type: text/html, Size: 1036 bytes --]
^ permalink raw reply
* Re: [PATCH] libpcap: Fix build when PACKAGECONFIG ipv6 is not enable
From: Christopher Larson @ 2016-11-17 16:00 UTC (permalink / raw)
To: Fabio Berton; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <1479396394-26134-1-git-send-email-fabio.berton@ossystems.com.br>
[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]
On Thu, Nov 17, 2016 at 8:26 AM, Fabio Berton <fabio.berton@ossystems.com.br
> wrote:
> Add patches to fix error:
> /
> | ERROR: oe_runmake failed
> | config.status: creating pcap-config.tmp
> | mv pcap-config.tmp pcap-config
> | chmod a+x pcap-config
> | ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
> | ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t
> | {aka struct _compiler_state}' has no member named 'ai'
> | cstate.ai = NULL;
> | ^
> | ../libpcap-1.8.1/gencode.c: In function 'gen_gateway':
> | ../libpcap-1.8.1/gencode.c:4914:13: error: 'cstate' undeclared
> | (first use in this function)
> | bpf_error(cstate, "direction applied to 'gateway'");
> | ^~~~~~
> | ../libpcap-1.8.1/gencode.c:4914:13: note: each undeclared identifier is
> | reported only once for each function it appears in
> \
>
> Patches were submitted to upstream [1]
>
> [1] https://github.com/the-tcpdump-group/libpcap/pull/541
>
> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
>
This is fairly common, but afaik the Upstream-Status is an artifact of the
patch, not the commit that generated the patch, so belongs outside (above)
the commit message in the patch file.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 2205 bytes --]
^ permalink raw reply
* [PATCH][RFC] classes: add gitupstream class
From: Ross Burton @ 2016-11-17 15:50 UTC (permalink / raw)
To: openembedded-core
This class lets you use BBCLASSEXTEND to add a variant of the recipe that
fetches from git instead of a tarball.
For example:
BBCLASSEXTEND = "gitupstream"
SRC_URI_class-gitupstream = "git://git.example.com/example"
SRCREV_class-gitupstream = "abcd1234"
This variant will have DEFAULT_PREFERENCE set to -1 so it needs to be selected
to be used, and any git-specific tweaks can be done with the class-gitupstream
override, for example:
DEPENDS_append_class-gitupstream = " gperf-native"
do_configure_prepend_class-gitupstream() {
touch ${S}/README
}
It currently only supports creating a git variant of the target recipe, not
native or nativesdk.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/gitupstream.bbclass | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 meta/classes/gitupstream.bbclass
diff --git a/meta/classes/gitupstream.bbclass b/meta/classes/gitupstream.bbclass
new file mode 100644
index 0000000..64aab61
--- /dev/null
+++ b/meta/classes/gitupstream.bbclass
@@ -0,0 +1,23 @@
+CLASSOVERRIDE = "class-gitupstream"
+
+# TODO doesn't let you gitupstream a native recipe yet
+
+python gitupstream_virtclass_handler () {
+ # Do nothing if this is inherited, as it's for BBCLASSEXTEND
+ if "gitupstream" not in (e.data.getVar('BBCLASSEXTEND', True) or ""):
+ bb.warn("Don't inherit gitupstream, use BBCLASSEXTEND")
+ return
+
+ # TODO sanity check somehow?
+
+ d.setVar("DEFAULT_PREFERENCE", "-1")
+ d.setVar("S", "${WORKDIR}/git")
+
+ # Modify the SRCREV, if the recipe hasn't used PV_class-gitupstream to
+ # assign a +gitX PV already.
+ pv = d.getVar("PV", True)
+ if "+git" not in pv:
+ d.setVar("PV", pv + "+git${SRCPV}")
+}
+addhandler gitupstream_virtclass_handler
+gitupstream_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
--
2.8.1
^ permalink raw reply related
* [PATCH] libpcap: Fix build when PACKAGECONFIG ipv6 is not enable
From: Fabio Berton @ 2016-11-17 15:26 UTC (permalink / raw)
To: openembedded-core
Add patches to fix error:
/
| ERROR: oe_runmake failed
| config.status: creating pcap-config.tmp
| mv pcap-config.tmp pcap-config
| chmod a+x pcap-config
| ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
| ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t
| {aka struct _compiler_state}' has no member named 'ai'
| cstate.ai = NULL;
| ^
| ../libpcap-1.8.1/gencode.c: In function 'gen_gateway':
| ../libpcap-1.8.1/gencode.c:4914:13: error: 'cstate' undeclared
| (first use in this function)
| bpf_error(cstate, "direction applied to 'gateway'");
| ^~~~~~
| ../libpcap-1.8.1/gencode.c:4914:13: note: each undeclared identifier is
| reported only once for each function it appears in
\
Patches were submitted to upstream [1]
[1] https://github.com/the-tcpdump-group/libpcap/pull/541
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
...r_state_t.ai-usage-when-INET6-is-not-defi.patch | 41 +++++++++++++
...02-Add-missing-compiler_state_t-parameter.patch | 67 ++++++++++++++++++++++
meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb | 2 +
3 files changed, 110 insertions(+)
create mode 100644 meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
create mode 100644 meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch b/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
new file mode 100644
index 0000000..edb6ae5
--- /dev/null
+++ b/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
@@ -0,0 +1,41 @@
+From 64aa033a061c43fc15c711f2490ae41d23b868c3 Mon Sep 17 00:00:00 2001
+From: Fabio Berton <fabio.berton@ossystems.com.br>
+Date: Thu, 17 Nov 2016 09:44:42 -0200
+Subject: [PATCH 1/2] Fix compiler_state_t.ai usage when INET6 is not defined
+Organization: O.S. Systems Software LTDA.
+
+Fix error:
+
+/
+| ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
+| ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t
+| {aka struct _compiler_state}' has no member named 'ai'
+| cstate.ai = NULL;
+\
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/the-tcpdump-group/libpcap/pull/541
+
+Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
+---
+ gencode.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gencode.c b/gencode.c
+index a887f27..e103c70 100644
+--- a/gencode.c
++++ b/gencode.c
+@@ -690,7 +690,9 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
+ }
+ initchunks(&cstate);
+ cstate.no_optimize = 0;
++#ifdef INET6
+ cstate.ai = NULL;
++#endif
+ cstate.ic.root = NULL;
+ cstate.ic.cur_mark = 0;
+ cstate.bpf_pcap = p;
+--
+2.1.4
+
diff --git a/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch b/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
new file mode 100644
index 0000000..032b265
--- /dev/null
+++ b/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
@@ -0,0 +1,67 @@
+From 50ec0a088d5924a8305b2d70dcba71b0942dee1a Mon Sep 17 00:00:00 2001
+From: Fabio Berton <fabio.berton@ossystems.com.br>
+Date: Thu, 17 Nov 2016 09:47:29 -0200
+Subject: [PATCH 2/2] Add missing compiler_state_t parameter
+Organization: O.S. Systems Software LTDA.
+
+Fix error:
+
+/
+|../libpcap-1.8.1/gencode.c: In function 'gen_gateway':
+|../libpcap-1.8.1/gencode.c:4914:13: error: 'cstate' undeclared
+| (first use in this function)
+| bpf_error(cstate, "direction applied to 'gateway'");
+\
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/the-tcpdump-group/libpcap/pull/541
+
+Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
+---
+ gencode.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/gencode.c b/gencode.c
+index e103c70..f07c0be 100644
+--- a/gencode.c
++++ b/gencode.c
+@@ -523,7 +523,7 @@ static struct block *gen_host6(compiler_state_t *, struct in6_addr *,
+ struct in6_addr *, int, int, int);
+ #endif
+ #ifndef INET6
+-static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int);
++static struct block *gen_gateway(compiler_state_t *, const u_char *, bpf_u_int32 **, int, int);
+ #endif
+ static struct block *gen_ipfrag(compiler_state_t *);
+ static struct block *gen_portatom(compiler_state_t *, int, bpf_int32);
+@@ -4904,11 +4904,12 @@ gen_host6(compiler_state_t *cstate, struct in6_addr *addr,
+
+ #ifndef INET6
+ static struct block *
+-gen_gateway(eaddr, alist, proto, dir)
+- const u_char *eaddr;
+- bpf_u_int32 **alist;
+- int proto;
+- int dir;
++gen_gateway(cstate, eaddr, alist, proto, dir)
++ compiler_state_t *cstate;
++ const u_char *eaddr;
++ bpf_u_int32 **alist;
++ int proto;
++ int dir;
+ {
+ struct block *b0, *b1, *tmp;
+
+@@ -6472,7 +6473,7 @@ gen_scode(compiler_state_t *cstate, const char *name, struct qual q)
+ alist = pcap_nametoaddr(name);
+ if (alist == NULL || *alist == NULL)
+ bpf_error(cstate, "unknown host '%s'", name);
+- b = gen_gateway(eaddr, alist, proto, dir);
++ b = gen_gateway(cstate, eaddr, alist, proto, dir);
+ free(eaddr);
+ return b;
+ #else
+--
+2.1.4
+
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
index 9072fe0..e9db28a 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
@@ -2,6 +2,8 @@ require libpcap.inc
SRC_URI += " \
file://libpcap-pkgconfig-support.patch \
+ file://0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch \
+ file://0002-Add-missing-compiler_state_t-parameter.patch \
"
SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
--
2.1.4
^ permalink raw reply related
* Re: [PATCH] Test needed to verify postinst script order.
From: Jose Perez Carranza @ 2016-11-17 15:33 UTC (permalink / raw)
To: Burton, Ross, Francisco Pedraza; +Cc: OE-core
In-Reply-To: <CAJTo0LbxF0sdYqmK3ttUyaiyTPmg+ME9qbSS1NnpcA4H7iQLaQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1890 bytes --]
On 11/17/2016 06:14 AM, Burton, Ross wrote:
>
> On 16 November 2016 at 00:50, Francisco Pedraza
> <francisco.j.pedraza.gonzalez@intel.com
> <mailto:francisco.j.pedraza.gonzalez@intel.com>> wrote:
>
> Will verify the following:
> 1. Compile a minimal image.
> 2. The compiled image will add the created layer with the
> recipes postinstz postinsta postinstb postinstd postinstp postinstt
> created previously at "meta-selftest/recipes-test"
> 2. Run qemu
> 3. Validate the task execution order.
> V4
>
>
> This is missing the test that some postinsts should be happening at
> rootfs time.
I have assigned the bug 8433 and I will send a different patch to add
those test cases, I'm just waiting to the final implementation of this
patch to be accepted to avoid execution and merge conflicts.
>
> Also, can it permute PACKAGE_CLASSES (rotate through all three
> options) so it exercises all backends.
>
> Signed-off-by: Francisco Pedraza
> <francisco.j.pedraza.gonzalez@intel.com
> <mailto:francisco.j.pedraza.gonzalez@intel.com>>
> ---
> .../recipes-test/postinsta/postinsta_1.0.bb
> <http://postinsta_1.0.bb> | 20 +++++++++++
> .../recipes-test/postinstb/postinstb_1.0.bb
> <http://postinstb_1.0.bb> | 22 ++++++++++++
> .../recipes-test/postinstd/postinstd_1.0.bb
> <http://postinstd_1.0.bb> | 22 ++++++++++++
> .../recipes-test/postinstp/postinstp_1.0.bb
> <http://postinstp_1.0.bb> | 22 ++++++++++++
> .../recipes-test/postinstt/postinstt_1.0.bb
> <http://postinstt_1.0.bb> | 22 ++++++++++++
> .../recipes-test/postinstz/postinstz_1.0.bb
> <http://postinstz_1.0.bb> | 12 +++++++
>
>
> For clarity can all of these be squashed into a single recipe with
> clearer names?
>
> Ross
>
>
[-- Attachment #2: Type: text/html, Size: 4774 bytes --]
^ permalink raw reply
* [PATCHv2 4/4] mesa: Upgrade 12.0.3 -> 13.0.1
From: Jussi Kukkonen @ 2016-11-17 15:21 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <CAJTo0LZn1JAR9KuzYsDyCRAPqJ499hMRkCu_4C9y7S9ctiqpgg@mail.gmail.com>
New major release with OpenGL 4.4 support. Dependency on libudev has
been removed.
* Rebase replace_glibc_check_with_linux.patch
* Add patch to find native wayland-scanner
* Add PACKAGECONFIG[osmesa], disabled by default
* package osmesa header correctly
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
Changes since v1:
* Add PACKAGECONFIG[osmesa], disabled by default
* package osmesa header correctly
I've force pushed the branch:
git://git.yoctoproject.org/poky-contrib jku/mesa-piglit
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/mesa-piglit
Thanks,
Jussi
.../0001-Use-wayland-scanner-in-the-path.patch | 37 ++++++++++++++++++++++
.../files/replace_glibc_check_with_linux.patch | 25 ++++++++++-----
.../mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 7 ++--
.../mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} | 5 +--
5 files changed, 62 insertions(+), 12 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
rename meta/recipes-graphics/mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} (75%)
diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
new file mode 100644
index 0000000..e49695b
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
@@ -0,0 +1,37 @@
+From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Tue, 15 Nov 2016 15:20:49 +0200
+Subject: [PATCH] Simplify wayland-scanner lookup
+
+Don't use pkg-config to lookup the path of a binary that's in the path.
+
+Alternatively we'd have to prefix the path returned by pkg-config with
+PKG_CONFIG_SYSROOT_DIR.
+
+Upstream-Status: Pending
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e56e35a..a92005a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
+ AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+ fi
+
+-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
+- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
+- WAYLAND_SCANNER='')
+-if test "x$WAYLAND_SCANNER" = x; then
+- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+-fi
++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+
+ # Do per-EGL platform setups and checks
+ egl_platforms=`IFS=', '; echo $with_egl_platforms`
+--
+2.1.4
+
diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch
index e4461ef..0280ee8 100644
--- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch
+++ b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch
@@ -2,16 +2,25 @@ endianness check is OS wide and not specific to libc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
-Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h
-===================================================================
---- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h
-+++ mesa-11.1.1/src/gallium/include/pipe/p_config.h
-@@ -130,7 +130,7 @@
- * Endian detection.
- */
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ src/util/u_endian.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/u_endian.h b/src/util/u_endian.h
+index b9d563d..2d5eab9 100644
+--- a/src/util/u_endian.h
++++ b/src/util/u_endian.h
+@@ -27,7 +27,7 @@
+ #ifndef U_ENDIAN_H
+ #define U_ENDIAN_H
--#ifdef __GLIBC__
+-#if defined(__GLIBC__) || defined(ANDROID)
+#if defined(__linux__)
#include <endian.h>
#if __BYTE_ORDER == __LITTLE_ENDIAN
+--
+2.1.4
+
diff --git a/meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb
rename to meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index e4880ff..4ec4961 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d
PE = "2"
-DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev"
+DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native"
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa"
@@ -64,6 +64,9 @@ PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs,
export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
PACKAGECONFIG[xa] = "--enable-xa, --disable-xa"
+OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}"
+PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}"
+
# Mesa requires one of the following crypto implementation, pick one of them
MESA_CRYPTO ??= "openssl"
PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
@@ -183,7 +186,7 @@ FILES_libglapi-dev = "${libdir}/libglapi.*"
FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
FILES_libgles3-mesa-dev = "${includedir}/GLES3"
-FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la"
FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
diff --git a/meta/recipes-graphics/mesa/mesa_12.0.3.bb b/meta/recipes-graphics/mesa/mesa_13.0.1.bb
similarity index 75%
rename from meta/recipes-graphics/mesa/mesa_12.0.3.bb
rename to meta/recipes-graphics/mesa/mesa_13.0.1.bb
index acc8353..37ac15f 100644
--- a/meta/recipes-graphics/mesa/mesa_12.0.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_13.0.1.bb
@@ -3,10 +3,11 @@ require ${BPN}.inc
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \
file://replace_glibc_check_with_linux.patch \
file://disable-asm-on-non-gcc.patch \
+ file://0001-Use-wayland-scanner-in-the-path.patch \
"
-SRC_URI[md5sum] = "1113699c714042d8c4df4766be8c57d8"
-SRC_URI[sha256sum] = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1"
+SRC_URI[md5sum] = "72b7f4d0c2407f367484abd201cb8276"
+SRC_URI[sha256sum] = "71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731"
#because we cannot rely on the fact that all apps will use pkgconfig,
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
--
2.1.4
^ permalink raw reply related
* Re: FW: [PATCH v2] oe-tests: Migrate tests from /oe/test to /oeqa/selftest/oe-tests
From: Jose Perez Carranza @ 2016-11-17 15:26 UTC (permalink / raw)
To: Burton, Ross, Esquivel, Benjamin; +Cc: OE-core
In-Reply-To: <CAJTo0LYwVrdCUAXSz0VYKNt0TsETL2aZheVN+qv-HYi8jei6Aw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
On 11/15/2016 03:11 PM, Burton, Ross wrote:
>
> On 15 November 2016 at 19:10, Benjamin Esquivel
> <benjamin.esquivel@linux.intel.com
> <mailto:benjamin.esquivel@linux.intel.com>> wrote:
>
> The reason for the migration of the tests is for them to be
> included in the selftest execution. And for that execution, it
> needs to base off of the oeSelfTest class.
>
>
> Sounds like a problem with the discovery if it mandates oeselftest.
> Is there a reason why it can't also execute bare unittests?
>
You are right this is a problem on the suite right now AFAIK there
will pbe a fix for this on oeqa2 framework adding Marian and Anibal to
the loop to give an in put on this.
> Ross
[-- Attachment #2: Type: text/html, Size: 2059 bytes --]
^ permalink raw reply
* [PATCH 00/32] Pull request for Krogoth-next
From: Armin Kuster @ 2016-11-17 14:56 UTC (permalink / raw)
To: akuster, openembedded-core
Please consider these changes for Krogoth-next
The following changes since commit 3bf928a3b6354bc09c87fcbf9e3972c8d368aaa3:
dev-manual: Fixed typo for "${INC_PR}.0" (2016-11-16 10:38:24 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib akuster/krogoth-next
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akuster/krogoth-next
Adrian Dudau (2):
qemu: Security fix CVE-2016-4439
qemu: Security fix CVE-2016-4952
Armin Kuster (2):
tzcode-native: update to 2016h
tzdata: Update to 2016h
Daniel Díaz (1):
weston: Add no-input-device patch to 1.9.0.
Otavio Salvador (1):
gstreamer1.0-libav: Add 'valgrind' config option
Richard Purdie (5):
sstate: Ensure we don't remove sigbasedata files
rm_work: Ensure we don't remove sigbasedata files
bitbake: build: Ensure we preserve sigbasedata files as well as
sigdata ones
bitbake: siggen: Pass basehash to worker processes and sanity check
reparsing result
bitbake: siggen: Ensure taskhash mismatches don't override existing
data
Ross Burton (4):
classes/cross: set lt_cv_sys_lib_dlsearch_path_spec
classes/native: set lt_cv_sys_lib_dlsearch_path_spec
binutils: fix typo in libtool patch
binutils: apply RPATH fixes from our libtool patches
Sona Sarmadi (11):
curl: CVE-2016-8615
curl: CVE-2016-8616
curl: CVE-2016-8617
curl: CVE-2016-8618
curl: CVE-2016-8619
curl: CVE-2016-8620
curl: CVE-2016-8621
curl: CVE-2016-8622
curl: CVE-2016-8623
curl: CVE-2016-8624
curl: CVE-2016-8625
Yi Zhao (5):
tiff: Security fix CVE-2016-3945
tiff: Security fix CVE-2016-3990
tiff: Security fix CVE-2016-3991
tiff: Security fix CVE-2016-3623
tiff: Security fix CVE-2016-3622
Zeeshan Ali (1):
nss: Disable warning on deprecated API usage
bitbake/lib/bb/build.py | 2 +-
bitbake/lib/bb/siggen.py | 31 +-
meta/classes/cross.bbclass | 2 +
meta/classes/native.bbclass | 3 +-
meta/classes/rm_work.bbclass | 2 +-
meta/classes/sstate.bbclass | 2 +-
meta/recipes-devtools/binutils/binutils-2.26.inc | 1 +
.../binutils/binutils/0006-Use-libtool-2.4.patch | 5 +-
.../binutils/0014-libtool-remove-rpath.patch | 100 ++++
.../recipes-devtools/qemu/qemu/CVE-2016-4441.patch | 78 +++
.../recipes-devtools/qemu/qemu/CVE-2016-4952.patch | 105 ++++
meta/recipes-devtools/qemu/qemu_2.5.0.bb | 2 +
...code-native_2016g.bb => tzcode-native_2016h.bb} | 8 +-
.../tzdata/{tzdata_2016g.bb => tzdata_2016h.bb} | 4 +-
.../add-config-option-for-no-input-device.patch | 125 +++++
meta/recipes-graphics/wayland/weston_1.9.0.bb | 1 +
.../gstreamer/gstreamer1.0-libav.inc | 1 +
.../libtiff/files/CVE-2016-3622.patch | 129 +++++
.../libtiff/files/CVE-2016-3623.patch | 52 ++
.../libtiff/files/CVE-2016-3945.patch | 118 ++++
.../libtiff/files/CVE-2016-3990.patch | 66 +++
.../libtiff/files/CVE-2016-3991.patch | 147 +++++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 5 +
meta/recipes-support/curl/curl/CVE-2016-8615.patch | 77 +++
meta/recipes-support/curl/curl/CVE-2016-8616.patch | 49 ++
meta/recipes-support/curl/curl/CVE-2016-8617.patch | 28 +
meta/recipes-support/curl/curl/CVE-2016-8618.patch | 52 ++
meta/recipes-support/curl/curl/CVE-2016-8619.patch | 52 ++
meta/recipes-support/curl/curl/CVE-2016-8620.patch | 44 ++
meta/recipes-support/curl/curl/CVE-2016-8621.patch | 120 ++++
meta/recipes-support/curl/curl/CVE-2016-8622.patch | 94 ++++
meta/recipes-support/curl/curl/CVE-2016-8623.patch | 209 +++++++
meta/recipes-support/curl/curl/CVE-2016-8624.patch | 51 ++
meta/recipes-support/curl/curl/CVE-2016-8625.patch | 615 +++++++++++++++++++++
.../url-remove-unconditional-idn2.h-include.patch | 29 +
meta/recipes-support/curl/curl_7.47.1.bb | 12 +
.../nss/nss-disable-werror-on-deprecated-api.patch | 22 +
meta/recipes-support/nss/nss_3.21.bb | 1 +
38 files changed, 2417 insertions(+), 27 deletions(-)
create mode 100644 meta/recipes-devtools/binutils/binutils/0014-libtool-remove-rpath.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-4441.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-4952.patch
rename meta/recipes-extended/tzcode/{tzcode-native_2016g.bb => tzcode-native_2016h.bb} (68%)
rename meta/recipes-extended/tzdata/{tzdata_2016g.bb => tzdata_2016h.bb} (98%)
create mode 100644 meta/recipes-graphics/wayland/weston/add-config-option-for-no-input-device.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3622.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3945.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3991.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8615.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8616.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8617.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8618.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8619.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8620.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8621.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8622.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8623.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2016-8624.patch
create mode 100755 meta/recipes-support/curl/curl/CVE-2016-8625.patch
create mode 100644 meta/recipes-support/curl/curl/url-remove-unconditional-idn2.h-include.patch
create mode 100644 meta/recipes-support/nss/nss/nss-disable-werror-on-deprecated-api.patch
--
2.3.5
^ permalink raw reply
* Re: [PATCH] Test needed to verify postinst script order.
From: Burton, Ross @ 2016-11-17 12:14 UTC (permalink / raw)
To: Francisco Pedraza; +Cc: OE-core
In-Reply-To: <1479257423-4281-1-git-send-email-francisco.j.pedraza.gonzalez@intel.com>
[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]
On 16 November 2016 at 00:50, Francisco Pedraza <
francisco.j.pedraza.gonzalez@intel.com> wrote:
> Will verify the following:
> 1. Compile a minimal image.
> 2. The compiled image will add the created layer with the
> recipes postinstz postinsta postinstb postinstd postinstp postinstt
> created previously at "meta-selftest/recipes-test"
> 2. Run qemu
> 3. Validate the task execution order.
> V4
>
This is missing the test that some postinsts should be happening at rootfs
time.
Also, can it permute PACKAGE_CLASSES (rotate through all three options) so
it exercises all backends.
Signed-off-by: Francisco Pedraza <francisco.j.pedraza.gonzalez@intel.com>
> ---
> .../recipes-test/postinsta/postinsta_1.0.bb | 20 +++++++++++
> .../recipes-test/postinstb/postinstb_1.0.bb | 22 ++++++++++++
> .../recipes-test/postinstd/postinstd_1.0.bb | 22 ++++++++++++
> .../recipes-test/postinstp/postinstp_1.0.bb | 22 ++++++++++++
> .../recipes-test/postinstt/postinstt_1.0.bb | 22 ++++++++++++
> .../recipes-test/postinstz/postinstz_1.0.bb | 12 +++++++
>
For clarity can all of these be squashed into a single recipe with clearer
names?
Ross
[-- Attachment #2: Type: text/html, Size: 2458 bytes --]
^ permalink raw reply
* Re: [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1
From: Burton, Ross @ 2016-11-17 11:48 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: OE-core
In-Reply-To: <2492cb242375d6dbc1efd5c530c555a1cd0dfb72.1479301275.git.jussi.kukkonen@intel.com>
[-- Attachment #1: Type: text/plain, Size: 774 bytes --]
On 16 November 2016 at 13:15, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:
> New major release with OpenGL 4.4 support. Dependency on libudev has
> been removed.
>
> Rebase replace_glibc_check_with_linux.patch.
> Add patch to find native wayland-scanner.
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
>
This has removed some files:
packages/corei7-64-poky-linux/mesa/libgl-mesa-dev: FILELIST: removed
"/usr/include/GL/osmesa.h /usr/include/GL/wglext.h
/usr/include/GL/mesa_glinterop.h"
osmesa is now behind a disabled configure option, so I guess we should make
that an option at least, even if we do disable it by default.
wglext is Windows specific, and mesa-glinterop.h appears to be internal
only, so they're good.
Ross
[-- Attachment #2: Type: text/html, Size: 1384 bytes --]
^ permalink raw reply
* [morty][PATCH] libbsd 0.8.3: BBCLASSEXTEND to native and nativesdk
From: Nicolas Dechesne @ 2016-11-17 11:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Nicolas Dechesne, Koen Kooi
From: Koen Kooi <koen.kooi@linaro.org>
Android-tools depends on it and to build the native versions of fastboot, adb, mkbootimg and others libbsd needs to support native builds.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit b02cef58ee35dd277fff48538ce2803df1cbc4d5)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
meta/recipes-support/libbsd/libbsd_0.8.3.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-support/libbsd/libbsd_0.8.3.bb b/meta/recipes-support/libbsd/libbsd_0.8.3.bb
index 92121ef..6f734ab 100644
--- a/meta/recipes-support/libbsd/libbsd_0.8.3.bb
+++ b/meta/recipes-support/libbsd/libbsd_0.8.3.bb
@@ -41,3 +41,5 @@ SRC_URI[md5sum] = "e935c1bb6cc98a4a43cb1da22795493a"
SRC_URI[sha256sum] = "934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8"
inherit autotools pkgconfig
+
+BBCLASSEXTEND = "native nativesdk"
--
2.7.0
^ permalink raw reply related
* Re: [PATCH v2 1/3] module.bbclass: use Module.symvers for dependants
From: André Draszik @ 2016-11-17 10:22 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: openembedded-core
In-Reply-To: <20161116201836.GA26131@denix.org>
Hi,
On Wed, 2016-11-16 at 15:18 -0500, Denys Dmytriyenko wrote:
> On Thu, Aug 18, 2016 at 08:56:24AM +0100, André Draszik wrote:
> >
> > @@ -24,6 +34,11 @@ module_do_install() {
> > CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
> > O=${STAGING_KERNEL_BUILDDIR} \
> > ${MODULES_INSTALL_TARGET}
> > +
> > + install -d -m0755 ${D}${includedir}/${BPN}
> > + cp -a --no-preserve=ownership ${B}/Module.symvers
> > ${D}${includedir}/${BPN}
>
> Hmm, why is Module.symvers expected to be in the root of ${B}? This seems
> like
> a very artificial assumption/requirement!
[...]
> I wonder if this should have been rolled into ${MODULES_INSTALL_TARGET}
> step...
What about adding a (lazy ?=) variable to be able to override the location
of Module.symvers within ${B}, or alternatively using find to automatically
detect it? I guess there could also be more than one in theory? Do you have
something different in mind?
A.
^ permalink raw reply
* Re: [PATCH] libdrm: Upgrade 2.4.71 -> 2.4.73
From: Andreas Müller @ 2016-11-17 9:46 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <1479372964-21409-1-git-send-email-jussi.kukkonen@intel.com>
On Thu, Nov 17, 2016 at 9:56 AM, Jussi Kukkonen
<jussi.kukkonen@intel.com> wrote:
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
>
> I've pushed this into the mesa-piglit update branch:
>
> git://git.yoctoproject.org/poky-contrib jku/mesa-piglit
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/mesa-piglit
>
> Thanks,
> Jussi
>
>
> meta/recipes-graphics/drm/{libdrm_2.4.71.bb => libdrm_2.4.73.bb} | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta/recipes-graphics/drm/{libdrm_2.4.71.bb => libdrm_2.4.73.bb} (93%)
>
> diff --git a/meta/recipes-graphics/drm/libdrm_2.4.71.bb b/meta/recipes-graphics/drm/libdrm_2.4.73.bb
> similarity index 93%
> rename from meta/recipes-graphics/drm/libdrm_2.4.71.bb
> rename to meta/recipes-graphics/drm/libdrm_2.4.73.bb
> index 152cf55..3315014 100644
> --- a/meta/recipes-graphics/drm/libdrm_2.4.71.bb
> +++ b/meta/recipes-graphics/drm/libdrm_2.4.73.bb
> @@ -16,8 +16,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
> file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \
> "
>
> -SRC_URI[md5sum] = "776bccc84618b616fc57a7143836ae7a"
> -SRC_URI[sha256sum] = "c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8"
> +SRC_URI[md5sum] = "bc1cee09cde72ffe3b952e8f50ccdaa8"
> +SRC_URI[sha256sum] = "96bfd39242fe168017d95f22e141645a35591f5902a7d98c2fa4ca8c31df5e4d"
>
> inherit autotools pkgconfig manpages
>
> --
> 2.1.4
>
Thanks!
Andreas
^ permalink raw reply
* Re: ✗ patchtest: failure for Fixes for eSDK and testsdkext
From: Burton, Ross @ 2016-11-17 9:02 UTC (permalink / raw)
To: OE-core; +Cc: Lock, Joshua G, Paul Eggleton
In-Reply-To: <20161117065519.7693.7868@do.openembedded.org>
[-- Attachment #1: Type: text/plain, Size: 703 bytes --]
On 17 November 2016 at 06:55, Patchwork <
patchwork@patchwork.openembedded.org> wrote:
> * Patch [7/8] oeqa/sdkext/devtool.py: skip
> test_extend_autotools_recipe_creation when no libxml2
> Issue Commit shortlog is too long [test_shortlog_length]
> Suggested fix Edit shortlog so that it is 80 characters or less
> (currently 82 characters)
>
I'm not sure we've ever been super-strict on this, so I'm wondering if
warning over 90 is sensible so that we allow an extra two characters when
function names are long but still detect when someone has put an essay in
the first line (which does happen if the submitter isn't aware of the git
convention).
Ross
[-- Attachment #2: Type: text/html, Size: 1155 bytes --]
^ permalink raw reply
* [PATCH] libdrm: Upgrade 2.4.71 -> 2.4.73
From: Jussi Kukkonen @ 2016-11-17 8:56 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479301275.git.jussi.kukkonen@intel.com>
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
I've pushed this into the mesa-piglit update branch:
git://git.yoctoproject.org/poky-contrib jku/mesa-piglit
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/mesa-piglit
Thanks,
Jussi
meta/recipes-graphics/drm/{libdrm_2.4.71.bb => libdrm_2.4.73.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.71.bb => libdrm_2.4.73.bb} (93%)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.71.bb b/meta/recipes-graphics/drm/libdrm_2.4.73.bb
similarity index 93%
rename from meta/recipes-graphics/drm/libdrm_2.4.71.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.73.bb
index 152cf55..3315014 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.71.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.73.bb
@@ -16,8 +16,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \
"
-SRC_URI[md5sum] = "776bccc84618b616fc57a7143836ae7a"
-SRC_URI[sha256sum] = "c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8"
+SRC_URI[md5sum] = "bc1cee09cde72ffe3b952e8f50ccdaa8"
+SRC_URI[sha256sum] = "96bfd39242fe168017d95f22e141645a35591f5902a7d98c2fa4ca8c31df5e4d"
inherit autotools pkgconfig manpages
--
2.1.4
^ permalink raw reply related
* [PATCH 2/2] tiff: Security fix CVE-2016-3632
From: Yi Zhao @ 2016-11-17 8:08 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1479370090-26155-1-git-send-email-yi.zhao@windriver.com>
CVE-2016-3632 libtiff: The _TIFFVGetField function in tif_dirinfo.c in
LibTIFF 4.0.6 and earlier allows remote attackers to cause a denial of
service (out-of-bounds write) or execute arbitrary code via a crafted
TIFF image.
External References:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3632
http://bugzilla.maptools.org/show_bug.cgi?id=2549
https://bugzilla.redhat.com/show_bug.cgi?id=1325095
The patch is from RHEL7.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../libtiff/files/CVE-2016-3632.patch | 34 ++++++++++++++++++++++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 1 +
2 files changed, 35 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3632.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3632.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3632.patch
new file mode 100644
index 0000000..a839250
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-3632.patch
@@ -0,0 +1,34 @@
+From d3f9829a37661749b200760ad6525f77cf77d77a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
+Date: Mon, 11 Jul 2016 16:04:34 +0200
+Subject: [PATCH 4/8] Fix CVE-2016-3632
+
+CVE-2016-3632 libtiff: The _TIFFVGetField function in tif_dirinfo.c in
+LibTIFF 4.0.6 and earlier allows remote attackers to cause a denial of service
+(out-of-bounds write) or execute arbitrary code via a crafted TIFF image.
+
+CVE: CVE-2016-3632
+Upstream-Status: Backport [RedHat RHEL7]
+
+Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
+---
+ tools/thumbnail.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tools/thumbnail.c b/tools/thumbnail.c
+index fd1cba5..75e7009 100644
+--- a/tools/thumbnail.c
++++ b/tools/thumbnail.c
+@@ -253,7 +253,8 @@ static struct cpTag {
+ { TIFFTAG_WHITEPOINT, 2, TIFF_RATIONAL },
+ { TIFFTAG_PRIMARYCHROMATICITIES, (uint16) -1,TIFF_RATIONAL },
+ { TIFFTAG_HALFTONEHINTS, 2, TIFF_SHORT },
+- { TIFFTAG_BADFAXLINES, 1, TIFF_LONG },
++ // disable BADFAXLINES, CVE-2016-3632
++ //{ TIFFTAG_BADFAXLINES, 1, TIFF_LONG },
+ { TIFFTAG_CLEANFAXDATA, 1, TIFF_SHORT },
+ { TIFFTAG_CONSECUTIVEBADFAXLINES, 1, TIFF_LONG },
+ { TIFFTAG_INKSET, 1, TIFF_SHORT },
+--
+2.7.4
+
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index edd560f..9b4aff3 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -16,6 +16,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
file://CVE-2016-3623.patch \
file://CVE-2016-3622.patch \
file://CVE-2016-3658.patch \
+ file://CVE-2016-3632.patch \
"
SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
--
2.7.4
^ permalink raw reply related
* [PATCH 1/2] tiff: Security fix CVE-2016-3658
From: Yi Zhao @ 2016-11-17 8:08 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1479370090-26155-1-git-send-email-yi.zhao@windriver.com>
CVE-2016-3658 libtiff: The TIFFWriteDirectoryTagLongLong8Array function
in tif_dirwrite.c in the tiffset tool in LibTIFF 4.0.6 and earlier
allows remote attackers to cause a denial of service (out-of-bounds
read) via vectors involving the ma variable.
External References:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3658
http://www.openwall.com/lists/oss-security/2016/04/08/12
http://bugzilla.maptools.org/show_bug.cgi?id=2546
Patch from:
https://github.com/vadz/libtiff/commit/45c68450bef8ad876f310b495165c513cad8b67d
This git repository is a mirror of libtiff cvs repository at cvs.maptools.org
created and updated using "git cvsimport".
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../libtiff/files/CVE-2016-3658.patch | 120 +++++++++++++++++++++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 1 +
2 files changed, 121 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3658.patch
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3658.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3658.patch
new file mode 100644
index 0000000..950c634
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-3658.patch
@@ -0,0 +1,120 @@
+From 45c68450bef8ad876f310b495165c513cad8b67d Mon Sep 17 00:00:00 2001
+From: erouault <erouault>
+Date: Tue, 25 Oct 2016 21:35:15 +0000
+Subject: [PATCH] * libtiff/tif_dir.c: discard values of SMinSampleValue and
+ SMaxSampleValue when they have been read and the value of SamplesPerPixel is
+ changed afterwards (like when reading a OJPEG compressed image with a missing
+ SamplesPerPixel tag, and whose photometric is RGB or YCbCr, forcing
+ SamplesPerPixel being 3). Otherwise when rewriting the directory (for example
+ with tiffset, we will expect 3 values whereas the array had been allocated
+ with just one), thus causing a out of bound read access. Fixes
+ http://bugzilla.maptools.org/show_bug.cgi?id=2500 (CVE-2014-8127, duplicate:
+ CVE-2016-3658)
+
+* libtiff/tif_write.c: avoid null pointer dereference on td_stripoffset
+when writing directory, if FIELD_STRIPOFFSETS was artificially set
+for a hack case in OJPEG case.
+Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2500
+(CVE-2014-8127, duplicate: CVE-2016-3658)
+
+CVE: CVE-2016-3658
+Upstream-Status: Backport
+https://github.com/vadz/libtiff/commit/45c68450bef8ad876f310b495165c513cad8b67d
+
+Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
+---
+ ChangeLog | 19 +++++++++++++++++++
+ libtiff/tif_dir.c | 22 ++++++++++++++++++++++
+ libtiff/tif_dirwrite.c | 16 ++++++++++++++--
+ 3 files changed, 55 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 375fe02..8027964 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,22 @@
++2016-10-25 Even Rouault <even.rouault at spatialys.com>
++
++ * libtiff/tif_dir.c: discard values of SMinSampleValue and
++ SMaxSampleValue when they have been read and the value of
++ SamplesPerPixel is changed afterwards (like when reading a
++ OJPEG compressed image with a missing SamplesPerPixel tag,
++ and whose photometric is RGB or YCbCr, forcing SamplesPerPixel
++ being 3). Otherwise when rewriting the directory (for example
++ with tiffset, we will expect 3 values whereas the array had been
++ allocated with just one), thus causing a out of bound read access.
++ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2500
++ (CVE-2014-8127, duplicate: CVE-2016-3658)
++
++ * libtiff/tif_write.c: avoid null pointer dereference on td_stripoffset
++ when writing directory, if FIELD_STRIPOFFSETS was artificially set
++ for a hack case in OJPEG case.
++ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2500
++ (CVE-2014-8127, duplicate: CVE-2016-3658)
++
+ 2016-09-24 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * libtiff/tif_getimage.c (TIFFRGBAImageOK): Reject attempts to
+diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
+index 8073480..160c5d4 100644
+--- a/libtiff/tif_dir.c
++++ b/libtiff/tif_dir.c
+@@ -256,6 +256,28 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
+ v = (uint16) va_arg(ap, uint16_vap);
+ if (v == 0)
+ goto badvalue;
++ if( v != td->td_samplesperpixel )
++ {
++ /* See http://bugzilla.maptools.org/show_bug.cgi?id=2500 */
++ if( td->td_sminsamplevalue != NULL )
++ {
++ TIFFWarningExt(tif->tif_clientdata,module,
++ "SamplesPerPixel tag value is changing, "
++ "but SMinSampleValue tag was read with a different value. Cancelling it");
++ TIFFClrFieldBit(tif,FIELD_SMINSAMPLEVALUE);
++ _TIFFfree(td->td_sminsamplevalue);
++ td->td_sminsamplevalue = NULL;
++ }
++ if( td->td_smaxsamplevalue != NULL )
++ {
++ TIFFWarningExt(tif->tif_clientdata,module,
++ "SamplesPerPixel tag value is changing, "
++ "but SMaxSampleValue tag was read with a different value. Cancelling it");
++ TIFFClrFieldBit(tif,FIELD_SMAXSAMPLEVALUE);
++ _TIFFfree(td->td_smaxsamplevalue);
++ td->td_smaxsamplevalue = NULL;
++ }
++ }
+ td->td_samplesperpixel = (uint16) v;
+ break;
+ case TIFFTAG_ROWSPERSTRIP:
+diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
+index 7e71818..8a3341e 100644
+--- a/libtiff/tif_dirwrite.c
++++ b/libtiff/tif_dirwrite.c
+@@ -542,8 +542,20 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff)
+ {
+ if (!isTiled(tif))
+ {
+- if (!TIFFWriteDirectoryTagLongLong8Array(tif,&ndir,dir,TIFFTAG_STRIPOFFSETS,tif->tif_dir.td_nstrips,tif->tif_dir.td_stripoffset))
+- goto bad;
++ /* td_stripoffset might be NULL in an odd OJPEG case. See
++ * tif_dirread.c around line 3634.
++ * XXX: OJPEG hack.
++ * If a) compression is OJPEG, b) it's not a tiled TIFF,
++ * and c) the number of strips is 1,
++ * then we tolerate the absence of stripoffsets tag,
++ * because, presumably, all required data is in the
++ * JpegInterchangeFormat stream.
++ * We can get here when using tiffset on such a file.
++ * See http://bugzilla.maptools.org/show_bug.cgi?id=2500
++ */
++ if (tif->tif_dir.td_stripoffset != NULL &&
++ !TIFFWriteDirectoryTagLongLong8Array(tif,&ndir,dir,TIFFTAG_STRIPOFFSETS,tif->tif_dir.td_nstrips,tif->tif_dir.td_stripoffset))
++ goto bad;
+ }
+ else
+ {
+--
+2.7.4
+
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index 796d86e..edd560f 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -15,6 +15,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
file://CVE-2016-3991.patch \
file://CVE-2016-3623.patch \
file://CVE-2016-3622.patch \
+ file://CVE-2016-3658.patch \
"
SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
--
2.7.4
^ permalink raw reply related
* [PATCH 0/2] tiff: 2 CVE fixes
From: Yi Zhao @ 2016-11-17 8:08 UTC (permalink / raw)
To: openembedded-core
Yi Zhao (2):
tiff: Security fix CVE-2016-3658
tiff: Security fix CVE-2016-3632
.../libtiff/files/CVE-2016-3632.patch | 34 ++++++
.../libtiff/files/CVE-2016-3658.patch | 120 +++++++++++++++++++++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 2 +
3 files changed, 156 insertions(+)
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3632.patch
create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3658.patch
--
2.7.4
^ permalink raw reply
* [PATCH 8/8] oe/copy_buildsystem.py: add SDK_LAYERS_EXCLUDE_PATTERN
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
It is helpful we want to exclude a lot of layers.
It uses python re, and supports multiple patterns (separated by space).
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/lib/oe/copy_buildsystem.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index 29ac6d4..e5d00c7 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py
@@ -1,5 +1,12 @@
# This class should provide easy access to the different aspects of the
# buildsystem such as layers, bitbake location, etc.
+#
+# SDK_LAYERS_EXCLUDE: Layers which will be excluded from SDK layers.
+# SDK_LAYERS_EXCLUDE_PATTERN: The simiar to SDK_LAYERS_EXCLUDE, this supports
+# python regular expression, use space as separator,
+# e.g.: ".*-downloads closed-.*"
+#
+
import stat
import shutil
@@ -23,8 +30,10 @@ class BuildSystem(object):
self.context = context
self.layerdirs = [os.path.abspath(pth) for pth in d.getVar('BBLAYERS', True).split()]
self.layers_exclude = (d.getVar('SDK_LAYERS_EXCLUDE', True) or "").split()
+ self.layers_exclude_pattern = d.getVar('SDK_LAYERS_EXCLUDE_PATTERN', True)
def copy_bitbake_and_layers(self, destdir, workspace_name=None):
+ import re
# Copy in all metadata layers + bitbake (as repositories)
layers_copied = []
bb.utils.mkdirhier(destdir)
@@ -36,8 +45,17 @@ class BuildSystem(object):
# Exclude layers
for layer_exclude in self.layers_exclude:
if layer_exclude in layers:
+ bb.note('Excluded %s from sdk layers since it is in SDK_LAYERS_EXCLUDE' % layer_exclude)
layers.remove(layer_exclude)
+ if self.layers_exclude_pattern:
+ layers_cp = layers[:]
+ for pattern in self.layers_exclude_pattern.split():
+ for layer in layers_cp:
+ if re.match(pattern, layer):
+ bb.note('Excluded %s from sdk layers since matched SDK_LAYERS_EXCLUDE_PATTERN' % layer)
+ layers.remove(layer)
+
workspace_newname = workspace_name
if workspace_newname:
layernames = [os.path.basename(layer) for layer in layers]
--
2.10.2
^ permalink raw reply related
* [PATCH 7/8] oeqa/sdkext/devtool.py: skip test_extend_autotools_recipe_creation when no libxml2
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
The librdfa requires libxml2 to build, otherwise, it would fail:
| configure: error: Package requirements (libxml-2.0 >= 2.6.26) were not met:
|
| No package 'libxml-2.0' found
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/lib/oeqa/sdkext/devtool.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/sdkext/devtool.py b/meta/lib/oeqa/sdkext/devtool.py
index c91090e..9ff69f9 100644
--- a/meta/lib/oeqa/sdkext/devtool.py
+++ b/meta/lib/oeqa/sdkext/devtool.py
@@ -1,7 +1,7 @@
import shutil
import subprocess
import urllib.request
-from oeqa.oetest import oeSDKExtTest
+from oeqa.oetest import oeSDKExtTest, skipModule
from oeqa.utils.decorators import *
class DevtoolTest(oeSDKExtTest):
@@ -64,6 +64,9 @@ class DevtoolTest(oeSDKExtTest):
@testcase(1482)
@skipUnlessPassed('test_devtool_location')
def test_extend_autotools_recipe_creation(self):
+ # librdfa requires libxml2
+ if not oeSDKExtTest.hasLockedSig("libxml2"):
+ skipModule("No libxml2 package in the eSDK")
req = 'https://github.com/rdfa/librdfa'
recipe = "bbexample"
self._run('devtool add %s %s' % (recipe, req) )
--
2.10.2
^ permalink raw reply related
* [PATCH 6/8] oeqa/oetest.py: add hasLockedSig()
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
It checks whether there is a "recipe:do_populate_sysroot:" in
locked-sigs.inc, which will help to determine whether the testcase will
run or not.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/lib/oeqa/oetest.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index 95d3bf7..d12381d 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -171,6 +171,12 @@ class oeSDKExtTest(oeSDKTest):
return subprocess.check_output(". %s > /dev/null;"\
" %s;" % (self.tc.sdkenv, cmd), stderr=subprocess.STDOUT, shell=True, env=env).decode("utf-8")
+ @classmethod
+ def hasLockedSig(self, recipe):
+ if re.search(" " + recipe + ":do_populate_sysroot:", oeTest.tc.locked_sigs):
+ return True
+ return False
+
def getmodule(pos=2):
# stack returns a list of tuples containg frame information
# First element of the list the is current frame, caller is 1
@@ -708,6 +714,13 @@ class SDKExtTestContext(SDKTestContext):
self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath(
oeqa.sdkext.__file__)), "files")
+ self.locked_sig_file = os.path.join(self.sdktestdir, "tc/conf/locked-sigs.inc")
+ if os.path.exists(self.locked_sig_file):
+ with open(self.locked_sig_file) as f:
+ self.locked_sigs = f.read()
+ else:
+ bb.fatal("%s not found. Did you build the ext sdk image?\n%s" % e)
+
def _get_test_namespace(self):
if self.cm:
return "sdk"
--
2.10.2
^ permalink raw reply related
* [PATCH 5/8] oeqa/sdkext/devtool.py: don't reset when the test is failed
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
The contents are helpful to debug when the error happens.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/lib/oeqa/sdkext/devtool.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/meta/lib/oeqa/sdkext/devtool.py b/meta/lib/oeqa/sdkext/devtool.py
index f101eb6..c91090e 100644
--- a/meta/lib/oeqa/sdkext/devtool.py
+++ b/meta/lib/oeqa/sdkext/devtool.py
@@ -24,7 +24,6 @@ class DevtoolTest(oeSDKExtTest):
self._run('devtool build myapp')
except Exception as e:
print(e.output)
- self._run('devtool reset myapp')
raise e
self._run('devtool reset myapp')
@@ -34,7 +33,6 @@ class DevtoolTest(oeSDKExtTest):
self._run('devtool package myapp')
except Exception as e:
print(e.output)
- self._run('devtool reset myapp')
raise e
self._run('devtool reset myapp')
@@ -73,7 +71,6 @@ class DevtoolTest(oeSDKExtTest):
self._run('devtool build %s' % recipe)
except Exception as e:
print(e.output)
- self._run('devtool reset %s' % recipe)
raise e
self._run('devtool reset %s' % recipe)
@@ -87,7 +84,6 @@ class DevtoolTest(oeSDKExtTest):
self._run('devtool build %s' % recipe)
except Exception as e:
print(e.output)
- self._run('devtool reset %s' % recipe)
raise e
self._run('devtool reset %s' % recipe)
@@ -100,7 +96,6 @@ class DevtoolTest(oeSDKExtTest):
self._run('devtool build %s ' % package_nodejs)
except Exception as e:
print(e.output)
- self._run('devtool reset %s' % package_nodejs)
raise e
self._run('devtool reset %s '% package_nodejs)
--
2.10.2
^ permalink raw reply related
* [PATCH 4/8] oe-publish-sdk: add pyshtables.py to .gitignore
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
Fixed:
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
$ bitbake core-image-minimal -cpopulate_sdk_ext
[snip]
ERROR: Failed to update metadata as there have been changes made to it. Aborting.\nERROR: Changed files:\nb' M poky/bitbake/lib/bb/pysh/pyshtables.py\\n'\n"
[snip]
This is because the test case will run twice
(environment-setup-core2-64-poky-linux and
environment-setup-x86-pokymllib32-linux), it would fail in the second
run since pyshtables.py is regenerated in the first run. This file is
generated automatically, publish it doesn't make any sense, so add it to
.gitignore.
[YOCTO #10647]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
scripts/oe-publish-sdk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index d95c623..e2b1b95 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -116,7 +116,7 @@ def publish(args):
cmd_common = "if [ ! -e .git ]; then"
cmd_common += " git init .;"
cmd_common += " mv .git/hooks/post-update.sample .git/hooks/post-update;"
- cmd_common += " echo '*.pyc\n*.pyo' > .gitignore;"
+ cmd_common += " echo '*.pyc\n*.pyo\npyshtables.py' > .gitignore;"
cmd_common += "fi;"
cmd_common += "git add -A .;"
cmd_common += "git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m 'init repo' || true;"
--
2.10.2
^ permalink raw reply related
* [PATCH 3/8] oe-publish-sdk: make cmd easier to read
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
The command was too long to read and maintain.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
scripts/oe-publish-sdk | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index 4fe8974..d95c623 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -113,10 +113,25 @@ def publish(args):
return ret
# Setting up the git repo
+ cmd_common = "if [ ! -e .git ]; then"
+ cmd_common += " git init .;"
+ cmd_common += " mv .git/hooks/post-update.sample .git/hooks/post-update;"
+ cmd_common += " echo '*.pyc\n*.pyo' > .gitignore;"
+ cmd_common += "fi;"
+ cmd_common += "git add -A .;"
+ cmd_common += "git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m 'init repo' || true;"
if not is_remote:
- cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo "*.pyc\n*.pyo" > .gitignore; fi; git add -A .; git config user.email "oe@oe.oe" && git config user.name "OE" && git commit -q -m "init repo" || true; git update-server-info' % (destination, destination)
+ cmd = "set -e;"
+ cmd += "mkdir -p %s/layers;" % destination
+ cmd += "cd %s/layers;" % destination
+ cmd += cmd_common
+ cmd += "git update-server-info"
else:
- cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo '*.pyc\n*.pyo' > .gitignore; fi; git add -A .; git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m \"init repo\" || true; git update-server-info'" % (host, destdir, destdir)
+ cmd = "ssh %s 'set -e;" % host
+ cmd += "mkdir -p %s/layers;" % destdir
+ cmd += "cd %s/layers;" % destdir
+ cmd += cmd_common
+ cmd += "git update-server-info'"
ret = subprocess.call(cmd, shell=True)
if ret == 0:
logger.info('SDK published successfully')
--
2.10.2
^ permalink raw reply related
* [PATCH 2/8] oeqa/sdkext/devtool.py: remove workspace/sources before running test cases
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
Fixed:
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
$ bitbake core-image-minimal -cpopulate_sdk_ext
[snip]
ERROR: Source tree path /path/to/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/testsdkext/tc/workspace/sources/v4l2loopback-driver already exists and is not empty\n'
[snip]
This is because the test case will run twice
(environment-setup-core2-64-poky-linux and
environment-setup-x86-pokymllib32-linux), it would fail in the second
run, 'devtool reset' can not remove sources, so remove it before running
test cases.
[YOCTO #10647]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/lib/oeqa/sdkext/devtool.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/lib/oeqa/sdkext/devtool.py b/meta/lib/oeqa/sdkext/devtool.py
index 65f41f6..f101eb6 100644
--- a/meta/lib/oeqa/sdkext/devtool.py
+++ b/meta/lib/oeqa/sdkext/devtool.py
@@ -15,6 +15,9 @@ class DevtoolTest(oeSDKExtTest):
self.myapp_cmake_dst = os.path.join(self.tc.sdktestdir, "myapp_cmake")
shutil.copytree(self.myapp_cmake_src, self.myapp_cmake_dst)
+ # Clean sources dir to make "git clone" can run again
+ shutil.rmtree(os.path.join(self.tc.sdktestdir, "tc/workspace/sources"), True)
+
def _test_devtool_build(self, directory):
self._run('devtool add myapp %s' % directory)
try:
--
2.10.2
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox