Re: [OE-core] [PATCH 3/5] gtk+3: upgrade 3.24.1 -> 3.24.5
on ubuntu 14.04 https://errors.yoctoproject.org/Errors/Details/228774/
On Mon, Feb 18, 2019 at 4:10 PM Richard Purdie
wrote:
>
> Signed-off-by: Richard Purdie
> ---
> meta/recipes-gnome/gtk+/{gtk+3_3.24.1.bb => gtk+3_3.24.5.bb} | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta/recipes-gnome/gtk+/{gtk+3_3.24.1.bb => gtk+3_3.24.5.bb} (83%)
>
> diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb
> b/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb
> similarity index 83%
> rename from meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb
> rename to meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb
> index 6de3e73f2f0..799cbd4707e 100644
> --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb
> +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb
> @@ -7,8 +7,8 @@ SRC_URI =
> "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
> file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
> file://0003-Add-disable-opengl-configure-option.patch \
>"
> -SRC_URI[md5sum] = "9dfe16f486573815f242fa400763feb7"
> -SRC_URI[sha256sum] =
> "68387be307b99aadcdc653561d7a2a7f0113b93561fb18ded7075ec9ced5b02f"
> +SRC_URI[md5sum] = "32862355c08f6af3e7848c695cd4081b"
> +SRC_URI[sha256sum] =
> "0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f"
>
> S = "${WORKDIR}/gtk+-${PV}"
>
> --
> 2.20.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] gcc-runtime: fix C++ header mapping for n32/x32 tune
On 2/14/19 7:19 PM, Richard Purdie wrote: On Tue, 2019-02-12 at 13:10 +0800, changqing...@windriver.com wrote: From: Changqing Li The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations: multilib configuration 1: MACHINE="qemumips64" MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf ignoring nonexistent directory "/sysroots/mips64-poky- linux/usr/include/c++/8.2.0/mips64-poky-linux/32 multilib configuration 2: MACHINE="qemumips64" MULTILIBS = 'multilib:lib64 multilib:lib32' DEFAULTTUNE = 'mips64-n32' DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64' DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2' require conf/multilib.conf For this configuration: for target gcc-runtime, need to create symlink like mips64-poly- linux --> mips64-poky-linux-gnu32 for target lib64-gcc-runtime, need to create symlink like mips64- poly-linux/32 --> mips64-pokymllib64-linux in order to avoid conflict during populate_sdk, create symlink for subfoler bits/ext for target gcc-runtime, this is ugly, but seems no better way to cover all kinds of configuration. single lib configuration: MACHINE="qemumips64" DEFAULTTUNE = "mips64-n32" Signed-off-by: Changqing Li --- meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +-- -- 1 file changed, 17 insertions(+), 12 deletions(-) I haven't looked into why and it took a bit of narrowing down to find the commit responsible but this is still causing a failure on the autobuilder: https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/285 Hi, Richard I checked this problem, this autobuilder fail seems not related to this patch. it is failed as: Error: Problem: conflicting requests - nothing provides lib64-lttng-modules needed by lib64-packagegroup-core-tools-profile-1.0-r3.0.qemux86' but one place weird is I cannot reproduce this error locally with same configuration. This is my lib64-packagegroup-core-tools-profile.spec: Requires: lib64-powertop Requires: lib64-systemtap Requires: lib64-valgrind Requires: lttng-modules Recommends: lib64-blktrace Requires should be lttng-modules and not lib64-lttng-modules. lib64-lttng-modules should have been replace to lttng-modules. during do_package_rpm->mapping_rename_hook->get_package_mapping. I checked history of this part of code, it should not have change recently, so my local code should same as autobuildler, so I don't quite understand why autobuilder failed. If possible, could you help to check on the build server of the autobuilder ? Thanks. Cheers, Richard -- BRs Sandy(Li Changqing) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used
I am seeing locale packaging errors too https://errors.yoctoproject.org/Errors/Build/76954/ On Sun, Feb 17, 2019 at 2:53 PM Richard Purdie wrote: > > On Sun, 2019-02-17 at 15:51 +0100, Peter Kjellerstedt wrote: > > Signed-off-by: Peter Kjellerstedt > > --- > > meta/classes/libc-package.bbclass | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > I included this patchset in a run on the autobuilder and its failing: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/66 > > I know the resulttool failures are my fault but the glibc-locale ones > aren't. I'll abort the build as there are enough failures to know its > doomed and I need a results set for other testing. > > Cheers, > > Richard > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 7/8] glib-2.0: convert from autotools to meson
seeing an error armv5te/thumb
https://errors.yoctoproject.org/Errors/Details/228765/
On Mon, Feb 18, 2019 at 4:42 AM Alexander Kanavin
wrote:
>
> PRINTF settings no longer seem necessary (tested with mingw).
>
> Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and
> 0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
>
> Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> to allow 'mingw32' as target machine in addition to 'windows'.
>
> Drop configure-libtool.patch and uclibc_musl_translation.patch
> (both autotools-specific).
>
> Signed-off-by: Alexander Kanavin
> ---
> ...t-write-bindir-into-pkg-config-files.patch | 50 ++
> ...-gio-querymodules-as-libexec_PROGRAM.patch | 17 +++-
> ...-correctly-when-building-with-mingw3.patch | 81 +
> ...ble-more-tests-while-cross-compiling.patch | 91 ++-
> .../glib-2.0/glib-2.0/configure-libtool.patch | 44 -
> .../glib-2.0/glib-2.0/relocate-modules.patch | 2 +-
> .../glib-2.0/uclibc_musl_translation.patch| 22 -
> meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 4 +-
> meta/recipes-core/glib-2.0/glib.inc | 33 ---
> 9 files changed, 256 insertions(+), 88 deletions(-)
> create mode 100644
> meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> create mode 100644
> meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> delete mode 100644
> meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
> delete mode 100644
> meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
>
> diff --git
> a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
>
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> new file mode 100644
> index 000..ede29c90bab
> --- /dev/null
> +++
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> @@ -0,0 +1,50 @@
> +From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin
> +Date: Fri, 15 Feb 2019 11:17:27 +0100
> +Subject: [PATCH] Do not write $bindir into pkg-config files
> +
> +This would otherwise break when using the files to build other target
> +components (we need to rely on PATH containing the paths to utilities,
> +rather than use target paths).
> +
> +Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
> +Signed-off-by: Alexander Kanavin
> +---
> + gio/meson.build | 6 +++---
> + glib/meson.build | 6 +++---
> + 2 files changed, 6 insertions(+), 6 deletions(-)
> +
> +diff --git a/gio/meson.build b/gio/meson.build
> +index 85d8b14..657720a 100644
> +--- a/gio/meson.build
> b/gio/meson.build
> +@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
> +'schemasdir=' + join_paths('${datadir}', schemas_subdir),
> +'bindir=' + join_paths('${prefix}', get_option('bindir')),
> +'giomoduledir=' + giomodulesdir,
> +- 'glib_compile_schemas=' + join_paths('${bindir}',
> 'glib-compile-schemas'),
> +- 'glib_compile_resources=' + join_paths('${bindir}',
> 'glib-compile-resources'),
> +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
> ++ 'glib_compile_schemas=glib-compile-schemas',
> ++ 'glib_compile_resources=glib-compile-resources',
> ++ 'gdbus_codegen=gdbus-codegen'],
> + version : glib_version,
> + install_dir : glib_pkgconfigreldir,
> + filebase : 'gio-2.0',
> +diff --git a/glib/meson.build b/glib/meson.build
> +index c05c694..434e8b1 100644
> +--- a/glib/meson.build
> b/glib/meson.build
> +@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
> + subdirs : ['glib-2.0'],
> + extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
> + variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
> +- 'glib_genmarshal=' + join_paths('${bindir}',
> 'glib-genmarshal'),
> +- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
> +- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
> ++ 'glib_genmarshal=glib-genmarshal',
> ++ 'gobject_query=gobject-query',
> ++ 'glib_mkenums=glib-mkenums'],
> + version : glib_version,
> + install_dir : glib_pkgconfigreldir,
> + filebase : 'glib-2.0',
> diff --git
> a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
>
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
> index 97d0aff5d6c..f246254942e 100644
> ---
> a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
> +++
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
> @@ -1,4
[OE-core] [PATCH] libidn2: fix buildpaths qa issue in .pc file
From: Kai Kang
When enable buildpaths qa check, it show warning of libidn2:
| WARNING: libidn2-2.0.5-r0 do_package_qa: QA Issue: File
/work/armv5e-poky-linux-gnueabi/libidn2/2.0.5-r0/packages-split/libidn2-dev/usr/lib/pkgconfig/libidn2.pc
in package contained reference to tmpdir [buildpaths]
Fix the issue by substituting @LTLIBUNISTRING@ in the .pc file.
Signed-off-by: Kai Kang
---
.../fix-host-contamination-in-pc-file.patch | 22 +++
meta/recipes-extended/libidn/libidn2_2.0.5.bb | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-extended/libidn/libidn2/fix-host-contamination-in-pc-file.patch
diff --git
a/meta/recipes-extended/libidn/libidn2/fix-host-contamination-in-pc-file.patch
b/meta/recipes-extended/libidn/libidn2/fix-host-contamination-in-pc-file.patch
new file mode 100644
index 00..026312ab0a
--- /dev/null
+++
b/meta/recipes-extended/libidn/libidn2/fix-host-contamination-in-pc-file.patch
@@ -0,0 +1,22 @@
+Configure option --with-libunistring-prefix is set to fix compile-host-path qa
+issue. It causes @LTLIBUNISTRING@ in line 'Libs.private' of libidn2.pc replaced
+with ${STAGING_EXECPREFIXDIR} which causes buildpaths qa issue.
+
+libunistring is a dependency of libidn2 and installs libraries to standard
+library path, so just substitute @LTLIBUNISTRING@ with standard library path
+and -lunistring in libidn2.pc.in.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Kai Kang
+---
+diff --git a/libidn2.pc.in b/libidn2.pc.in
+index 0dade23..24cc29d 100644
+--- a/libidn2.pc.in
b/libidn2.pc.in
+@@ -8,4 +8,4 @@ Description: Library implementing IDNA2008 and TR46
+ Version: @PACKAGE_VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lidn2
+-Libs.private: @LTLIBICONV@ @LTLIBUNISTRING@
++Libs.private: @LTLIBICONV@ -L${libdir} -lunistring
diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
index 0daf7a6877..a243a9181e 100644
--- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
+++ b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
@@ -11,7 +11,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \
SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
file://Unset-need_charset_alias-when-building-for-musl.patch \
- "
+ file://fix-host-contamination-in-pc-file.patch \
+ "
SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36"
SRC_URI[sha256sum] =
"53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8"
--
2.20.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glibc: CVE-2019-7309
Backport the CVE patch from the upstream commit 3f635fb43389b54f682fc9ed2acc0b2aaf4a923d Signed-off-by: Zhixiong Chi --- ...e-unsigned-Jcc-instructions-on-size-.patch | 223 ++ meta/recipes-core/glibc/glibc_2.29.bb | 1 + 2 files changed, 224 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch diff --git a/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch b/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch new file mode 100644 index 00..1c625f63c7 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch @@ -0,0 +1,223 @@ +From 3f635fb43389b54f682fc9ed2acc0b2aaf4a923d Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 4 Feb 2019 06:31:01 -0800 +Subject: [PATCH] x86-64 memcmp: Use unsigned Jcc instructions on size [BZ + #24155] + +Since the size argument is unsigned. we should use unsigned Jcc +instructions, instead of signed, to check size. + +Tested on x86-64 and x32, with and without --disable-multi-arch. + + [BZ #24155] + CVE-2019-7309 + * NEWS: Updated for CVE-2019-7309. + * sysdeps/x86_64/memcmp.S: Use RDX_LP for size. Clear the + upper 32 bits of RDX register for x32. Use unsigned Jcc + instructions, instead of signed. + * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memcmp-2. + * sysdeps/x86_64/x32/tst-size_t-memcmp-2.c: New test. + +CVE: CVE-2019-7309 +Upstream-Status: Backport +Signed-off-by: Zhixiong Chi +--- + ChangeLog| 11 + sysdeps/x86_64/memcmp.S | 20 +++--- + sysdeps/x86_64/x32/Makefile | 3 +- + sysdeps/x86_64/x32/tst-size_t-memcmp-2.c | 79 + 5 files changed, 111 insertions(+), 10 deletions(-) + create mode 100644 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c + +diff --git a/ChangeLog b/ChangeLog +index 29bc4451ef..a0dcdac323 100644 +--- a/ChangeLog b/ChangeLog +@@ -1,3 +1,14 @@ ++2019-02-04 H.J. Lu ++ ++ [BZ #24155] ++ CVE-2019-7309 ++ * NEWS: Updated for CVE-2019-7309. ++ * sysdeps/x86_64/memcmp.S: Use RDX_LP for size. Clear the ++ upper 32 bits of RDX register for x32. Use unsigned Jcc ++ instructions, instead of signed. ++ * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memcmp-2. ++ * sysdeps/x86_64/x32/tst-size_t-memcmp-2.c: New test. ++ + 2019-01-31 Carlos O'Donell + Torvald Riegel + Rik Prohaska +diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S +index 1fc487caa5..1322bb3b92 100644 +--- a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S +@@ -21,14 +21,18 @@ + + .text + ENTRY (memcmp) +- test%rdx, %rdx ++#ifdef __ILP32__ ++ /* Clear the upper 32 bits. */ ++ movl%edx, %edx ++#endif ++ test%RDX_LP, %RDX_LP + jz L(finz) + cmpq$1, %rdx +- jle L(finr1b) ++ jbe L(finr1b) + subq%rdi, %rsi + movq%rdx, %r10 + cmpq$32, %r10 +- jge L(gt32) ++ jae L(gt32) + /* Handle small chunks and last block of less than 32 bytes. */ + L(small): + testq $1, %r10 +@@ -156,7 +160,7 @@ L(A32): + movq%r11, %r10 + andq$-32, %r10 + cmpq%r10, %rdi +-jge L(mt16) ++jae L(mt16) + /* Pre-unroll to be ready for unrolled 64B loop. */ + testq $32, %rdi + jz L(A64) +@@ -178,7 +182,7 @@ L(A64): + movq%r11, %r10 + andq$-64, %r10 + cmpq%r10, %rdi +-jge L(mt32) ++jae L(mt32) + + L(A64main): + movdqu(%rdi,%rsi), %xmm0 +@@ -216,7 +220,7 @@ L(mt32): + movq%r11, %r10 + andq$-32, %r10 + cmpq%r10, %rdi +-jge L(mt16) ++jae L(mt16) + + L(A32main): + movdqu(%rdi,%rsi), %xmm0 +@@ -254,7 +258,7 @@ L(ATR): + movq%r11, %r10 + andq$-32, %r10 + cmpq%r10, %rdi +-jge L(mt16) ++jae L(mt16) + testq $16, %rdi + jz L(ATR32) + +@@ -325,7 +329,7 @@ L(ATR64main): + movq%r11, %r10 + andq$-32, %r10 + cmpq%r10, %rdi +-jge L(mt16) ++jae L(mt16) + + L(ATR32res): + movdqa(%rdi,%rsi), %xmm0 +diff --git a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile +index 1557724b0c..8748956563 100644 +--- a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile +@@ -8,7 +8,8 @@ endif + ifeq ($(subdir),string) + tests += tst-size_t-memchr tst-size_t-memcmp tst-size_t-memcpy \ +tst-size_t-memrchr tst-size_t-memset tst-size_t-strncasecmp \ +- tst-size_t-strncmp tst-size_t-strncpy tst-size_t-strnlen ++ tst-size_t-strncmp tst-size_t-strncpy tst-size_t-strnlen \ ++
[OE-core] [PATCH] icu: Added armeb support.
Make icu support arm32 BE.
Upstream-Status: Pending
Signed-off-by: Lei Maohui
---
.../icu/icu/0001-Make-icu-support-arm-BE.patch | 28 ++
meta/recipes-support/icu/icu_63.1.bb | 1 +
2 files changed, 29 insertions(+)
create mode 100644
meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch
diff --git a/meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch
b/meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch
new file mode 100644
index 000..019d09e
--- /dev/null
+++ b/meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch
@@ -0,0 +1,28 @@
+From 8fa6cbf2d3de73bdca5e65f6523e4cce334aeee7 Mon Sep 17 00:00:00 2001
+From: Lei Maohui
+Date: Fri, 14 Dec 2018 16:07:31 +0900
+Subject: [PATCH] Make icu support arm BE.
+
+Upstream-Status: Pending
+
+Signed-off-by: Lei Maohui
+---
+ i18n/double-conversion-utils.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/i18n/double-conversion-utils.h
b/source/i18n/double-conversion-utils.h
+index 0bd3e83..9288e28 100644
+--- a/i18n/double-conversion-utils.h
b/i18n/double-conversion-utils.h
+@@ -77,7 +77,7 @@ inline void abort_noreturn() { abort(); }
+ // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
+ // ICU PATCH: Enable ARM32 & ARM64 builds for Windows with 'defined(_M_ARM)
|| defined(_M_ARM64)'.
+ #if defined(_M_X64) || defined(__x86_64__) || \
+-defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) ||
defined(_M_ARM64) || \
++defined(__arm__) || defined(__avr32__) || defined(_M_ARM) ||
defined(_M_ARM64) || \
+ defined(__hppa__) || defined(__ia64__) || \
+ defined(__mips__) || \
+ defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
+--
+2.7.4
+
diff --git a/meta/recipes-support/icu/icu_63.1.bb
b/meta/recipes-support/icu/icu_63.1.bb
index e593dc1..38bfa6a 100644
--- a/meta/recipes-support/icu/icu_63.1.bb
+++ b/meta/recipes-support/icu/icu_63.1.bb
@@ -17,6 +17,7 @@ SRC_URI = "${BASE_SRC_URI} \
file://icu-pkgdata-large-cmd.patch \
file://fix-install-manx.patch \
file://0002-Add-ARC-support.patch \
+ file://0001-Make-icu-support-arm-BE.patch \
"
SRC_URI_append_class-target = "\
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] logrotate.py: restore /etc/logrotate.d/wtmp
Ping.
This patch is used to fix the incomplete cleanup for logrotate test in oeqa.
Thanks,
On 2019年02月13日 13:43, mingli...@windriver.com wrote:
From: Mingli Yu
During the test logrotate.LogrotateTest.test_1_logrotate_setup,
there is below logic:
# mkdir $HOME/logrotate_dir
# sed -i "s#wtmp {#wtmp {\nolddir $HOME/logrotate_dir#"
/etc/logrotate.d/wtmp
After all logrotate.LogrotateTest finished, only cleanup
$HOME/logrotate_dir as below, but don't restore
the config file /etc/logrotate.d/wtmp.
[snip]
def tearDownClass(cls):
cls.tc.target.run('rm -rf $HOME/logrotate_dir')
[snip]
That's to say, there is one additional line added
to /etc/logrotate.d/wtmp and will make the logrotate
service start failed when run systemd.SystemdBasicTests.test_systemd_failed
Take an example as below when run test as root:
# cat /etc/logrotate.d/wtmp
# no packages own wtmp -- we'll rotate it here
/var/log/wtmp {
olddir /root/logrotate_dir
missingok
monthly
create 0664 root utmp
minsize 1M
rotate 1
}
# ls /root/logrotate_dir
ls: cannot access '/root/logrotate_dir': No such file or directory
# systemctl start logrotate
Job for logrotate.service failed because the control process exited with
error code.
See "systemctl status logrotate.service" and "journalctl -xe" for details.
# systemctl status logrotate
logrotate.service - Rotate log files
Loaded: loaded (/lib/systemd/system/logrotate.service; static; vendor
preset>
Active: failed (Result: exit-code) since Wed 2019-02-13 03:35:19 UTC; 7s ago
Docs: man:logrotate(8)
man:logrotate.conf(5)
Process: 540 ExecStart=/usr/sbin/logrotate /etc/logrotate.conf
(code=exited, status=1/FAILURE)
Main PID: 540 (code=exited, status=1/FAILURE)
Feb 13 03:35:18 qemumips systemd[1]: Starting Rotate log files...
Feb 13 03:35:19 qemumips logrotate[540]: error: wtmp:9 error verifying
olddir path /root/logrotate_dir: No such file or directory
Feb 13 03:35:19 qemumips logrotate[540]: error: found error in file wtmp,
skipping
Feb 13 03:35:19 qemumips systemd[1]: logrotate.service: Main process exited,
code=exited, status=1/FAILURE
Feb 13 03:35:19 qemumips systemd[1]: logrotate.service: Failed with result
'exit-code'.
Feb 13 03:35:19 qemumips systemd[1]: Failed to start Rotate log files.
Add the logic to restore /etc/logrotate.d/wtmp to
make the cleanup complete to fix the above issue.
Signed-off-by: Mingli Yu
---
meta/lib/oeqa/runtime/cases/logrotate.py | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/runtime/cases/logrotate.py
b/meta/lib/oeqa/runtime/cases/logrotate.py
index db6e695..d266644 100644
--- a/meta/lib/oeqa/runtime/cases/logrotate.py
+++ b/meta/lib/oeqa/runtime/cases/logrotate.py
@@ -9,8 +9,12 @@ from oeqa.runtime.decorator.package import OEHasPackage
class LogrotateTest(OERuntimeTestCase):
@classmethod
+def setUpClass(cls):
+cls.tc.target.run('cp /etc/logrotate.d/wtmp $HOME/wtmp.oeqabak')
+
+@classmethod
def tearDownClass(cls):
-cls.tc.target.run('rm -rf $HOME/logrotate_dir')
+cls.tc.target.run('mv -f $HOME/wtmp.oeqabak /etc/logrotate.d/wtmp &&
rm -rf $HOME/logrotate_dir')
@OETestID(1544)
@OETestDepends(['ssh.SSHTest.test_ssh'])
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] cups: upgrade to 2.2.10
Signed-off-by: Chen Qi
---
meta/recipes-extended/cups/{cups_2.2.9.bb => cups_2.2.10.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/cups/{cups_2.2.9.bb => cups_2.2.10.bb} (40%)
diff --git a/meta/recipes-extended/cups/cups_2.2.9.bb
b/meta/recipes-extended/cups/cups_2.2.10.bb
similarity index 40%
rename from meta/recipes-extended/cups/cups_2.2.9.bb
rename to meta/recipes-extended/cups/cups_2.2.10.bb
index fcd96ef..490c84e 100644
--- a/meta/recipes-extended/cups/cups_2.2.9.bb
+++ b/meta/recipes-extended/cups/cups_2.2.10.bb
@@ -2,5 +2,5 @@ require cups.inc
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460"
-SRC_URI[md5sum] = "798e83bb1a240f5417a252903d83ae0c"
-SRC_URI[sha256sum] =
"6d22d5da253b97643320da0bf95574acd85ff2abe3ec1a51d36093841d891156"
+SRC_URI[md5sum] = "3d22d747403ec5dcd0b66d1332564816"
+SRC_URI[sha256sum] =
"77c8b2b3bb7fe8b5fbfffc307f2c817b2d7ec67b657f261a1dd1c61ab81205bb"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] dbus: upgrade to 1.12.12
Signed-off-by: Chen Qi
---
meta/recipes-core/dbus/{dbus_1.12.10.bb => dbus_1.12.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/dbus/{dbus_1.12.10.bb => dbus_1.12.12.bb} (97%)
diff --git a/meta/recipes-core/dbus/dbus_1.12.10.bb
b/meta/recipes-core/dbus/dbus_1.12.12.bb
similarity index 97%
rename from meta/recipes-core/dbus/dbus_1.12.10.bb
rename to meta/recipes-core/dbus/dbus_1.12.12.bb
index d330127..6e9be79 100644
--- a/meta/recipes-core/dbus/dbus_1.12.10.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.12.bb
@@ -18,8 +18,8 @@ SRC_URI =
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
"
-SRC_URI[md5sum] = "c3e12b4206e2a7da39d7cc42567790ef"
-SRC_URI[sha256sum] =
"4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7"
+SRC_URI[md5sum] = "ea11069521b4e47f0086596a43c8"
+SRC_URI[sha256sum] =
"9546f226011a1e5d9d77245fe5549ef25af4694053189d624d0d6ac127ecf5f8"
inherit useradd autotools pkgconfig gettext update-rc.d
upstream-version-is-even
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] diffutils: upgrade to 3.7
The following two patches are removed as they are not needed anymore.
0001-Unset-need_charset_alias-when-building-for-musl.patch
0001-explicitly-disable-replacing-getopt.patch
Signed-off-by: Chen Qi
---
...need_charset_alias-when-building-for-musl.patch | 33 --
.../0001-explicitly-disable-replacing-getopt.patch | 30
.../{diffutils-3.6 => diffutils}/run-ptest | 0
.../{diffutils_3.6.bb => diffutils_3.7.bb} | 6 ++--
4 files changed, 2 insertions(+), 67 deletions(-)
delete mode 100644
meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
delete mode 100644
meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
rename meta/recipes-extended/diffutils/{diffutils-3.6 => diffutils}/run-ptest
(100%)
rename meta/recipes-extended/diffutils/{diffutils_3.6.bb => diffutils_3.7.bb}
(77%)
diff --git
a/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
b/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index ba1a4ba..000
---
a/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/gnulib.mk b/lib/gnulib.mk
-index e1d74db..c0e92dd 100644
a/lib/gnulib.mk
-+++ b/lib/gnulib.mk
-@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local
- case '$(host_os)' in \
- darwin[56]*) \
- need_charset_alias=true ;; \
-- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- need_charset_alias=false ;; \
- *) \
- need_charset_alias=true ;; \
---
-2.1.4
-
diff --git
a/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
b/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
deleted file mode 100644
index 351f87c..000
---
a/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Subject: explicitly disable replacing getopt
-
-Explicitly disable replacing getopt to avoid compilation error like below.
-
- xstrtol-error.c:84:26: error: invalid use of undefined type 'struct
rpl_option'
-
-Upstream-Status: Inappropriate [workaround]
-Signed-off-by: Chen Qi
- m4/getopt.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/m4/getopt.m4 b/m4/getopt.m4
-index 3ebc7b7..8934426 100644
a/m4/getopt.m4
-+++ b/m4/getopt.m4
-@@ -22,8 +22,8 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX],
- fi
- ])
- if test $REPLACE_GETOPT = 1; then
--dnl Arrange for getopt.h to be created.
--gl_GETOPT_SUBSTITUTE_HEADER
-+dnl Explicitly disable replacing getopt
-+:
- fi
- ])
-
---
-2.11.0
-
diff --git a/meta/recipes-extended/diffutils/diffutils-3.6/run-ptest
b/meta/recipes-extended/diffutils/diffutils/run-ptest
similarity index 100%
rename from meta/recipes-extended/diffutils/diffutils-3.6/run-ptest
rename to meta/recipes-extended/diffutils/diffutils/run-ptest
diff --git a/meta/recipes-extended/diffutils/diffutils_3.6.bb
b/meta/recipes-extended/diffutils/diffutils_3.7.bb
similarity index 77%
rename from meta/recipes-extended/diffutils/diffutils_3.6.bb
rename to meta/recipes-extended/diffutils/diffutils_3.7.bb
index 8ba897d..7daeee3 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.6.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.7.bb
@@ -4,13 +4,11 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
require diffutils.inc
SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
- file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://run-ptest \
"
-SRC_URI_append_libc-glibc = "
file://0001-explicitly-disable-replacing-getopt.patch"
-SRC_URI[md5sum] = "07cf286672ced26fba54cd0313bdc071"
-SRC_URI[sha256sum] =
"d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6"
+SRC_URI[md5sum] = "4824adc0e95dbbf11dfbdfaad6a1e461"
+SRC_URI[sha256sum] =
"b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26"
EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr
--without-libsigsegv-prefix"
--
1.9.1
--
[OE-core] [PATCH 5/5] sudo: upgrade to 1.8.27
License-Update: copyright years updated
Signed-off-by: Chen Qi
---
meta/recipes-extended/sudo/sudo.inc| 2 +-
.../sudo/{sudo_1.8.26.bb => sudo_1.8.27.bb}| 25 --
2 files changed, 24 insertions(+), 3 deletions(-)
rename meta/recipes-extended/sudo/{sudo_1.8.26.bb => sudo_1.8.27.bb} (66%)
diff --git a/meta/recipes-extended/sudo/sudo.inc
b/meta/recipes-extended/sudo/sudo.inc
index 7565503..90f2039 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws;
BUGTRACKER = "http://www.sudo.ws/bugs/;
SECTION = "admin"
LICENSE = "ISC & BSD & Zlib"
-LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=45f9838a00199411eb97075c1e6a3102 \
+LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 \
file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=4a162fc04b86b03f5632180fe6076cda
\
file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6
\
file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd
\
diff --git a/meta/recipes-extended/sudo/sudo_1.8.26.bb
b/meta/recipes-extended/sudo/sudo_1.8.27.bb
similarity index 66%
rename from meta/recipes-extended/sudo/sudo_1.8.26.bb
rename to meta/recipes-extended/sudo/sudo_1.8.27.bb
index 7823675..95b2c8d 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.26.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.27.bb
@@ -1,3 +1,24 @@
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- doc/LICENSE
+# +++ doc/LICENSE
+# @@ -1,6 +1,6 @@
+# Sudo is distributed under the following license:
+#
+# - Copyright (c) 1994-1996, 1998-2018
+# + Copyright (c) 1994-1996, 1998-2019
+# Todd C. Miller
+#
+# Permission to use, copy, modify, and distribute this software for any
+#
+#
+
require sudo.inc
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
@@ -7,8 +28,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
PAM_SRC_URI = "file://sudo.pam"
-SRC_URI[md5sum] = "833084947d98e7745b94845f4b7a8a9a"
-SRC_URI[sha256sum] =
"40da219a6f0341ccb22d04a98988e27f09b831d2561b14c6154067a49ef3fee2"
+SRC_URI[md5sum] = "b5c184b13b6b5de32af630af2fd013fd"
+SRC_URI[sha256sum] =
"7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd33e2ec0"
DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam',
'libpam', '', d)}"
RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam',
'pam-plugin-limits pam-plugin-keyinit', '', d)}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] dbus-test: upgrade to 1.12.12
Signed-off-by: Chen Qi
---
meta/recipes-core/dbus/{dbus-test_1.12.10.bb => dbus-test_1.12.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/dbus/{dbus-test_1.12.10.bb => dbus-test_1.12.12.bb}
(95%)
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.10.bb
b/meta/recipes-core/dbus/dbus-test_1.12.12.bb
similarity index 95%
rename from meta/recipes-core/dbus/dbus-test_1.12.10.bb
rename to meta/recipes-core/dbus/dbus-test_1.12.12.bb
index 25b9395..f413192 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.10.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.12.bb
@@ -17,8 +17,8 @@ SRC_URI =
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
"
-SRC_URI[md5sum] = "c3e12b4206e2a7da39d7cc42567790ef"
-SRC_URI[sha256sum] =
"4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7"
+SRC_URI[md5sum] = "ea11069521b4e47f0086596a43c8"
+SRC_URI[sha256sum] =
"9546f226011a1e5d9d77245fe5549ef25af4694053189d624d0d6ac127ecf5f8"
S="${WORKDIR}/dbus-${PV}"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] PU: cups, dbus, dbus-test, diffutils, sudo
The following changes since commit 4972d5dbd94a5a1fe9848e20730245f0f715501f:
glib-2.0: Improve shared-mime-info dependency handling (2019-02-18 10:33:13
+)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/PU-20190219
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/PU-20190219
Chen Qi (5):
cups: upgrade to 2.2.10
dbus: upgrade to 1.12.12
dbus-test: upgrade to 1.12.12
diffutils: upgrade to 3.7
sudo: upgrade to 1.8.27
.../{dbus-test_1.12.10.bb => dbus-test_1.12.12.bb} | 4 +--
.../dbus/{dbus_1.12.10.bb => dbus_1.12.12.bb} | 4 +--
.../cups/{cups_2.2.9.bb => cups_2.2.10.bb} | 4 +--
...need_charset_alias-when-building-for-musl.patch | 33 --
.../0001-explicitly-disable-replacing-getopt.patch | 30
.../{diffutils-3.6 => diffutils}/run-ptest | 0
.../{diffutils_3.6.bb => diffutils_3.7.bb} | 6 ++--
meta/recipes-extended/sudo/sudo.inc| 2 +-
.../sudo/{sudo_1.8.26.bb => sudo_1.8.27.bb}| 25 ++--
9 files changed, 32 insertions(+), 76 deletions(-)
rename meta/recipes-core/dbus/{dbus-test_1.12.10.bb => dbus-test_1.12.12.bb}
(95%)
rename meta/recipes-core/dbus/{dbus_1.12.10.bb => dbus_1.12.12.bb} (97%)
rename meta/recipes-extended/cups/{cups_2.2.9.bb => cups_2.2.10.bb} (40%)
delete mode 100644
meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
delete mode 100644
meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
rename meta/recipes-extended/diffutils/{diffutils-3.6 => diffutils}/run-ptest
(100%)
rename meta/recipes-extended/diffutils/{diffutils_3.6.bb => diffutils_3.7.bb}
(77%)
rename meta/recipes-extended/sudo/{sudo_1.8.26.bb => sudo_1.8.27.bb} (66%)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3: fix INCLDIRSTOMAKE in _sysconfigdata.py
From: Changqing Li
recipe glade do_configure failed after python upgrade
to 3.7.2, it will do runtime check of python headers
with native python3 under recipe-sysroot-native, it will check under
path INCLDIRSTOMAKE, but this value is '/usr/include /usr/include
/usr/include/python3.7m /usr/include/python3.7m', which will cause
below error:
ERROR: This autoconf log indicates errors, it looked at host include and/or
library paths while determining system capabilities.
fix it by replace /usr/include to STAGING_INCDIR
Signed-off-by: Changqing Li
---
meta/recipes-devtools/python/python3_3.7.2.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/python/python3_3.7.2.bb
b/meta/recipes-devtools/python/python3_3.7.2.bb
index 8f9d7dc..4a1cbae 100644
--- a/meta/recipes-devtools/python/python3_3.7.2.bb
+++ b/meta/recipes-devtools/python/python3_3.7.2.bb
@@ -124,6 +124,8 @@ do_install_append() {
-e "s,^ 'LIBDIR'.*, 'LIBDIR': '${STAGING_LIBDIR}'\,,g" \
-e "s,^ 'INCLUDEDIR'.*, 'INCLUDEDIR': '${STAGING_INCDIR}'\,,g"
\
-e "s,^ 'CONFINCLUDEDIR'.*, 'CONFINCLUDEDIR':
'${STAGING_INCDIR}'\,,g" \
+-e "/^ 'INCLDIRSTOMAKE'/{N;
s,/usr/include,${STAGING_INCDIR},g}" \
+-e "/^ 'INCLUDEPY'/s,/usr/include,${STAGING_INCDIR},g" \
${D}${libdir}/python-sysconfigdata/_sysconfigdata.py
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
RP, Noted, thanks. Cheers, Ee Peng -Original Message- From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Sent: Monday, February 18, 2019 6:12 PM To: Yeoh, Ee Peng ; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt On Mon, 2019-02-18 at 09:20 +, Yeoh, Ee Peng wrote: > Thank you for sharing on the selftest comparison consideration! > > I agreed with you that in the high level, selftest should be > independent of which HOST_DISTRO, it shall compared 2 selftest even > when the host distro are different. > > But in the case that the build have multiple set of selftest each with > slightly different environments (eg. host distro), in that case, will > it better to compare selftest more closely if possible with same host > distro used? In an ideal world, yes. In reality trying to do that and making it conditional will complicate the code for little "real" end difference though? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] libinput: upgrade 1.12.3 -> 1.12.6
Signed-off-by: Richard Purdie
---
.../wayland/{libinput_1.12.3.bb => libinput_1.12.6.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/wayland/{libinput_1.12.3.bb =>
libinput_1.12.6.bb} (86%)
diff --git a/meta/recipes-graphics/wayland/libinput_1.12.3.bb
b/meta/recipes-graphics/wayland/libinput_1.12.6.bb
similarity index 86%
rename from meta/recipes-graphics/wayland/libinput_1.12.3.bb
rename to meta/recipes-graphics/wayland/libinput_1.12.6.bb
index 3d1ab59309e..46366b75113 100644
--- a/meta/recipes-graphics/wayland/libinput_1.12.3.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.12.6.bb
@@ -9,8 +9,8 @@ DEPENDS = "libevdev udev mtdev"
SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
"
-SRC_URI[md5sum] = "083d6bf311d5e1e3a62440dc634bb8f0"
-SRC_URI[sha256sum] =
"f266ff861a2e7a97e1402c4345e3547b900efde68adbd40e56403e2617fee255"
+SRC_URI[md5sum] = "8cf10cc0fdfab865b105dd28283fa0fd"
+SRC_URI[sha256sum] =
"12b4023a3fc683d3d8127db573bdf925a2ef366615042f69c87e57c32a50f45d"
UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)"
inherit meson pkgconfig lib_package
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] mc: upgrade 4.8.21 -> 4.8.22
Signed-off-by: Richard Purdie
---
meta/recipes-extended/mc/{mc_4.8.21.bb => mc_4.8.22.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/mc/{mc_4.8.21.bb => mc_4.8.22.bb} (93%)
diff --git a/meta/recipes-extended/mc/mc_4.8.21.bb
b/meta/recipes-extended/mc/mc_4.8.22.bb
similarity index 93%
rename from meta/recipes-extended/mc/mc_4.8.21.bb
rename to meta/recipes-extended/mc/mc_4.8.22.bb
index c6a4500b8e8..f64effbce48 100644
--- a/meta/recipes-extended/mc/mc_4.8.21.bb
+++ b/meta/recipes-extended/mc/mc_4.8.22.bb
@@ -9,8 +9,8 @@ RDEPENDS_${PN} = "ncurses-terminfo"
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
file://0001-mc-replace-perl-w-with-use-warnings.patch \
"
-SRC_URI[md5sum] = "63d2b90e2198ee79d08eb4a8989220e2"
-SRC_URI[sha256sum] =
"251d9f0ef9309ef3eea0fdc4c12b8b61149e5056bef1b2de2ccc7f015d973444"
+SRC_URI[md5sum] = "29983a215c96030f06d5b112088ec5dc"
+SRC_URI[sha256sum] =
"8d9f1c75369967adfd317a05fef9861444ed049b033e4debaeaafc6df218b431"
inherit autotools gettext pkgconfig
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] gtk+3: upgrade 3.24.1 -> 3.24.5
Signed-off-by: Richard Purdie
---
meta/recipes-gnome/gtk+/{gtk+3_3.24.1.bb => gtk+3_3.24.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.24.1.bb => gtk+3_3.24.5.bb} (83%)
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb
b/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb
similarity index 83%
rename from meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb
index 6de3e73f2f0..799cbd4707e 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.24.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.5.bb
@@ -7,8 +7,8 @@ SRC_URI =
"http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
file://0003-Add-disable-opengl-configure-option.patch \
"
-SRC_URI[md5sum] = "9dfe16f486573815f242fa400763feb7"
-SRC_URI[sha256sum] =
"68387be307b99aadcdc653561d7a2a7f0113b93561fb18ded7075ec9ced5b02f"
+SRC_URI[md5sum] = "32862355c08f6af3e7848c695cd4081b"
+SRC_URI[sha256sum] =
"0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f"
S = "${WORKDIR}/gtk+-${PV}"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] clutter-gst-3.0: upgrade 3.0.26 -> 3.0.27
Signed-off-by: Richard Purdie
---
.../{clutter-gst-3.0_3.0.26.bb => clutter-gst-3.0_3.0.27.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/clutter/{clutter-gst-3.0_3.0.26.bb =>
clutter-gst-3.0_3.0.27.bb} (58%)
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.26.bb
b/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb
similarity index 58%
rename from meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.26.bb
rename to meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb
index 8a0dda54274..35382453c20 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.26.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb
@@ -3,5 +3,5 @@ require clutter-gst-3.0.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
-SRC_URI[archive.md5sum] = "7809ca6ce9d1a3490597fd4a7375c389"
-SRC_URI[archive.sha256sum] =
"d8618a6d9accec0f2a8574c5e1220051f8505fb82b20336c26bdbd482aa6cb3a"
+SRC_URI[archive.md5sum] = "2bf9d7ca146c9d71e86c45cd00e9a28e"
+SRC_URI[archive.sha256sum] =
"fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] adwaita-icon-theme: upgrade 3.28.0 -> 3.30.1
Signed-off-by: Richard Purdie
---
.../0001-Don-t-use-AC_CANONICAL_HOST.patch | 6 +++---
...ta-icon-theme_3.28.0.bb => adwaita-icon-theme_3.30.1.bb} | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.28.0.bb =>
adwaita-icon-theme_3.30.1.bb} (93%)
diff --git
a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
index b5992eba761..43abdcd85ac 100644
---
a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
+++
b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
@@ -1,4 +1,4 @@
-From 9661951838773251d0a914e897e8a0d95ce027f6 Mon Sep 17 00:00:00 2001
+From 499222d95a3d06bc425672d50e8c47868667250b Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen
Date: Tue, 30 May 2017 14:55:49 +0300
Subject: [PATCH] Don't use AC_CANONICAL_HOST
@@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index fb787dc..5caef0c 100644
+index 38e64bd..6ed480e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,6 @@ AC_PREREQ(2.53)
- AC_INIT([adwaita-icon-theme], [3.28.0],
+ AC_INIT([adwaita-icon-theme], [3.30.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
-AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb
b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb
similarity index 93%
rename from meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb
rename to meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb
index 7102a895955..3e9420ed9a0 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.1.bb
@@ -15,8 +15,8 @@ SRC_URI =
"${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://0001-Run-installation-commands-as-shell-jobs.patch \
"
-SRC_URI[md5sum] = "b25b2d82cbebf2cc9cd469457b604f2c"
-SRC_URI[sha256sum] =
"7aae8c1dffd6772fd1a21a3d365a0ea28b7c3988bdbbeafbf8742cda68242150"
+SRC_URI[md5sum] = "db3fd812821d72fdd9a3c7d622a95b35"
+SRC_URI[sha256sum] =
"6d752a2b1bc668483956d4485c39cad1642d9358e133ff689526e43674a4e1ce"
do_install_append() {
# Build uses gtk-encode-symbolic-svg to create png versions:
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] lz4: upgrade 1.8.2 -> 1.8.3
From: Denys Dmytriyenko
Signed-off-by: Denys Dmytriyenko
---
meta/recipes-support/lz4/{lz4_1.8.2.bb => lz4_1.8.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/lz4/{lz4_1.8.2.bb => lz4_1.8.3.bb} (94%)
diff --git a/meta/recipes-support/lz4/lz4_1.8.2.bb
b/meta/recipes-support/lz4/lz4_1.8.3.bb
similarity index 94%
rename from meta/recipes-support/lz4/lz4_1.8.2.bb
rename to meta/recipes-support/lz4/lz4_1.8.3.bb
index 5ad17e1..125836f 100644
--- a/meta/recipes-support/lz4/lz4_1.8.2.bb
+++ b/meta/recipes-support/lz4/lz4_1.8.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \
PE = "1"
-SRCREV = "b3692db46d2b23a7c0af2d5e69988c94f126e10a"
+SRCREV = "641b453d9db536ee020851bfcb1dc39f61006f0a"
SRC_URI = "git://github.com/lz4/lz4.git \
file://run-ptest \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] hdparm: upgrade 9.56 -> 9.58
From: Denys Dmytriyenko
Signed-off-by: Denys Dmytriyenko
---
meta/recipes-extended/hdparm/{hdparm_9.56.bb => hdparm_9.58.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/hdparm/{hdparm_9.56.bb => hdparm_9.58.bb} (90%)
diff --git a/meta/recipes-extended/hdparm/hdparm_9.56.bb
b/meta/recipes-extended/hdparm/hdparm_9.58.bb
similarity index 90%
rename from meta/recipes-extended/hdparm/hdparm_9.56.bb
rename to meta/recipes-extended/hdparm/hdparm_9.58.bb
index 17932ad..e47deda 100644
--- a/meta/recipes-extended/hdparm/hdparm_9.56.bb
+++ b/meta/recipes-extended/hdparm/hdparm_9.58.bb
@@ -25,8 +25,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \
file://wiper.sh-fix-stat-path.patch \
"
-SRC_URI[md5sum] = "7900608e32834f65d2654fdb696e71a0"
-SRC_URI[sha256sum] =
"6ff9ed695f1017396eec4101f990f114b7b0e0a04c5aa6369c0394053d16e4da"
+SRC_URI[md5sum] = "4652c49cf096a64683c05f54b4fa4679"
+SRC_URI[sha256sum] =
"9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f"
EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"'
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] lzop: upgrade 1.03 -> 1.04
From: Denys Dmytriyenko
License checksum changed due to updated copyright year and cleanup.
3 patches for miniacc.h were incorporated upstream.
Build-tested on qemu targets, including x32.
Signed-off-by: Denys Dmytriyenko
---
...inlines-as-the-external-inline-definition.patch | 100 -
.../recipes-support/lzop/lzop/lzop-1.03-gcc6.patch | 37
.../lzop/lzop/x32_abi_miniacc_h.patch | 36
.../lzop/{lzop_1.03.bb => lzop_1.04.bb}| 11 +--
4 files changed, 4 insertions(+), 180 deletions(-)
delete mode 100644
meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
delete mode 100644 meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch
delete mode 100644 meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
rename meta/recipes-support/lzop/{lzop_1.03.bb => lzop_1.04.bb} (66%)
diff --git
a/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
b/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
deleted file mode 100644
index 867b88b..000
---
a/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Sun, 16 Aug 2015 10:35:47 -0700
-Subject: [PATCH] use static inlines as the external inline definition has
- changed with gcc5
-
-Signed-off-by: Khem Raj
-Upstream-Status: Pending
-
- src/miniacc.h | 24
- 1 file changed, 8 insertions(+), 16 deletions(-)
-
-diff --git a/src/miniacc.h b/src/miniacc.h
-index 09e6f0c..cae98d1 100644
a/src/miniacc.h
-+++ b/src/miniacc.h
-@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler
*acc_sighandler_t)(acc_signo_t);
- #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
- #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
- #if !defined(ACC_UA_GET_LE16)
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile
const void* pp);
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile
const void* pp) {
-+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile
const void* pp) {
- __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const
acc_uint16e_t*) pp;
- unsigned long v;
- __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long
__ACC_UA_GET_LE16(__acc_ua_volatile const
- #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p)
- #endif
- #if !defined(ACC_UA_SET_LE16)
--extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp,
unsigned long v);
--extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp,
unsigned long v) {
-+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp,
unsigned long v) {
- __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*)
pp;
- __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
- }
-@@ -2916,8 +2914,7 @@ extern __acc_forceinline void
__ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
- #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
- #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
- #if !defined(ACC_UA_GET_LE32)
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile
const void* pp);
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile
const void* pp) {
-+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile
const void* pp) {
- __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const
acc_uint32e_t*) pp;
- unsigned long v;
- __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long
__ACC_UA_GET_LE32(__acc_ua_volatile const
- #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p)
- #endif
- #if !defined(ACC_UA_SET_LE32)
--extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp,
unsigned long v);
--extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp,
unsigned long v) {
-+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp,
unsigned long v) {
- __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*)
pp;
- __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
- }
-@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler
*acc_sighandler_t)(acc_signo_t);
- #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
- #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
- #if !defined(ACC_UA_GET_LE16)
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile
const void* pp);
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile
[OE-core] [PATCH 5/6] gzip: upgrade 1.9 -> 1.10
From: Denys Dmytriyenko
gnulib.patch for glibc-2.28+ has been upstreamed.
Signed-off-by: Denys Dmytriyenko
---
.../{gzip-1.9 => gzip-1.10}/wrong-path-fix.patch | 0
meta/recipes-extended/gzip/gzip-1.9/gnulib.patch | 189 -
.../gzip/{gzip_1.9.bb => gzip_1.10.bb} | 6 +-
3 files changed, 2 insertions(+), 193 deletions(-)
rename meta/recipes-extended/gzip/{gzip-1.9 => gzip-1.10}/wrong-path-fix.patch
(100%)
delete mode 100644 meta/recipes-extended/gzip/gzip-1.9/gnulib.patch
rename meta/recipes-extended/gzip/{gzip_1.9.bb => gzip_1.10.bb} (88%)
diff --git a/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
b/meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch
similarity index 100%
rename from meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
rename to meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch
diff --git a/meta/recipes-extended/gzip/gzip-1.9/gnulib.patch
b/meta/recipes-extended/gzip/gzip-1.9/gnulib.patch
deleted file mode 100644
index c3cdd72..000
--- a/meta/recipes-extended/gzip/gzip-1.9/gnulib.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001
-From: Paul Eggert
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Daniel P. Berrangé in:
-https://lists.gnu.org/r/bug-gnulib/2018-03/msg0.html
-* lib/fbufmode.c (fbufmode):
-* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-(disable_seek_optimization, rpl_fflush):
-* lib/fpending.c (__fpending):
-* lib/fpurge.c (fpurge):
-* lib/freadable.c (freadable):
-* lib/freadahead.c (freadahead):
-* lib/freading.c (freading):
-* lib/freadptr.c (freadptr):
-* lib/freadseek.c (freadptrinc):
-* lib/fseeko.c (fseeko):
-* lib/fseterr.c (fseterr):
-* lib/fwritable.c (fwritable):
-* lib/fwriting.c (fwriting):
-Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-Define if not already defined.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj
-
- ChangeLog| 23 +++
- lib/fbufmode.c | 2 +-
- lib/fflush.c | 6 +++---
- lib/fpending.c | 2 +-
- lib/fpurge.c | 2 +-
- lib/freadable.c | 2 +-
- lib/freadahead.c | 2 +-
- lib/freading.c | 2 +-
- lib/freadptr.c | 2 +-
- lib/freadseek.c | 2 +-
- lib/fseeko.c | 4 ++--
- lib/fseterr.c| 2 +-
- lib/fwritable.c | 2 +-
- lib/fwriting.c | 2 +-
- lib/stdio-impl.h | 6 ++
- 15 files changed, 45 insertions(+), 16 deletions(-)
-
-Index: gzip-1.9/ChangeLog
-===
gzip-1.9.orig/ChangeLog
-+++ gzip-1.9/ChangeLog
-@@ -1,3 +1,26 @@
-+2018-03-05 Paul Eggert
-+
-+ fflush: adjust to glibc 2.28 libio.h removal
-+ Problem reported by Daniel P. Berrangé in:
-+ https://lists.gnu.org/r/bug-gnulib/2018-03/msg0.html
-+ * lib/fbufmode.c (fbufmode):
-+ * lib/fflush.c (clear_ungetc_buffer_preserving_position)
-+ (disable_seek_optimization, rpl_fflush):
-+ * lib/fpending.c (__fpending):
-+ * lib/fpurge.c (fpurge):
-+ * lib/freadable.c (freadable):
-+ * lib/freadahead.c (freadahead):
-+ * lib/freading.c (freading):
-+ * lib/freadptr.c (freadptr):
-+ * lib/freadseek.c (freadptrinc):
-+ * lib/fseeko.c (fseeko):
-+ * lib/fseterr.c (fseterr):
-+ * lib/fwritable.c (fwritable):
-+ * lib/fwriting.c (fwriting):
-+ Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-+ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-+ Define if not already defined.
-+
- 2018-01-07 Jim Meyering
-
- version 1.9
-Index: gzip-1.9/lib/fflush.c
-===
gzip-1.9.orig/lib/fflush.c
-+++ gzip-1.9/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
-
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
-
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
- static void
-@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
-
- #endif
-
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */)
-
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) &&
defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
- if (stream == NULL || ! freading (stream))
- return fflush (stream);
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN ||
[OE-core] [PATCH 6/6] grep: upgrade 3.1 -> 3.3
From: Denys Dmytriyenko
License checksum changed due to cleanup, all URLs converted to https.
need_charset_alias is no longer being used, drop the patch.
Signed-off-by: Denys Dmytriyenko
---
...need_charset_alias-when-building-for-musl.patch | 33 --
.../grep/{grep_3.1.bb => grep_3.3.bb} | 10 +++
2 files changed, 4 insertions(+), 39 deletions(-)
delete mode 100644
meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename meta/recipes-extended/grep/{grep_3.1.bb => grep_3.3.bb} (74%)
diff --git
a/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
b/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index ba1a4ba..000
---
a/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/gnulib.mk b/lib/gnulib.mk
-index e1d74db..c0e92dd 100644
a/lib/gnulib.mk
-+++ b/lib/gnulib.mk
-@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local
- case '$(host_os)' in \
- darwin[56]*) \
- need_charset_alias=true ;; \
-- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- need_charset_alias=false ;; \
- *) \
- need_charset_alias=true ;; \
---
-2.1.4
-
diff --git a/meta/recipes-extended/grep/grep_3.1.bb
b/meta/recipes-extended/grep/grep_3.3.bb
similarity index 74%
rename from meta/recipes-extended/grep/grep_3.1.bb
rename to meta/recipes-extended/grep/grep_3.3.bb
index 71810dc..704a3ec 100644
--- a/meta/recipes-extended/grep/grep_3.1.bb
+++ b/meta/recipes-extended/grep/grep_3.3.bb
@@ -3,14 +3,12 @@ HOMEPAGE = "http://savannah.gnu.org/projects/grep/;
BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep;
SECTION = "console/utils"
LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
-SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \
- file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
- "
+SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz"
-SRC_URI[md5sum] = "feca7b3e7c7f4aab2b42ecbfc513b070"
-SRC_URI[sha256sum] =
"db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e"
+SRC_URI[md5sum] = "05d0718a1b7cc706a4bdf8115363f1ed"
+SRC_URI[sha256sum] =
"b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514"
inherit autotools gettext texinfo pkgconfig
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] Recipe updates
From: Denys Dmytriyenko
Update lz4, lzip, lzop, gzip, grep and hdparm to the latest.
Build-tested against qemu targets, plus x32 and musl.
The following changes since commit 93c6e5023d74bf6fae8e3a70afd9dca6b1ab555a:
glib-2.0: Improve shared-mime-info dependency handling (2019-02-18 10:33:08
+)
are available in the git repository at:
git://push.openembedded.org/openembedded-core-contrib denix/master
Denys Dmytriyenko (6):
lz4: upgrade 1.8.2 -> 1.8.3
lzip: upgrade 1.20 -> 1.21
hdparm: upgrade 9.56 -> 9.58
lzop: upgrade 1.03 -> 1.04
gzip: upgrade 1.9 -> 1.10
grep: upgrade 3.1 -> 3.3
...need_charset_alias-when-building-for-musl.patch | 33
.../grep/{grep_3.1.bb => grep_3.3.bb} | 10 +-
.../{gzip-1.9 => gzip-1.10}/wrong-path-fix.patch | 0
meta/recipes-extended/gzip/gzip-1.9/gnulib.patch | 189 -
.../gzip/{gzip_1.9.bb => gzip_1.10.bb} | 6 +-
.../hdparm/{hdparm_9.56.bb => hdparm_9.58.bb} | 4 +-
.../lzip/{lzip_1.20.bb => lzip_1.21.bb}| 4 +-
.../lz4/{lz4_1.8.2.bb => lz4_1.8.3.bb} | 2 +-
...inlines-as-the-external-inline-definition.patch | 100 ---
.../recipes-support/lzop/lzop/lzop-1.03-gcc6.patch | 37
.../lzop/lzop/x32_abi_miniacc_h.patch | 36
.../lzop/{lzop_1.03.bb => lzop_1.04.bb}| 11 +-
12 files changed, 15 insertions(+), 417 deletions(-)
delete mode 100644
meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename meta/recipes-extended/grep/{grep_3.1.bb => grep_3.3.bb} (74%)
rename meta/recipes-extended/gzip/{gzip-1.9 => gzip-1.10}/wrong-path-fix.patch
(100%)
delete mode 100644 meta/recipes-extended/gzip/gzip-1.9/gnulib.patch
rename meta/recipes-extended/gzip/{gzip_1.9.bb => gzip_1.10.bb} (88%)
rename meta/recipes-extended/hdparm/{hdparm_9.56.bb => hdparm_9.58.bb} (90%)
rename meta/recipes-extended/lzip/{lzip_1.20.bb => lzip_1.21.bb} (88%)
rename meta/recipes-support/lz4/{lz4_1.8.2.bb => lz4_1.8.3.bb} (94%)
delete mode 100644
meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
delete mode 100644 meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch
delete mode 100644 meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
rename meta/recipes-support/lzop/{lzop_1.03.bb => lzop_1.04.bb} (66%)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] lzip: upgrade 1.20 -> 1.21
From: Denys Dmytriyenko
Signed-off-by: Denys Dmytriyenko
---
meta/recipes-extended/lzip/{lzip_1.20.bb => lzip_1.21.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/lzip/{lzip_1.20.bb => lzip_1.21.bb} (88%)
diff --git a/meta/recipes-extended/lzip/lzip_1.20.bb
b/meta/recipes-extended/lzip/lzip_1.21.bb
similarity index 88%
rename from meta/recipes-extended/lzip/lzip_1.20.bb
rename to meta/recipes-extended/lzip/lzip_1.21.bb
index ed648e8..bb3d2a6 100644
--- a/meta/recipes-extended/lzip/lzip_1.20.bb
+++ b/meta/recipes-extended/lzip/lzip_1.21.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
file://decoder.cc;beginline=3;endline=16;md5=db09fe3f9573f94d0076f7f07959e6e1"
SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz"
-SRC_URI[md5sum] = "21c1517da2ace9689fd953918660b3c3"
-SRC_URI[sha256sum] =
"c93b81a5a7788ef5812423d311345ba5d3bd4f5ebf1f693911e3a13553c1290c"
+SRC_URI[md5sum] = "c0061730d017ea593a09308edc547128"
+SRC_URI[sha256sum] =
"e48b5039d3164d670791f9c5dbaa832bf2df080cb1fbb4f33aa7b3300b670d8b"
B = "${WORKDIR}/build"
do_configure[cleandirs] = "${B}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
Also, mesa 18.3.4 is out :) so you could add that in as well in v2. Alex On Mon, 18 Feb 2019 at 19:20, Alexander Kanavin wrote: > > On Mon, 18 Feb 2019 at 19:12, Richard Purdie > wrote: > > > That does, I think the patch still needs DRIDRIVERS = "swrast" though? > > The details here should be in the commit message too. > > Ah, I forgot one more detail which explains the above: there are two > swrast drivers, one dri-based, another gallium-based. Autotools lets > you build both (not sure which one is installed then), meson forces > you to choose. Thus DRIDRIVERS = "swrast" is only set for _native, as > for _target we get the gallium driver instead. > > Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
On Mon, 18 Feb 2019 at 19:12, Richard Purdie wrote: > That does, I think the patch still needs DRIDRIVERS = "swrast" though? > The details here should be in the commit message too. Ah, I forgot one more detail which explains the above: there are two swrast drivers, one dri-based, another gallium-based. Autotools lets you build both (not sure which one is installed then), meson forces you to choose. Thus DRIDRIVERS = "swrast" is only set for _native, as for _target we get the gallium driver instead. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [AUH] Upgrade status: 2019-02-18
Recipe upgrade statistics: * Failed(other errors): 2 go-runtime, 1.11.5, Khem Raj go, 1.11.5, Khem Raj * Failed (devtool error): 48 sysvinit, 2.93, Ross Burton ifupdown, 0.8.35, Anuj Mittal vte, 0.54.3, Anuj Mittal sed, 4.7, Chen Qi squashfs-tools, 4.3-new-commits-available, Robert Yang acpica, 20190215, Fathi Boudra gzip, 1.10, Denys Dmytriyenko debianutils, 4.8.6.1, Yi Zhao fontconfig, 2.13.1, Ross Burton db, 5.3.28+dfsg1, Mark Hatle mtools, 4.0.23, Anuj Mittal sqlite3, 3.27.1, Anuj Mittal iw, 5.0.1, Changhyeok Bae python3-numpy, 1.16.1, Derek Straka ruby, 2.6.1, Ross Burton flex, 2.6.4, Chen Qi puzzles, 0.0-new-commits-available, Anuj Mittal iproute2, 4.20.0, Changhyeok Bae libmodulemd, 2.1.0, Alexander Kanavin rng-tools, 6.7, Anuj Mittal vulkan, 1.1.97.0, Ross Burton libxml2, 2.9.9, Hongxu Jia groff, 1.22.4, Hongxu Jia acl, 2.2.53, Chen Qi apt, 1.4.9, Aníbal Limón bash, 5.0, Hongxu Jia systemd-boot, 241, Chen Qi texinfo, 6.6, Anuj Mittal libpipeline, 1.5.1, Alexander Kanavin ltp, 20190115, Yi Zhao build-compare, 2015.02.10-new-commits-available, Paul Eggleton util-linux, 2.33.1, Chen Qi python-scons, 3.0.4, Derek Straka grep, 3.3, Denys Dmytriyenko bison, 3.3.2, Chen Qi mmc-utils, 0.1-new-commits-available, Anuj Mittal diffutils, 3.7, Chen Qi mesa, 18.3.3, Otavio Salvador cairo, 1.16.2, Anuj Mittal vulkan-demos, git-new-commits-available, Ross Burton libical, 3.0.4, Ross Burton attr, 2.4.48, Chen Qi busybox, 1.30.1, Andrej Valek libidn2, 2.1.1a, Ross Burton python-numpy, 1.16.1, Derek Straka gdk-pixbuf, 2.38.0, Ross Burton lzop, 1.04, Denys Dmytriyenko lsbinitscripts, 10.01, Ross Burton * Succeeded: 56 less, 549, Yi Zhao libinput, 1.12.6, Ross Burton dbus, 1.12.12, Chen Qi blktool, 4-7.1, Yi Zhao ca-certificates, 20190110, Alexander Kanavin u-boot-tools, 2019.01, Marek Vasut libwebp, 1.0.2, Alexander Kanavin kmod, 26, Chen Qi piglit, 1.0-new-commits-available, Ross Burton readline, 8.0, Hongxu Jia lz4, 1.8.3, Denys Dmytriyenko kmscube, git-new-commits-available, Carlos Rafael Giani dnf, 4.1.0, Alexander Kanavin xf86-input-libinput, 0.28.2, Armin Kuster libxkbcommon, 0.8.3, Armin Kuster python3-setuptools, 40.8.0, Derek Straka btrfs-tools, 4.20.1, Alexander Kanavin python3-six, 1.12.0, Derek Straka adwaita-icon-theme, 3.30.1, Ross Burton libdrm, 2.4.97, Otavio Salvador pkgconf, 1.6.0, Ross Burton curl, 7.64.0, Armin Kuster librepo, 1.9.4, Alexander Kanavin gcr, 3.28.1, Alexander Kanavin clutter-gst-3.0, 3.0.27, Ross Burton webkitgtk, 2.22.6, Alexander Kanavin gst-examples, 0.0.1-new-commits-available, Anuj Mittal systemd-conf, 241, Chen Qi lighttpd, 1.4.53, Alexander Kanavin python3-pip, 19.0.2, Derek Straka createrepo-c, 0.12.1, Alexander Kanavin cups, 2.2.10, Chen Qi xkeyboard-config, 2.26, Armin Kuster dbus-test, 1.12.12, Chen Qi python3-gitdb, 2.0.5, Derek Straka lzip, 1.21, Denys Dmytriyenko iso-codes, 4.2, Alexander Kanavin netbase, 5.6, Armin Kuster libcomps, 0.1.10, Alexander Kanavin libxau, 1.0.9, Armin Kuster libassuan, 2.5.3, Armin Kuster p11-kit, 0.23.15, Alexander Kanavin gtk+3, 3.24.5, Ross Burton vala, 0.42.5, Alexander Kanavin gnu-config, 20180713-new-commits-available, Robert Yang sudo, 1.8.27, Chen Qi sysstat, 12.1.3, Chen Qi gnupg, 2.2.13, Hongxu Jia meson, 0.49.2, Alexander Kanavin mc, 4.8.22, Ross Burton libdnf, 0.26.0, Alexander Kanavin epiphany, 3.30.3, Alexander Kanavin hdparm, 9.58, Denys Dmytriyenko llvm, 8.0-new-commits-available, Khem Raj python3-pbr, 5.1.2, Derek Straka sbc, 1.4, Tanu Kaskinen * Failed(do_compile): 20 u-boot-fw-utils, 2019.01, Marek Vasut libjpeg-turbo, 2.0.2, Anuj Mittal u-boot, 2019.01, Marek Vasut tar, 1.31, Chen Qi ofono, 1.28, Ross Burton autoconf-archive, 2019.01.06, Robert Yang python3-pygobject, 3.30.4, Derek Straka elfutils, 0.176, Hongxu Jia man-db, 2.8.5, Hongxu Jia libtirpc, 1.1.4, Anuj Mittal dpkg, 1.19.4, Aníbal Limón python-setuptools, 40.8.0, Derek Straka
Re: [OE-core] [PATCH 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
On Mon, 2019-02-18 at 15:58 +0100, Alexander Kanavin wrote: > On Mon, 18 Feb 2019 at 15:18, Richard Purdie > wrote: > > > I think you need to leave DRIDRIVERS = "swrast" here or the x86 > > appends > > wouldn't have swrast listed? > > > > Do we really want to limit the native version to swrast only? This > > seems a fairly major change of behaviour and not what the original > > code > > was intending? > > Currently the native version does not build any dri drivers at all. > This is intentional: mesa-native is used only by virgl, so I made the > most minimal possible configuration for mesa-native so that a) virgl > works; and b) build time is as short as possible. > > With the switchover to meson, dri support is enabled only if also at > least one dri driver is enabled. swrast seemed like the best choice. > > If/when we have more use cases for mesa-native than virgl, we can add > other bits to the configuration. > > Hope this makes sense. That does, I think the patch still needs DRIDRIVERS = "swrast" though? The details here should be in the commit message too. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] initscripts: Update volatiles documentation to include binds
Volatiles processing now handles bind mounts, so update the comment in the core file to indicate this. Signed-off-by: Joshua Watt --- meta/recipes-core/initscripts/initscripts-1.0/volatiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles index 201106645d1..cd8a4be05f2 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles +++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles @@ -8,7 +8,7 @@ # The # character introduces a comment lasting until end of line. # Blank lines are ignored. # -# : d|f|l : (d)irectory|(f)ile|(l)ink +# : d|f|l|b : (d)irectory|(f)ile|(l)ink|(b)ind # # A linking example: # l root root 0777 /var/test /tmp/testfile -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glib-2.0: convert from autotools to meson
PRINTF settings no longer seem necessary (tested with mingw).
Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and
0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch
to allow 'mingw32' as target machine in addition to 'windows'.
Drop configure-libtool.patch and uclibc_musl_translation.patch
(both autotools-specific).
Signed-off-by: Alexander Kanavin
---
...t-write-bindir-into-pkg-config-files.patch | 50 ++
...-gio-querymodules-as-libexec_PROGRAM.patch | 17 +++-
...-correctly-when-building-with-mingw3.patch | 81 +
...ble-more-tests-while-cross-compiling.patch | 91 ++-
.../glib-2.0/glib-2.0/configure-libtool.patch | 44 -
.../glib-2.0/glib-2.0/relocate-modules.patch | 2 +-
.../glib-2.0/uclibc_musl_translation.patch| 22 -
meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 4 +-
meta/recipes-core/glib-2.0/glib.inc | 35 ---
9 files changed, 258 insertions(+), 88 deletions(-)
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
delete mode 100644
meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
new file mode 100644
index 000..ede29c90bab
--- /dev/null
+++
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
@@ -0,0 +1,50 @@
+From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Fri, 15 Feb 2019 11:17:27 +0100
+Subject: [PATCH] Do not write $bindir into pkg-config files
+
+This would otherwise break when using the files to build other target
+components (we need to rely on PATH containing the paths to utilities,
+rather than use target paths).
+
+Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
+Signed-off-by: Alexander Kanavin
+---
+ gio/meson.build | 6 +++---
+ glib/meson.build | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gio/meson.build b/gio/meson.build
+index 85d8b14..657720a 100644
+--- a/gio/meson.build
b/gio/meson.build
+@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+'schemasdir=' + join_paths('${datadir}', schemas_subdir),
+'bindir=' + join_paths('${prefix}', get_option('bindir')),
+'giomoduledir=' + giomodulesdir,
+- 'glib_compile_schemas=' + join_paths('${bindir}',
'glib-compile-schemas'),
+- 'glib_compile_resources=' + join_paths('${bindir}',
'glib-compile-resources'),
+- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
++ 'glib_compile_schemas=glib-compile-schemas',
++ 'glib_compile_resources=glib-compile-resources',
++ 'gdbus_codegen=gdbus-codegen'],
+ version : glib_version,
+ install_dir : glib_pkgconfigreldir,
+ filebase : 'gio-2.0',
+diff --git a/glib/meson.build b/glib/meson.build
+index c05c694..434e8b1 100644
+--- a/glib/meson.build
b/glib/meson.build
+@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+ subdirs : ['glib-2.0'],
+ extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
+ variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
+- 'glib_genmarshal=' + join_paths('${bindir}',
'glib-genmarshal'),
+- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
+- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
++ 'glib_genmarshal=glib-genmarshal',
++ 'gobject_query=gobject-query',
++ 'glib_mkenums=glib-mkenums'],
+ version : glib_version,
+ install_dir : glib_pkgconfigreldir,
+ filebase : 'glib-2.0',
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index 97d0aff5d6c..f246254942e 100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
@@ -1,4 +1,4 @@
-From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001
+From 17fc9230fb932432d8fbf8c56fdc4845495e Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen
Date: Tue, 22 Mar 2016 15:14:58 +0200
Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -11,7 +11,8 @@ Upstream-Status: Inappropriate [OE specific]
---
Re: [OE-core] [PATCH 6/6] llvm: Upgrade to upcoming 8.0.0 release
Ja som tiez za. Marek On Mon, Feb 18, 2019 at 4:42 PM Khem Raj wrote: > On Mon, Feb 18, 2019 at 7:15 AM Alexander Kanavin > wrote: > > > > On Mon, 18 Feb 2019 at 16:04, Khem Raj wrote: > > > > There is now an official git repo for llvm, which also has version > tags: > > > > > > > > https://github.com/llvm/llvm-project > > > > > > yes there is and its intentional to use this mirror, since the > > > llvm-project is a super repo and > > > contains all llvm projects sources which is going to clone tonne > > > unnecessary code. > > > > More than half the commits are llvm's. (llvm-only mirror repo 175k, > > llvm super-repo 310k) > > So it adds to the clone, but not that much. > > I would have preferred to use mono repo and I have no problems using > it since thats what we > use in meta-clang as wella and it would make it simpler to reuse. but > it can be a pain for other people. > > 310k, I am not sure what is measured here. But here is the breakdown > of sizes for information > > 1.5G. > 676M./.git > 16M ./lld > 51M ./libcxx > 3.5M./libclc > 31M ./llgo > 32M ./polly > 395M./llvm > 43M ./compiler-rt > 988K./pstl > 116K./debuginfo-tests > 720K./libunwind > 13M ./clang-tools-extra > 7.3M./openmp > 6.3M./libcxxabi > 105M./lldb > 352K./parallel-libs > 155M./clang > > > > > > The point is something else: > > - llvm-mirror is not an official repo, and may become stale/unmaintained > > - llvm-mirror does not have version tags, so we can't trace commit ids > > to the releases, or track upstream development with automatic tools > > > > I think these two things outweigh the extra clone overhead. > > > > > > I'll make a patch to switch over to that. > > > > > > > > Also note that final 8.0 is not yet out, so the recipe shouldn't make > > > > it look like it is. > > > > > > This is intentional too. > > > Its in rc stages and there are no specific chages espcially in > > > versioning schemes > > > which will mark it rc etc. > > > > What I mean is there is no mention whatsoever that the recipe is > > currently building a pre-release. It's not in PV, it's not anywhere in > > the recipe. This can mislead people. > > Yes it can however, we know that when next release is cut out from > master then we will be > on a 8.x release. > > > > > Alex > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- as simple and primitive as possible - Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/6] llvm: Upgrade to upcoming 8.0.0 release
On Mon, Feb 18, 2019 at 7:15 AM Alexander Kanavin wrote: > > On Mon, 18 Feb 2019 at 16:04, Khem Raj wrote: > > > There is now an official git repo for llvm, which also has version tags: > > > > > > https://github.com/llvm/llvm-project > > > > yes there is and its intentional to use this mirror, since the > > llvm-project is a super repo and > > contains all llvm projects sources which is going to clone tonne > > unnecessary code. > > More than half the commits are llvm's. (llvm-only mirror repo 175k, > llvm super-repo 310k) > So it adds to the clone, but not that much. I would have preferred to use mono repo and I have no problems using it since thats what we use in meta-clang as wella and it would make it simpler to reuse. but it can be a pain for other people. 310k, I am not sure what is measured here. But here is the breakdown of sizes for information 1.5G. 676M./.git 16M ./lld 51M ./libcxx 3.5M./libclc 31M ./llgo 32M ./polly 395M./llvm 43M ./compiler-rt 988K./pstl 116K./debuginfo-tests 720K./libunwind 13M ./clang-tools-extra 7.3M./openmp 6.3M./libcxxabi 105M./lldb 352K./parallel-libs 155M./clang > > The point is something else: > - llvm-mirror is not an official repo, and may become stale/unmaintained > - llvm-mirror does not have version tags, so we can't trace commit ids > to the releases, or track upstream development with automatic tools > > I think these two things outweigh the extra clone overhead. > > > > I'll make a patch to switch over to that. > > > > > > Also note that final 8.0 is not yet out, so the recipe shouldn't make > > > it look like it is. > > > > This is intentional too. > > Its in rc stages and there are no specific chages espcially in > > versioning schemes > > which will mark it rc etc. > > What I mean is there is no mention whatsoever that the recipe is > currently building a pre-release. It's not in PV, it's not anywhere in > the recipe. This can mislead people. Yes it can however, we know that when next release is cut out from master then we will be on a 8.x release. > > Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/6] llvm: Upgrade to upcoming 8.0.0 release
On Mon, 18 Feb 2019 at 16:04, Khem Raj wrote: > > There is now an official git repo for llvm, which also has version tags: > > > > https://github.com/llvm/llvm-project > > yes there is and its intentional to use this mirror, since the > llvm-project is a super repo and > contains all llvm projects sources which is going to clone tonne > unnecessary code. More than half the commits are llvm's. (llvm-only mirror repo 175k, llvm super-repo 310k) So it adds to the clone, but not that much. The point is something else: - llvm-mirror is not an official repo, and may become stale/unmaintained - llvm-mirror does not have version tags, so we can't trace commit ids to the releases, or track upstream development with automatic tools I think these two things outweigh the extra clone overhead. > > I'll make a patch to switch over to that. > > > > Also note that final 8.0 is not yet out, so the recipe shouldn't make > > it look like it is. > > This is intentional too. > Its in rc stages and there are no specific chages espcially in > versioning schemes > which will mark it rc etc. What I mean is there is no mention whatsoever that the recipe is currently building a pre-release. It's not in PV, it's not anywhere in the recipe. This can mislead people. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gdk-pixbuf: convert from autotools to meson
Drop autotools-specific patches.
Rework jku's thumbnailer patch into meson configuration.
Add a patch to disable tests in native builds.
Signed-off-by: Alexander Kanavin
---
.../0001-Disable-tests-in-native-builds.patch | 30
...f-decisions-around-cross-compilation.patch | 38 +
...without-libtiff-not-having-an-effect.patch | 27
...nd-thumbnailer-cross-compile-failure.patch | 53 +++
...nd-thumbnailer-cross-compile-failure.patch | 131 ++
.../extending-libinstall-dependencies.patch | 42 --
.../gdk-pixbuf/hardcoded_libtool.patch| 33 -
.../gdk-pixbuf/gdk-pixbuf_2.36.11.bb | 40 --
8 files changed, 247 insertions(+), 147 deletions(-)
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0002-Work-around-thumbnailer-cross-compile-failure.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
new file mode 100644
index 000..c991635bb95
--- /dev/null
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
@@ -0,0 +1,30 @@
+From d44aad1858c9c0da74f389d3de4dabade28b56c3 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Mon, 18 Feb 2019 16:00:12 +0100
+Subject: [PATCH] Disable tests in native builds.
+
+They have found to be problematic at least on Centos 7:
+https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/296/steps/7/logs/step1b
+
+With autotools this was not a problem because it had a configuration
+switch for disabling test, which was used. Meson has no such facility :(
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 92c4049..0871c84 100644
+--- a/meson.build
b/meson.build
+@@ -397,7 +397,7 @@ endif
+ # i18n
+ subdir('po')
+
+-subdir('tests')
++#subdir('tests')
+ subdir('thumbnailer')
+
+ # Documentation
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
new file mode 100644
index 000..90d4830df50
--- /dev/null
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
@@ -0,0 +1,38 @@
+From 48cbdd56036728ffea431ad63cf5e2ad05cef69c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Thu, 14 Feb 2019 18:06:25 +0100
+Subject: [PATCH] Fix a couple of decisions around cross-compilation
+
+1. gobject-introspection can be build when cross compiling
+2. generating loaders.cache requires running a target binary which
+we do elsewhere (in postinsts)
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin
+---
+ gdk-pixbuf/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
+index 77c162b..fc3eb33 100644
+--- a/gdk-pixbuf/meson.build
b/gdk-pixbuf/meson.build
+@@ -230,6 +230,7 @@ foreach bin: gdkpixbuf_bin
+ set_variable(bin_name.underscorify(), bin)
+ endforeach
+
++if not meson.is_cross_build()
+ # The 'loaders.cache' used for testing, so we don't accidentally
+ # load the installed cache; we always build it by default
+ loaders_cache = custom_target('loaders.cache',
+@@ -241,8 +242,9 @@ loaders_cache = custom_target('loaders.cache',
+ ],
+ build_by_default: true)
+ loaders_dep = declare_dependency(sources: [ loaders_cache ])
++endif
+
+-build_gir = get_option('with_gir') and not meson.is_cross_build()
++build_gir = get_option('with_gir')
+ if build_gir
+ gir_args = [
+ '--quiet',
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
deleted file mode 100644
index 2a54d8ed763..000
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 460befc992adb32434b0408b453be39a6866ccf8 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Tue, 10 Oct 2017 14:33:18 +0300
-Subject: [PATCH] Fix --without-libtiff not having an
Re: [OE-core] [PATCH 6/6] llvm: Upgrade to upcoming 8.0.0 release
On Mon, Feb 18, 2019 at 1:47 AM Alexander Kanavin
wrote:
>
> There is now an official git repo for llvm, which also has version tags:
>
> https://github.com/llvm/llvm-project
yes there is and its intentional to use this mirror, since the
llvm-project is a super repo and
contains all llvm projects sources which is going to clone tonne
unnecessary code.
>
> I'll make a patch to switch over to that.
>
> Also note that final 8.0 is not yet out, so the recipe shouldn't make
> it look like it is.
This is intentional too.
Its in rc stages and there are no specific chages espcially in
versioning schemes
which will mark it rc etc.
>
> Alex
>
> On Thu, 31 Jan 2019 at 07:51, Khem Raj wrote:
> >
> > License-Update: Copyright year updates from 2017-2019
> >
> > Refresh patches to apply on new version
> >
> > Signed-off-by: Khem Raj
> > ---
> > ...ryInfo-Undefine-libc-functions-if-th.patch | 28
> > ...-llvm-allow-env-override-of-exe-path.patch | 66 +++
> > meta/recipes-devtools/llvm/llvm_git.bb| 25 ---
> > 3 files changed, 83 insertions(+), 36 deletions(-)
> >
> > diff --git
> > a/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
> >
> > b/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
> > index 209764c8ba..6dbbced7eb 100644
> > ---
> > a/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
> > +++
> > b/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
> > @@ -1,24 +1,22 @@
> > -From 96558c4f25d5132936014f6f2d6252cfdfdf478a Mon Sep 17 00:00:00 2001
> > +From 905cac8934fb17e20416a4df712a566e757471a3 Mon Sep 17 00:00:00 2001
> > From: Khem Raj
> > Date: Sat, 21 May 2016 00:33:20 +
> > -Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if
> > they
> > - are macros
> > +Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if
> > they are macros
> >
> > musl defines some functions as macros and not inline functions
> > if this is the case then make sure to undefine them
> >
> > +Upstream-Status: Pending
> > Signed-off-by: Khem Raj
> > ---
> > -Upstream-Status: Pending
> > -
> > include/llvm/Analysis/TargetLibraryInfo.def | 21 +
> > 1 file changed, 21 insertions(+)
> >
> > diff --git a/include/llvm/Analysis/TargetLibraryInfo.def
> > b/include/llvm/Analysis/TargetLibraryInfo.def
> > -index a461ed813b9..f9fd9faeee0 100644
> > +index 518a85ee1a0..6b4ead4efc6 100644
> > --- a/include/llvm/Analysis/TargetLibraryInfo.def
> > +++ b/include/llvm/Analysis/TargetLibraryInfo.def
> > -@@ -665,6 +665,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
> > +@@ -731,6 +731,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
> > TLI_DEFINE_ENUM_INTERNAL(fopen)
> > TLI_DEFINE_STRING_INTERNAL("fopen")
> > /// FILE *fopen64(const char *filename, const char *opentype)
> > @@ -27,8 +25,8 @@ index a461ed813b9..f9fd9faeee0 100644
> > +#endif
> > TLI_DEFINE_ENUM_INTERNAL(fopen64)
> > TLI_DEFINE_STRING_INTERNAL("fopen64")
> > - /// int fprintf(FILE *stream, const char *format, ...);
> > -@@ -700,6 +703,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
> > + /// int fork();
> > +@@ -778,6 +781,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
> > /// int fseeko(FILE *stream, off_t offset, int whence);
> > TLI_DEFINE_ENUM_INTERNAL(fseeko)
> > TLI_DEFINE_STRING_INTERNAL("fseeko")
> > @@ -38,7 +36,7 @@ index a461ed813b9..f9fd9faeee0 100644
> > /// int fseeko64(FILE *stream, off64_t offset, int whence)
> > TLI_DEFINE_ENUM_INTERNAL(fseeko64)
> > TLI_DEFINE_STRING_INTERNAL("fseeko64")
> > -@@ -710,6 +716,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
> > +@@ -788,6 +794,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
> > TLI_DEFINE_ENUM_INTERNAL(fstat)
> > TLI_DEFINE_STRING_INTERNAL("fstat")
> > /// int fstat64(int filedes, struct stat64 *buf)
> > @@ -48,7 +46,7 @@ index a461ed813b9..f9fd9faeee0 100644
> > TLI_DEFINE_ENUM_INTERNAL(fstat64)
> > TLI_DEFINE_STRING_INTERNAL("fstat64")
> > /// int fstatvfs(int fildes, struct statvfs *buf);
> > -@@ -725,6 +734,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
> > +@@ -803,6 +812,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
> > TLI_DEFINE_ENUM_INTERNAL(ftello)
> > TLI_DEFINE_STRING_INTERNAL("ftello")
> > /// off64_t ftello64(FILE *stream)
> > @@ -58,7 +56,7 @@ index a461ed813b9..f9fd9faeee0 100644
> > TLI_DEFINE_ENUM_INTERNAL(ftello64)
> > TLI_DEFINE_STRING_INTERNAL("ftello64")
> > /// int ftrylockfile(FILE *file);
> > -@@ -845,6 +857,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
> > +@@ -929,6 +941,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
> > TLI_DEFINE_ENUM_INTERNAL(lstat)
> > TLI_DEFINE_STRING_INTERNAL("lstat")
> > /// int lstat64(const char *path, struct stat64 *buf);
> > @@ -68,7 +66,7 @@ index a461ed813b9..f9fd9faeee0 100644
> > TLI_DEFINE_ENUM_INTERNAL(lstat64)
> > TLI_DEFINE_STRING_INTERNAL("lstat64")
> >
Re: [OE-core] [PATCH 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
On Mon, 18 Feb 2019 at 15:18, Richard Purdie wrote: > I think you need to leave DRIDRIVERS = "swrast" here or the x86 appends > wouldn't have swrast listed? > > Do we really want to limit the native version to swrast only? This > seems a fairly major change of behaviour and not what the original code > was intending? Currently the native version does not build any dri drivers at all. This is intentional: mesa-native is used only by virgl, so I made the most minimal possible configuration for mesa-native so that a) virgl works; and b) build time is as short as possible. With the switchover to meson, dri support is enabled only if also at least one dri driver is enabled. swrast seemed like the best choice. If/when we have more use cases for mesa-native than virgl, we can add other bits to the configuration. Hope this makes sense. Cheers, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
On Mon, 2019-02-18 at 10:29 -0300, Fabio Berton wrote:
> @@ -61,13 +61,12 @@ PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-
> glx,${X11_DEPS}"
> PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
> PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
>
> -DRIDRIVERS = "swrast"
> -DRIDRIVERS_append_x86_class-target = ",radeon,r200,nouveau,i965,i915"
> -DRIDRIVERS_append_x86-64_class-target = ",radeon,r200,nouveau,i965,i915"
> +DRIDRIVERS_class-native = "swrast"
> +DRIDRIVERS_class-nativesdk = "swrast"
> +DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915"
> +DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915"
I think you need to leave DRIDRIVERS = "swrast" here or the x86 appends
wouldn't have swrast listed?
Do we really want to limit the native version to swrast only? This
seems a fairly major change of behaviour and not what the original code
was intending?
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH v2] mesa: Convert recipe to use meson build system
- Remove all non related meson patches
Based on https://patchwork.openembedded.org/patch/158748/
Signed-off-by: Fabio Berton
---
...0001-Simplify-wayland-scanner-lookup.patch | 43 ---
...ing-include-stddef.h-in-egldevice.h.patch} | 4 +-
...k-for-all-linux-host_os-combinations.patch | 50 +
...-winsys-svga-drm-Include-sys-types.h.patch | 34
...M-version-when-using-LLVM-Git-releas.patch | 44 ---
...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 38 -
meta/recipes-graphics/mesa/mesa.inc | 54 +--
meta/recipes-graphics/mesa/mesa_18.3.3.bb | 7 +--
8 files changed, 79 insertions(+), 195 deletions(-)
delete mode 100644
meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
rename
meta/recipes-graphics/mesa/files/{0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch
=> 0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch} (91%)
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
delete mode 100644
meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
diff --git
a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
deleted file mode 100644
index e765356fe1..00
---
a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7338667148cb7fcefee76b27359bc1e11656c132 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen
-Date: Tue, 15 Nov 2016 15:20:49 +0200
-Subject: [PATCH 1/5] Simplify wayland-scanner lookup
-Organization: O.S. Systems Software LTDA.
-
-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
-Signed-off-by: Otavio Salvador
- configure.ac | 11 +--
- 1 file changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index cd9ff259fad..cbc455e130f 100644
a/configure.ac
-+++ b/configure.ac
-@@ -1841,16 +1841,7 @@ for plat in $platforms; do
- fi
- WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir
wayland-protocols`
-
--PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
-- WAYLAND_SCANNER=`$PKG_CONFIG
--variable=wayland_scanner wayland-scanner`,
-- WAYLAND_SCANNER='')
--PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
-- AC_SUBST(SCANNER_ARG, 'private-code'),
-- AC_SUBST(SCANNER_ARG, 'code'))
--
--if test "x$WAYLAND_SCANNER" = x; then
--AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
--fi
-+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
-
- if test "x$WAYLAND_SCANNER" = "x:"; then
- AC_MSG_ERROR([wayland-scanner is needed to compile the
wayland platform])
---
-2.20.1
-
diff --git
a/meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch
b/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
similarity index 91%
rename from
meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch
rename to
meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
index 1782576db2..08d128e919 100644
---
a/meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch
+++
b/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
@@ -1,7 +1,7 @@
-From f452e30ab664fe608acc107cc03d2efa8731d938 Mon Sep 17 00:00:00 2001
+From d2d5acdcb10465c024c8b0931d49e49660210d2c Mon Sep 17 00:00:00 2001
From: Gurchetan Singh
Date: Wed, 28 Nov 2018 08:39:34 -0800
-Subject: [PATCH 5/5] egl: add missing #include in egldevice.h
+Subject: [PATCH 1/2] egl: add missing #include in egldevice.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
new file mode 100644
index 00..f4650adf0f
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -0,0 +1,50 @@
+From a4f6630f4563c2f3f619003706f541c380b49027 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal
+Date:
Re: [OE-core] [RFC][PATCH] mesa: Convert recipe to use meson build system
On Mon, Feb 18, 2019 at 10:37 AM Alexander Kanavin wrote: > > The commits look good, the only comment I have is that in meson > conversion you remove the patches from SRC_URI, but not delete the > actual files. Good catch, also I'd like to not merge this now. I'd prefer to wait for 19.0.1 release to do the switch for meson but if desired, this could be tested on AB in meanwhile. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] mesa: Add opengl to native and nativesdk PACKAGECONFIG
On Mon, Feb 18, 2019 at 10:30 AM Fabio Berton wrote: > > Allow the use of opengl for native and nativesdk packages. > > Based on https://patchwork.openembedded.org/patch/158748/ > > Signed-off-by: Fabio Berton Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
On Mon, Feb 18, 2019 at 10:30 AM Fabio Berton wrote: > > Instead of using a native specific packageconfig option, we now set > the swrast as the supported driver. > > Based on https://patchwork.openembedded.org/patch/158748/ > > Signed-off-by: Fabio Berton Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] mesa: Update 18.1.9 -> 18.3.3
On Mon, Feb 18, 2019 at 10:30 AM Fabio Berton
wrote:
>
> - Refresh all patches.
>
> - Remove "Use Python 3 to execute the scripts" patch
> Commit 986033a2750c1160a4cef3c8418fc7f9e2b4fb5a add support
> for both python 2 and 3.
>
> - Remove "dri: i965: Add missing time.h include" patch
> Commit 3c288da5eec81ee58b85927df18d9194ead8f5c2 add time.h
> header file.
>
> - Remove --enable-texture-float.
> Commit 66673bef941af344314fe9c91cad8cd330b245eb remove option to
> unconditionally enable floating-point textures.
>
> - Commit 30b10dbb7c6f6bdf3e489620f8333c727bd3a6dd moved
> ${sysconfdir}/drirc to ${datadir}/drirc.d/00-mesa-defaults.conf
>
> - Add patch to fix mesa-native build
>
> Signed-off-by: Fabio Berton
Acked-by: Otavio Salvador
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] mesa: Convert recipe to use meson build system
The commits look good, the only comment I have is that in meson
conversion you remove the patches from SRC_URI, but not delete the
actual files.
Alex
On Mon, 18 Feb 2019 at 14:32, Fabio Berton
wrote:
>
> - Remove all non related meson patches
>
> Based on https://patchwork.openembedded.org/patch/158748/
>
> Signed-off-by: Fabio Berton
> ---
> ...sing-include-stddef.h-in-egldevice.h.patch | 49 +
> ...k-for-all-linux-host_os-combinations.patch | 50 +
> meta/recipes-graphics/mesa/mesa.inc | 54 +--
> meta/recipes-graphics/mesa/mesa_18.3.3.bb | 7 +--
> 4 files changed, 126 insertions(+), 34 deletions(-)
> create mode 100644
> meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
> create mode 100644
> meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
>
> diff --git
> a/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
>
> b/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
> new file mode 100644
> index 00..08d128e919
> --- /dev/null
> +++
> b/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
> @@ -0,0 +1,49 @@
> +From d2d5acdcb10465c024c8b0931d49e49660210d2c Mon Sep 17 00:00:00 2001
> +From: Gurchetan Singh
> +Date: Wed, 28 Nov 2018 08:39:34 -0800
> +Subject: [PATCH 1/2] egl: add missing #include in egldevice.h
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +Organization: O.S. Systems Software LTDA.
> +
> +Otherwise, I get this error:
> +
> +main/egldevice.h:54:13: error: ‘NULL’ undeclared (first use in this function)
> + dev = NULL;
> + ^~~~
> +with this config:
> +
> +./autogen.sh --enable-gles1 --enable-gles2 --with-platforms='surfaceless'
> --disable-glx
> + --with-dri-drivers="i965" --with-gallium-drivers="" --enable-gbm
> +
> +v3: Use stddef.h (Matt)
> +v4: Modify commit message (Eric)
> +
> +Reviewed-by: Matt Turner
> +Reviewed-by: Eric Engestrom
> +
> +Upstream-Status: Backport
> [https://cgit.freedesktop.org/mesa/mesa/commit/?id=eb44c36cf1729e7e200b77cf8ea755dff72d1639]
> +Signed-off-by: Alexander Kanavin
> +---
> + src/egl/main/egldevice.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/egl/main/egldevice.h b/src/egl/main/egldevice.h
> +index ddcdcd17f5a..83a47d5eacc 100644
> +--- a/src/egl/main/egldevice.h
> b/src/egl/main/egldevice.h
> +@@ -31,9 +31,9 @@
> +
> +
> + #include
> ++#include
> + #include "egltypedefs.h"
> +
> +-
> + #ifdef __cplusplus
> + extern "C" {
> + #endif
> +--
> +2.20.1
> +
> diff --git
> a/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
>
> b/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
> new file mode 100644
> index 00..f4650adf0f
> --- /dev/null
> +++
> b/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
> @@ -0,0 +1,50 @@
> +From a4f6630f4563c2f3f619003706f541c380b49027 Mon Sep 17 00:00:00 2001
> +From: Anuj Mittal
> +Date: Mon, 11 Feb 2019 20:55:27 +0800
> +Subject: [PATCH 2/2] meson.build: check for all linux host_os combinations
> +Organization: O.S. Systems Software LTDA.
> +
> +Make sure that we are also looking for our host_os combinations like
> +linux-musl etc. when assuming support for DRM/KMS.
> +
> +Also delete a duplicate line.
> +
> +Signed-off-by: Anuj Mittal
> +---
> + meson.build | 6 ++
> + 1 file changed, 2 insertions(+), 4 deletions(-)
> +
> +diff --git a/meson.build b/meson.build
> +index f11c556d359..e5f9b8a24be 100644
> +--- a/meson.build
> b/meson.build
> +@@ -34,7 +34,7 @@ cpp = meson.get_compiler('cpp')
> +
> + null_dep = dependency('', required : false)
> +
> +-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly',
> 'linux'].contains(host_machine.system())
> ++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',
> 'dragonfly'].contains(host_machine.system()) or
> host_machine.system().startswith('linux')
> +
> + # Arguments for the preprocessor, put these in a separate array from the C
> and
> + # C++ (cpp in meson terminology) arguments since they need to be added to
> the
> +@@ -92,8 +92,6 @@ if (with_gles1 or with_gles2) and not with_opengl
> + error('building OpenGL ES without OpenGL is not supported.')
> + endif
> +
> +-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly',
> 'linux'].contains(host_machine.system())
> +-
> + _drivers = get_option('dri-drivers')
> + if _drivers.contains('auto')
> + if system_has_kms_drm
> +@@ -799,7 +797,7 @@ if cc.compiles('int foo(void)
> __attribute__((__noreturn__));',
> + endif
> +
> + # TODO: this is very incomplete
> +-if ['linux', 'cygwin',
[OE-core] [RFC][PATCH] mesa: Convert recipe to use meson build system
- Remove all non related meson patches
Based on https://patchwork.openembedded.org/patch/158748/
Signed-off-by: Fabio Berton
---
...sing-include-stddef.h-in-egldevice.h.patch | 49 +
...k-for-all-linux-host_os-combinations.patch | 50 +
meta/recipes-graphics/mesa/mesa.inc | 54 +--
meta/recipes-graphics/mesa/mesa_18.3.3.bb | 7 +--
4 files changed, 126 insertions(+), 34 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
create mode 100644
meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
diff --git
a/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
b/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
new file mode 100644
index 00..08d128e919
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0001-egl-add-missing-include-stddef.h-in-egldevice.h.patch
@@ -0,0 +1,49 @@
+From d2d5acdcb10465c024c8b0931d49e49660210d2c Mon Sep 17 00:00:00 2001
+From: Gurchetan Singh
+Date: Wed, 28 Nov 2018 08:39:34 -0800
+Subject: [PATCH 1/2] egl: add missing #include in egldevice.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Organization: O.S. Systems Software LTDA.
+
+Otherwise, I get this error:
+
+main/egldevice.h:54:13: error: ‘NULL’ undeclared (first use in this function)
+ dev = NULL;
+ ^~~~
+with this config:
+
+./autogen.sh --enable-gles1 --enable-gles2 --with-platforms='surfaceless'
--disable-glx
+ --with-dri-drivers="i965" --with-gallium-drivers="" --enable-gbm
+
+v3: Use stddef.h (Matt)
+v4: Modify commit message (Eric)
+
+Reviewed-by: Matt Turner
+Reviewed-by: Eric Engestrom
+
+Upstream-Status: Backport
[https://cgit.freedesktop.org/mesa/mesa/commit/?id=eb44c36cf1729e7e200b77cf8ea755dff72d1639]
+Signed-off-by: Alexander Kanavin
+---
+ src/egl/main/egldevice.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/egl/main/egldevice.h b/src/egl/main/egldevice.h
+index ddcdcd17f5a..83a47d5eacc 100644
+--- a/src/egl/main/egldevice.h
b/src/egl/main/egldevice.h
+@@ -31,9 +31,9 @@
+
+
+ #include
++#include
+ #include "egltypedefs.h"
+
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+--
+2.20.1
+
diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
new file mode 100644
index 00..f4650adf0f
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -0,0 +1,50 @@
+From a4f6630f4563c2f3f619003706f541c380b49027 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal
+Date: Mon, 11 Feb 2019 20:55:27 +0800
+Subject: [PATCH 2/2] meson.build: check for all linux host_os combinations
+Organization: O.S. Systems Software LTDA.
+
+Make sure that we are also looking for our host_os combinations like
+linux-musl etc. when assuming support for DRM/KMS.
+
+Also delete a duplicate line.
+
+Signed-off-by: Anuj Mittal
+---
+ meson.build | 6 ++
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f11c556d359..e5f9b8a24be 100644
+--- a/meson.build
b/meson.build
+@@ -34,7 +34,7 @@ cpp = meson.get_compiler('cpp')
+
+ null_dep = dependency('', required : false)
+
+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly',
'linux'].contains(host_machine.system())
++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',
'dragonfly'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
+
+ # Arguments for the preprocessor, put these in a separate array from the C and
+ # C++ (cpp in meson terminology) arguments since they need to be added to the
+@@ -92,8 +92,6 @@ if (with_gles1 or with_gles2) and not with_opengl
+ error('building OpenGL ES without OpenGL is not supported.')
+ endif
+
+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly',
'linux'].contains(host_machine.system())
+-
+ _drivers = get_option('dri-drivers')
+ if _drivers.contains('auto')
+ if system_has_kms_drm
+@@ -799,7 +797,7 @@ if cc.compiles('int foo(void)
__attribute__((__noreturn__));',
+ endif
+
+ # TODO: this is very incomplete
+-if ['linux', 'cygwin', 'gnu'].contains(host_machine.system())
++if ['cygwin', 'gnu'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
+ pre_args += '-D_GNU_SOURCE'
+ endif
+
+--
+2.20.1
+
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 233de8eb27..128dd80295 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM =
[OE-core] [PATCH 3/3] mesa: Add opengl to native and nativesdk PACKAGECONFIG
Allow the use of opengl for native and nativesdk packages.
Based on https://patchwork.openembedded.org/patch/158748/
Signed-off-by: Fabio Berton
---
meta/recipes-graphics/mesa/mesa.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 8d3e976481..233de8eb27 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -49,8 +49,8 @@ PACKAGECONFIG_class-target ??=
"${@bb.utils.filter('DISTRO_FEATURES', 'wayland v
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11
dri3', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan',
'dri3', '', d)} \
"
-PACKAGECONFIG_class-native ?= "gbm dri egl"
-PACKAGECONFIG_class-nativesdk ?= "gbm dri egl"
+PACKAGECONFIG_class-native ?= "gbm dri egl opengl"
+PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl"
# "gbm" requires "dri", "opengl"
PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] mesa: Replace dri-native with dri for native and nativesdk classes
Instead of using a native specific packageconfig option, we now set
the swrast as the supported driver.
Based on https://patchwork.openembedded.org/patch/158748/
Signed-off-by: Fabio Berton
---
meta/recipes-graphics/mesa/mesa.inc | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index a57438b295..8d3e976481 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -49,8 +49,8 @@ PACKAGECONFIG_class-target ??=
"${@bb.utils.filter('DISTRO_FEATURES', 'wayland v
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11
dri3', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan',
'dri3', '', d)} \
"
-PACKAGECONFIG_class-native ?= "gbm dri-native egl"
-PACKAGECONFIG_class-nativesdk ?= "gbm dri-native egl"
+PACKAGECONFIG_class-native ?= "gbm dri egl"
+PACKAGECONFIG_class-nativesdk ?= "gbm dri egl"
# "gbm" requires "dri", "opengl"
PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
@@ -61,13 +61,12 @@ PACKAGECONFIG[x11] =
"--enable-glx-tls,--disable-glx,${X11_DEPS}"
PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
-DRIDRIVERS = "swrast"
-DRIDRIVERS_append_x86_class-target = ",radeon,r200,nouveau,i965,i915"
-DRIDRIVERS_append_x86-64_class-target = ",radeon,r200,nouveau,i965,i915"
+DRIDRIVERS_class-native = "swrast"
+DRIDRIVERS_class-nativesdk = "swrast"
+DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915"
+DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915"
# "dri" requires "opengl"
PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS},
--disable-dri, xorgproto libdrm"
-# On the native builds we use host's dri drivers
-PACKAGECONFIG[dri-native] = "--enable-dri, , xorgproto libdrm"
PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence"
# Vulkan drivers need dri3 enabled
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] mesa: Update 18.1.9 -> 18.3.3
- Refresh all patches.
- Remove "Use Python 3 to execute the scripts" patch
Commit 986033a2750c1160a4cef3c8418fc7f9e2b4fb5a add support
for both python 2 and 3.
- Remove "dri: i965: Add missing time.h include" patch
Commit 3c288da5eec81ee58b85927df18d9194ead8f5c2 add time.h
header file.
- Remove --enable-texture-float.
Commit 66673bef941af344314fe9c91cad8cd330b245eb remove option to
unconditionally enable floating-point textures.
- Commit 30b10dbb7c6f6bdf3e489620f8333c727bd3a6dd moved
${sysconfdir}/drirc to ${datadir}/drirc.d/00-mesa-defaults.conf
- Add patch to fix mesa-native build
Signed-off-by: Fabio Berton
---
...0001-Simplify-wayland-scanner-lookup.patch | 20 +---
...-winsys-svga-drm-Include-sys-types.h.patch | 8 +--
...M-version-when-using-LLVM-Git-releas.patch | 12 ++---
...-Use-Python-3-to-execute-the-scripts.patch | 32
...-for-defining-WAYLAND_PROTOCOLS_DAT.patch} | 23 -
...-dri-i965-Add-missing-time.h-include.patch | 36 --
...sing-include-stddef.h-in-egldevice.h.patch | 49 +++
.../{mesa-gl_18.1.9.bb => mesa-gl_18.3.3.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 4 +-
.../mesa/{mesa_18.1.9.bb => mesa_18.3.3.bb} | 9 ++--
10 files changed, 89 insertions(+), 104 deletions(-)
delete mode 100644
meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
rename
meta/recipes-graphics/mesa/files/{0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
=> 0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch} (60%)
delete mode 100644
meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
create mode 100644
meta/recipes-graphics/mesa/files/0005-egl-add-missing-include-stddef.h-in-egldevice.h.patch
rename meta/recipes-graphics/mesa/{mesa-gl_18.1.9.bb => mesa-gl_18.3.3.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_18.1.9.bb => mesa_18.3.3.bb} (69%)
diff --git
a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
index a50d2a2ba2..e765356fe1 100644
---
a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
+++
b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
@@ -1,7 +1,7 @@
-From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001
+From 7338667148cb7fcefee76b27359bc1e11656c132 Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen
Date: Tue, 15 Nov 2016 15:20:49 +0200
-Subject: [PATCH 1/6] Simplify wayland-scanner lookup
+Subject: [PATCH 1/5] Simplify wayland-scanner lookup
Organization: O.S. Systems Software LTDA.
Don't use pkg-config to lookup the path of a binary that's in the path.
@@ -13,20 +13,24 @@ Upstream-Status: Pending
Signed-off-by: Jussi Kukkonen
Signed-off-by: Otavio Salvador
---
- configure.ac | 7 +--
- 1 file changed, 1 insertion(+), 6 deletions(-)
+ configure.ac | 11 +--
+ 1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 14f1af2b2f..916d0bd207 100644
+index cd9ff259fad..cbc455e130f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1825,12 +1825,7 @@ for plat in $platforms; do
- PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >=
$WAYLAND_PROTOCOLS_REQUIRED])
+@@ -1841,16 +1841,7 @@ for plat in $platforms; do
+ fi
WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir
wayland-protocols`
-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
- WAYLAND_SCANNER=`$PKG_CONFIG
--variable=wayland_scanner wayland-scanner`,
- WAYLAND_SCANNER='')
+-PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
+- AC_SUBST(SCANNER_ARG, 'private-code'),
+- AC_SUBST(SCANNER_ARG, 'code'))
+-
-if test "x$WAYLAND_SCANNER" = x; then
-AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
-fi
@@ -35,5 +39,5 @@ index 14f1af2b2f..916d0bd207 100644
if test "x$WAYLAND_SCANNER" = "x:"; then
AC_MSG_ERROR([wayland-scanner is needed to compile the
wayland platform])
--
-2.18.0
+2.20.1
diff --git
a/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
b/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
index ffb3bf7a63..12dca61e19 100644
---
a/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
+++
b/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
@@ -1,7 +1,7 @@
-From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001
+From 34c3d07b67e6c08f555473a86ff158951abb6000 Mon Sep 17 00:00:00 2001
From: Khem Raj
Date: Wed, 16 Aug 2017 18:58:20 -0700
-Subject: [PATCH 2/6] winsys/svga/drm: Include sys/types.h
+Subject: [PATCH 2/5]
[OE-core] [PATCH 8/8] llvm: switch to the official git repository
Until now an unoffcial mirror was used, which may or may not
be maintained in the longer run, as the need for it has gone.
Also, the official mirror has version tags which allows us
to track upstream development in an automated manner.
${S} has changed as upstream decided to use a monorepo for all
of the llvm-related projects.
Further info:
https://www.phoronix.com/scan.php?page=news_item=LLVM-GitHub-Mono-Repo
https://llvm.org/docs/GettingStarted.html#checkout-llvm-from-git
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/llvm/llvm_git.bb | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb
b/meta/recipes-devtools/llvm/llvm_git.bb
index eca78af09e4..9e9b15bddec 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,20 +19,24 @@ PROVIDES += "llvm${PV}"
LLVM_RELEASE = "${PV}"
LLVM_DIR = "llvm${LLVM_RELEASE}"
-SRCREV = "e5cc6808dc0d5b773479bf36c51d59d0d3174733"
-BRANCH = "release_${MAJOR_VERSION}${MINOR_VERSION}"
+# SRCREV is set to the revision of 8.0.0-rc2 tag, while latest release
+# tag is 7.0.1 as of Feb 18 2019, hence the need for UPSTREAM_CHECK_UNKNOWN
+# Remove the UPSTREAM_CHECK_UNKNOWN line once 8.0.0 final is tagged
+UPSTREAM_CHECK_UNKNOWN = "1"
+SRCREV = "98ebe7460199b9cd79eb562b5e8705ad28f5513f"
+
+BRANCH = "release/${MAJOR_VERSION}.x"
MAJOR_VERSION = "8"
MINOR_VERSION = "0"
PATCH_VERSION = "0"
SOLIBVER = "1"
PV = "${MAJOR_VERSION}.${MINOR_VERSION}"
-SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH} \
+SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
file://0002-llvm-allow-env-override-of-exe-path.patch \
"
-UPSTREAM_CHECK_COMMITS = "1"
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/llvm"
LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] glib-2.0: convert from autotools to meson
PRINTF settings no longer seem necessary (tested with mingw).
Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and
0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch
to allow 'mingw32' as target machine in addition to 'windows'.
Drop configure-libtool.patch and uclibc_musl_translation.patch
(both autotools-specific).
Signed-off-by: Alexander Kanavin
---
...t-write-bindir-into-pkg-config-files.patch | 50 ++
...-gio-querymodules-as-libexec_PROGRAM.patch | 17 +++-
...-correctly-when-building-with-mingw3.patch | 81 +
...ble-more-tests-while-cross-compiling.patch | 91 ++-
.../glib-2.0/glib-2.0/configure-libtool.patch | 44 -
.../glib-2.0/glib-2.0/relocate-modules.patch | 2 +-
.../glib-2.0/uclibc_musl_translation.patch| 22 -
meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 4 +-
meta/recipes-core/glib-2.0/glib.inc | 33 ---
9 files changed, 256 insertions(+), 88 deletions(-)
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
delete mode 100644
meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
new file mode 100644
index 000..ede29c90bab
--- /dev/null
+++
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
@@ -0,0 +1,50 @@
+From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Fri, 15 Feb 2019 11:17:27 +0100
+Subject: [PATCH] Do not write $bindir into pkg-config files
+
+This would otherwise break when using the files to build other target
+components (we need to rely on PATH containing the paths to utilities,
+rather than use target paths).
+
+Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
+Signed-off-by: Alexander Kanavin
+---
+ gio/meson.build | 6 +++---
+ glib/meson.build | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gio/meson.build b/gio/meson.build
+index 85d8b14..657720a 100644
+--- a/gio/meson.build
b/gio/meson.build
+@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+'schemasdir=' + join_paths('${datadir}', schemas_subdir),
+'bindir=' + join_paths('${prefix}', get_option('bindir')),
+'giomoduledir=' + giomodulesdir,
+- 'glib_compile_schemas=' + join_paths('${bindir}',
'glib-compile-schemas'),
+- 'glib_compile_resources=' + join_paths('${bindir}',
'glib-compile-resources'),
+- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
++ 'glib_compile_schemas=glib-compile-schemas',
++ 'glib_compile_resources=glib-compile-resources',
++ 'gdbus_codegen=gdbus-codegen'],
+ version : glib_version,
+ install_dir : glib_pkgconfigreldir,
+ filebase : 'gio-2.0',
+diff --git a/glib/meson.build b/glib/meson.build
+index c05c694..434e8b1 100644
+--- a/glib/meson.build
b/glib/meson.build
+@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+ subdirs : ['glib-2.0'],
+ extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
+ variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
+- 'glib_genmarshal=' + join_paths('${bindir}',
'glib-genmarshal'),
+- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
+- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
++ 'glib_genmarshal=glib-genmarshal',
++ 'gobject_query=gobject-query',
++ 'glib_mkenums=glib-mkenums'],
+ version : glib_version,
+ install_dir : glib_pkgconfigreldir,
+ filebase : 'glib-2.0',
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index 97d0aff5d6c..f246254942e 100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
@@ -1,4 +1,4 @@
-From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001
+From 17fc9230fb932432d8fbf8c56fdc4845495e Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen
Date: Tue, 22 Mar 2016 15:14:58 +0200
Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -11,7 +11,8 @@ Upstream-Status: Inappropriate [OE specific]
---
[OE-core] [PATCH 6/8] pango: convert from autotools to meson
libxft is a hard dependency now, accordingly drop the patch that was made for it being optional. Signed-off-by: Alexander Kanavin --- ...on-of-docs-pango.types-it-is-build-c.patch | 147 -- meta/recipes-graphics/pango/pango_1.42.4.bb | 27 ++-- 2 files changed, 16 insertions(+), 158 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch diff --git a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch b/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch deleted file mode 100644 index 6784a105a55..000 --- a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 526a6a9fc9a1cfe75c521c8bb39b61754fe42fe8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 2 Sep 2016 14:00:24 +0300 -Subject: [PATCH] Enforce recreation of docs/pango.types; it is build - configuration-specific. - -In particular, it needs to exclude references to PangoXft if Xft is not available. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - docs/Makefile.am | 17 - docs/pango.types | 80 - 2 files changed, 5 insertions(+), 92 deletions(-) - delete mode 100644 docs/pango.types - -diff --git a/docs/Makefile.am b/docs/Makefile.am -index f5f1317..8947a99 100644 a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -49,6 +49,10 @@ IGNORE_HFILES= \ - pangocoretext-private.h \ - pangoatsui-private.h - -+if !HAVE_XFT -+IGNORE_HFILES += pangoxft pangoxft-render.h -+endif -+ - # CFLAGS and LDFLAGS for compiling scan program. Only needed - # if $(DOC_MODULE).types is non-empty. - INCLUDES =\ -@@ -103,16 +107,6 @@ include $(top_srcdir)/gtk-doc.make - # This line really belongs in gtk-doc.mk - $(REPORT_FILES): sgml-build.stamp - --pango.types: -- @echo "Rebuilding $@" -- @LANG=C; LIST=$$(grep 'pango_[_a-zA-Z0-9]*_get_type' $(HFILE_GLOB) | grep -v '\(private\|atsui\|core_text\|win32\)' | sed 's/\([^:]*:\).*\(pango[_a-zA-Z0-9]*_get_type\).*/\1\2/') && \ -- echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > $@.tmp && \ -- echo >> $@.tmp && \ -- echo "$$LIST" | cut -d : -f 2 | sort -u >> $@.tmp && \ -- mv $@.tmp $@ -- --BUILT_SOURCES = pango.types -- - - - MAINTAINERCLEANFILES = $(BUILT_SOURCES) -@@ -120,8 +114,7 @@ EXTRA_DIST += \ - layout.fig \ - layout.eps \ - version.xml.in \ -- check.docs \ -- pango.types -+ check.docs - - # force doc rebulid after configure - dist-hook-local: dist-local-check-no-cross-references all-local -diff --git a/docs/pango.types b/docs/pango.types -deleted file mode 100644 -index 7d93cda..000 a/docs/pango.types -+++ /dev/null -@@ -1,80 +0,0 @@ --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -- --pango_alignment_get_type --pango_attr_list_get_type --pango_attr_type_get_type --pango_bidi_type_get_type --pango_cairo_fc_font_map_get_type --pango_cairo_font_get_type --pango_cairo_font_map_get_type --pango_color_get_type --pango_context_get_type --pango_coverage_level_get_type --pango_direction_get_type --pango_ellipsize_mode_get_type --pango_engine_get_type --pango_engine_lang_get_type --pango_engine_shape_get_type --pango_fc_decoder_get_type --pango_fc_font_get_type --pango_fc_font_map_get_type --pango_font_description_get_type --pango_font_face_get_type --pango_font_family_get_type --pango_font_get_type --pango_font_map_get_type --pango_font_mask_get_type --pango_font_metrics_get_type --pango_fontset_get_type --pango_fontset_simple_get_type --pango_ft2_font_map_get_type --pango_glyph_item_get_type --pango_glyph_item_iter_get_type --pango_glyph_string_get_type --pango_gravity_get_type --pango_gravity_hint_get_type --pango_item_get_type --pango_language_get_type --pango_layout_get_type --pango_layout_iter_get_type --pango_layout_line_get_type --pango_matrix_get_type --pango_ot_info_get_type --pango_ot_ruleset_get_type --pango_render_part_get_type --pango_renderer_get_type --pango_script_get_type --pango_stretch_get_type --pango_style_get_type --pango_tab_align_get_type --pango_tab_array_get_type --pango_underline_get_type --pango_variant_get_type --pango_weight_get_type --pango_wrap_mode_get_type --pango_xft_font_get_type --pango_xft_font_map_get_type --pango_xft_renderer_get_type ---
[OE-core] [PATCH 4/8] libsoup-2.4: convert from autotools to meson
Signed-off-by: Alexander Kanavin
---
...no-introspection-when-cross-building.patch | 24 +
.../libsoup/libsoup-2.4_2.64.2.bb | 27 +++
2 files changed, 46 insertions(+), 5 deletions(-)
create mode 100644
meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
diff --git
a/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
b/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
new file mode 100644
index 000..72b029a80b6
--- /dev/null
+++
b/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
@@ -0,0 +1,24 @@
+From 921888affe66953c92a08ae440e911b016b124be Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Fri, 15 Feb 2019 14:21:06 +0100
+Subject: [PATCH] Do not enforce no-introspection when cross-building
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5a92cda..cfb3520 100644
+--- a/meson.build
b/meson.build
+@@ -262,7 +262,7 @@ enable_gnome = get_option('gnome') and
host_machine.system() != 'windows'
+ #
+ # GObject introspection #
+ #
+-enable_introspection = get_option('introspection') and
find_program('g-ir-scanner', required: false).found() and not
meson.is_cross_build()
++enable_introspection = get_option('introspection') and
find_program('g-ir-scanner', required: false).found()
+
+
+ # Vala API #
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb
b/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb
index 9f852d5c054..ae7c1a68636 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb
@@ -9,20 +9,37 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3
intltool-native libpsl"
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
-SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
+SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
+
file://0001-Do-not-enforce-no-introspection-when-cross-building.patch \
+ "
SRC_URI[md5sum] = "cac755dc6c6acd6e0c70007f547548f5"
SRC_URI[sha256sum] =
"75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6"
S = "${WORKDIR}/libsoup-${PV}"
-inherit autotools gettext pkgconfig upstream-version-is-even
gobject-introspection gtk-doc
+inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection
gtk-doc
# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable
by default.
PACKAGECONFIG ??= ""
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
-PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"
+PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false"
+PACKAGECONFIG[gssapi] = "-Dgssapi=true,-Dgssapi=false,krb5"
+
+EXTRA_OEMESON_append = " -Dvapi=false"
+
+GTKDOC_ENABLE_FLAG = "-Ddoc=true"
+GTKDOC_DISABLE_FLAG = "-Ddoc=false"
+
+GI_ENABLE_FLAG = "-Dintrospection=true"
+GI_DISABLE_FLAG = "-Dintrospection=false"
+
+EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}"
+
+EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED',
'True', '${GI_ENABLE_FLAG}', \
+
'${GI_DISABLE_FLAG}', d)} "
+
+EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED',
'True', '${GTKDOC_ENABLE_FLAG}', \
+
'${GTKDOC_DISABLE_FLAG}', d)} "
-EXTRA_OECONF = "--disable-vala"
# When built without gnome support, libsoup-2.4 will contain only one shared
lib
# and will therefore become subject to renaming by debian.bbclass. Prevent
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] meson: add a couple of patches to help with mingw builds
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/meson/meson.inc | 2 ++
...s-windows-split-WINDRES-env-variable.patch | 26 +++
...etect-windows-also-if-the-system-str.patch | 25 ++
3 files changed, 53 insertions(+)
create mode 100644
meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch
create mode 100644
meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch
diff --git a/meta/recipes-devtools/meson/meson.inc
b/meta/recipes-devtools/meson/meson.inc
index d37afc3b0dc..c39b1a3d5e2 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -12,6 +12,8 @@ SRC_URI =
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
file://disable-rpath-handling.patch \
file://cross-libdir.patch \
+ file://0001-modules-windows-split-WINDRES-env-variable.patch \
+
file://0002-environment.py-detect-windows-also-if-the-system-str.patch \
"
SRC_URI[sha256sum] =
"fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551"
SRC_URI[md5sum] = "3c35b91e8040901034809576d54007c6"
diff --git
a/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch
b/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch
new file mode 100644
index 000..c334e6dd66b
--- /dev/null
+++
b/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch
@@ -0,0 +1,26 @@
+From 5293d0f5067b2aeefe9ce3c175c972de367589bc Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Wed, 13 Feb 2019 17:43:54 +0100
+Subject: [PATCH] modules/windows: split WINDRES env variable
+
+As it may contain not just the binary, but also the arguments to it.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin
+---
+ mesonbuild/modules/windows.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
+index d185d89..dbaeb9b 100644
+--- a/mesonbuild/modules/windows.py
b/mesonbuild/modules/windows.py
+@@ -56,7 +56,7 @@ class WindowsModule(ExtensionModule):
+ if 'WINDRES' in os.environ:
+ # Pick-up env var WINDRES if set. This is often used for
+ # specifying an arch-specific windres.
+-rescomp = ExternalProgram('windres',
command=os.environ.get('WINDRES'), silent=True)
++rescomp = ExternalProgram('windres',
command=os.environ.get('WINDRES').split(), silent=True)
+
+ if not rescomp or not rescomp.found():
+ # Take windres from the config file after the environment, which
is
diff --git
a/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch
b/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch
new file mode 100644
index 000..1be5d663291
--- /dev/null
+++
b/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch
@@ -0,0 +1,25 @@
+From 7bf4c2c02eb7fe1bf24b23e3ba2d7df36495e0aa Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Wed, 13 Feb 2019 17:45:09 +0100
+Subject: [PATCH] environment.py: detect windows also if the system string
+ contains 'mingw'
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin
+---
+ mesonbuild/environment.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index b4fc0dc..845077e 100644
+--- a/mesonbuild/environment.py
b/mesonbuild/environment.py
+@@ -1247,7 +1247,7 @@ class MachineInfo:
+ """
+ Machine is windows?
+ """
+-return self.system == 'windows'
++return self.system == 'windows' or 'mingw' in self.system
+
+ def is_cygwin(self):
+ """
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] gdk-pixbuf: convert from autotools to meson
Drop autotools-specific patches.
Rework jku's thumbnailer patch into meson configuration.
Signed-off-by: Alexander Kanavin
---
...f-decisions-around-cross-compilation.patch | 38 +
...without-libtiff-not-having-an-effect.patch | 27
...nd-thumbnailer-cross-compile-failure.patch | 53 +++
...nd-thumbnailer-cross-compile-failure.patch | 131 ++
.../extending-libinstall-dependencies.patch | 42 --
.../gdk-pixbuf/hardcoded_libtool.patch| 33 -
.../gdk-pixbuf/gdk-pixbuf_2.36.11.bb | 36 +++--
7 files changed, 213 insertions(+), 147 deletions(-)
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0002-Work-around-thumbnailer-cross-compile-failure.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
new file mode 100644
index 000..90d4830df50
--- /dev/null
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
@@ -0,0 +1,38 @@
+From 48cbdd56036728ffea431ad63cf5e2ad05cef69c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Thu, 14 Feb 2019 18:06:25 +0100
+Subject: [PATCH] Fix a couple of decisions around cross-compilation
+
+1. gobject-introspection can be build when cross compiling
+2. generating loaders.cache requires running a target binary which
+we do elsewhere (in postinsts)
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin
+---
+ gdk-pixbuf/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
+index 77c162b..fc3eb33 100644
+--- a/gdk-pixbuf/meson.build
b/gdk-pixbuf/meson.build
+@@ -230,6 +230,7 @@ foreach bin: gdkpixbuf_bin
+ set_variable(bin_name.underscorify(), bin)
+ endforeach
+
++if not meson.is_cross_build()
+ # The 'loaders.cache' used for testing, so we don't accidentally
+ # load the installed cache; we always build it by default
+ loaders_cache = custom_target('loaders.cache',
+@@ -241,8 +242,9 @@ loaders_cache = custom_target('loaders.cache',
+ ],
+ build_by_default: true)
+ loaders_dep = declare_dependency(sources: [ loaders_cache ])
++endif
+
+-build_gir = get_option('with_gir') and not meson.is_cross_build()
++build_gir = get_option('with_gir')
+ if build_gir
+ gir_args = [
+ '--quiet',
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
deleted file mode 100644
index 2a54d8ed763..000
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 460befc992adb32434b0408b453be39a6866ccf8 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Tue, 10 Oct 2017 14:33:18 +0300
-Subject: [PATCH] Fix --without-libtiff not having an effect.
-
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=788770]
-Signed-off-by: Alexander Kanavin
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 315e0cc..98e780c 100644
a/configure.ac
-+++ b/configure.ac
-@@ -676,7 +676,7 @@ if test x$gio_can_sniff = x; then
- AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
- fi
-
--AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x)
-+AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
- AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
- AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
- AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
---
-2.14.1
-
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
index 31ed988f32b..110b32a4907 100644
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
@@ -1,47 +1,28 @@
-From 6646e8aadc4030d891ac27c25494e5793d59dc85 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen
-Date: Wed, 22 Feb 2017 11:24:39 +0200
+From 8c7ced988def52654946458a3779e383b27f14f7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
[OE-core] [PATCH 5/8] libxkbcommon: update to 0.8.3
Signed-off-by: Alexander Kanavin
---
.../xorg-lib/{libxkbcommon_0.8.2.bb => libxkbcommon_0.8.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.8.2.bb =>
libxkbcommon_0.8.3.bb} (83%)
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.2.bb
b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.3.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.2.bb
rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.3.bb
index 8cf508b0bff..ff0f0690b67 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.3.bb
@@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native"
SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz;
-SRC_URI[md5sum] = "5f7f8533f907ebcfb1cf8dceb9501264"
-SRC_URI[sha256sum] =
"7ab8c4b3403d89d01898066b72cb6069bddeb5af94905a65368f671a026ed58c"
+SRC_URI[md5sum] = "8225a206e00c4146d2e06f5e688b28e7"
+SRC_URI[sha256sum] =
"b855c629849a97ab9835a4ad99d6b749a636f70d38a03f070c6ef72024825540"
UPSTREAM_CHECK_URI = "http://xkbcommon.org/;
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] clutter-gtk-1.0: convert to meson
This required adding an option to control gobject introspection
via a custom patch, and tweaking clutter.bbclass to not enforce
autotools.
Signed-off-by: Alexander Kanavin
---
meta/classes/clutter.bbclass | 3 +-
.../clutter/clutter-gtk-1.0.inc | 20 +-
...iable-for-enabling-disabling-introsp.patch | 37 +++
.../clutter/clutter-gtk-1.0_1.8.4.bb | 1 +
4 files changed, 58 insertions(+), 3 deletions(-)
create mode 100644
meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch
diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass
index 5edab0e55d6..24b53a13e40 100644
--- a/meta/classes/clutter.bbclass
+++ b/meta/classes/clutter.bbclass
@@ -14,4 +14,5 @@ REALNAME = "${@get_real_name("${BPN}")}"
SRC_URI =
"${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive"
S = "${WORKDIR}/${REALNAME}-${PV}"
-inherit autotools pkgconfig gtk-doc gettext
+CLUTTERBASEBUILDCLASS ??= "autotools"
+inherit ${CLUTTERBASEBUILDCLASS} pkgconfig gtk-doc gettext
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
index 05c4e5f5caa..4e82f566057 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
@@ -2,7 +2,9 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+
application"
HOMEPAGE = "http://www.clutter-project.org/;
LICENSE = "LGPLv2+"
-inherit clutter distro_features_check upstream-version-is-even
gobject-introspection
+CLUTTERBASEBUILDCLASS = "meson"
+inherit clutter distro_features_check upstream-version-is-even
gobject-introspection gtk-doc
+
# depends on clutter-1.0 which depends on cogl-1.0
REQUIRED_DISTRO_FEATURES ?= "opengl"
# depends on gtk+3
@@ -10,6 +12,20 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
DEPENDS = "clutter-1.0 gtk+3"
PACKAGES =+ "${PN}-examples"
-AUTOTOOLS_AUXDIR = "${S}/build"
+
+GTKDOC_ENABLE_FLAG = "-Denable_docs=true"
+GTKDOC_DISABLE_FLAG = "-Denable_docs=false"
+
+GI_ENABLE_FLAG = "-Denable_gi=true"
+GI_DISABLE_FLAG = "-Denable_gi=false"
+
+EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}"
+
+EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED',
'True', '${GI_ENABLE_FLAG}', \
+
'${GI_DISABLE_FLAG}', d)} "
+
+EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED',
'True', '${GTKDOC_ENABLE_FLAG}', \
+
'${GTKDOC_DISABLE_FLAG}', d)} "
+
diff --git
a/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch
b/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch
new file mode 100644
index 000..e21c6fd9036
--- /dev/null
+++
b/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch
@@ -0,0 +1,37 @@
+From 7233883c6bd4e80c0e91b29b5c76fe798023e9fe Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Mon, 11 Feb 2019 16:41:13 +0100
+Subject: [PATCH] Add a config variable for enabling/disabling introspection
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin
+---
+ clutter-gtk/meson.build | 2 +-
+ meson_options.txt | 4
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/clutter-gtk/meson.build b/clutter-gtk/meson.build
+index 5d6847d..5d934b6 100644
+--- a/clutter-gtk/meson.build
b/clutter-gtk/meson.build
+@@ -49,7 +49,7 @@ clutter_gtk_dep = declare_dependency(link_with: clutter_gtk,
+ dependencies: [ mathlib_dep,
clutter_dep, gtk_dep ],
+ include_directories:
include_directories('.'))
+
+-if not meson.is_cross_build()
++if get_option('enable_gi')
+ gnome.generate_gir(clutter_gtk,
+ sources: clutter_gtk_headers + clutter_gtk_sources,
+ namespace: 'GtkClutter',
+diff --git a/meson_options.txt b/meson_options.txt
+index aaf59f1..b7e51c3 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -2,3 +2,7 @@ option('enable_docs',
+type: 'boolean',
+value: false,
+description: 'Enable generating the API reference (depends on
GTK-Doc)')
++option('enable_gi',
++ type: 'boolean',
++ value: false,
++ description: 'Enable gobject introspection')
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
index f0300c7164c..53948c89442 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
@@ -2,5 +2,6 @@ require clutter-gtk-1.0.inc
LIC_FILES_CHKSUM
Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
On Mon, 2019-02-18 at 09:20 +, Yeoh, Ee Peng wrote: > Thank you for sharing on the selftest comparison consideration! > > I agreed with you that in the high level, selftest should be > independent of which HOST_DISTRO, it shall compared 2 selftest even > when the host distro are different. > > But in the case that the build have multiple set of selftest each > with slightly different environments (eg. host distro), in that case, > will it better to compare selftest more closely if possible with same > host distro used? In an ideal world, yes. In reality trying to do that and making it conditional will complicate the code for little "real" end difference though? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/6] llvm: Upgrade to upcoming 8.0.0 release
There is now an official git repo for llvm, which also has version tags:
https://github.com/llvm/llvm-project
I'll make a patch to switch over to that.
Also note that final 8.0 is not yet out, so the recipe shouldn't make
it look like it is.
Alex
On Thu, 31 Jan 2019 at 07:51, Khem Raj wrote:
>
> License-Update: Copyright year updates from 2017-2019
>
> Refresh patches to apply on new version
>
> Signed-off-by: Khem Raj
> ---
> ...ryInfo-Undefine-libc-functions-if-th.patch | 28
> ...-llvm-allow-env-override-of-exe-path.patch | 66 +++
> meta/recipes-devtools/llvm/llvm_git.bb| 25 ---
> 3 files changed, 83 insertions(+), 36 deletions(-)
>
> diff --git
> a/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
>
> b/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
> index 209764c8ba..6dbbced7eb 100644
> ---
> a/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
> +++
> b/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
> @@ -1,24 +1,22 @@
> -From 96558c4f25d5132936014f6f2d6252cfdfdf478a Mon Sep 17 00:00:00 2001
> +From 905cac8934fb17e20416a4df712a566e757471a3 Mon Sep 17 00:00:00 2001
> From: Khem Raj
> Date: Sat, 21 May 2016 00:33:20 +
> -Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if they
> - are macros
> +Subject: [PATCH 1/2] llvm: TargetLibraryInfo: Undefine libc functions if
> they are macros
>
> musl defines some functions as macros and not inline functions
> if this is the case then make sure to undefine them
>
> +Upstream-Status: Pending
> Signed-off-by: Khem Raj
> ---
> -Upstream-Status: Pending
> -
> include/llvm/Analysis/TargetLibraryInfo.def | 21 +
> 1 file changed, 21 insertions(+)
>
> diff --git a/include/llvm/Analysis/TargetLibraryInfo.def
> b/include/llvm/Analysis/TargetLibraryInfo.def
> -index a461ed813b9..f9fd9faeee0 100644
> +index 518a85ee1a0..6b4ead4efc6 100644
> --- a/include/llvm/Analysis/TargetLibraryInfo.def
> +++ b/include/llvm/Analysis/TargetLibraryInfo.def
> -@@ -665,6 +665,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
> +@@ -731,6 +731,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
> TLI_DEFINE_ENUM_INTERNAL(fopen)
> TLI_DEFINE_STRING_INTERNAL("fopen")
> /// FILE *fopen64(const char *filename, const char *opentype)
> @@ -27,8 +25,8 @@ index a461ed813b9..f9fd9faeee0 100644
> +#endif
> TLI_DEFINE_ENUM_INTERNAL(fopen64)
> TLI_DEFINE_STRING_INTERNAL("fopen64")
> - /// int fprintf(FILE *stream, const char *format, ...);
> -@@ -700,6 +703,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
> + /// int fork();
> +@@ -778,6 +781,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
> /// int fseeko(FILE *stream, off_t offset, int whence);
> TLI_DEFINE_ENUM_INTERNAL(fseeko)
> TLI_DEFINE_STRING_INTERNAL("fseeko")
> @@ -38,7 +36,7 @@ index a461ed813b9..f9fd9faeee0 100644
> /// int fseeko64(FILE *stream, off64_t offset, int whence)
> TLI_DEFINE_ENUM_INTERNAL(fseeko64)
> TLI_DEFINE_STRING_INTERNAL("fseeko64")
> -@@ -710,6 +716,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
> +@@ -788,6 +794,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
> TLI_DEFINE_ENUM_INTERNAL(fstat)
> TLI_DEFINE_STRING_INTERNAL("fstat")
> /// int fstat64(int filedes, struct stat64 *buf)
> @@ -48,7 +46,7 @@ index a461ed813b9..f9fd9faeee0 100644
> TLI_DEFINE_ENUM_INTERNAL(fstat64)
> TLI_DEFINE_STRING_INTERNAL("fstat64")
> /// int fstatvfs(int fildes, struct statvfs *buf);
> -@@ -725,6 +734,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
> +@@ -803,6 +812,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
> TLI_DEFINE_ENUM_INTERNAL(ftello)
> TLI_DEFINE_STRING_INTERNAL("ftello")
> /// off64_t ftello64(FILE *stream)
> @@ -58,7 +56,7 @@ index a461ed813b9..f9fd9faeee0 100644
> TLI_DEFINE_ENUM_INTERNAL(ftello64)
> TLI_DEFINE_STRING_INTERNAL("ftello64")
> /// int ftrylockfile(FILE *file);
> -@@ -845,6 +857,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
> +@@ -929,6 +941,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
> TLI_DEFINE_ENUM_INTERNAL(lstat)
> TLI_DEFINE_STRING_INTERNAL("lstat")
> /// int lstat64(const char *path, struct stat64 *buf);
> @@ -68,7 +66,7 @@ index a461ed813b9..f9fd9faeee0 100644
> TLI_DEFINE_ENUM_INTERNAL(lstat64)
> TLI_DEFINE_STRING_INTERNAL("lstat64")
> /// void *malloc(size_t size);
> -@@ -1064,6 +1079,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf")
> +@@ -1154,6 +1169,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf")
> TLI_DEFINE_ENUM_INTERNAL(stat)
> TLI_DEFINE_STRING_INTERNAL("stat")
> /// int stat64(const char *path, struct stat64 *buf);
> @@ -78,7 +76,7 @@ index a461ed813b9..f9fd9faeee0 100644
> TLI_DEFINE_ENUM_INTERNAL(stat64)
> TLI_DEFINE_STRING_INTERNAL("stat64")
> /// int statvfs(const char *path, struct statvfs *buf);
> -@@ -1193,6 +1211,9 @@ TLI_DEFINE_STRING_INTERNAL("times")
> +@@ -1283,6 +1301,9 @@
Re: [OE-core] [PATCH 3/4] libidn2: fix buildpaths qa warning
On 2019/2/15 下午5:57, Richard Purdie wrote:
On Thu, 2019-02-14 at 21:06 -0500, kai.k...@windriver.com wrote:
From: Kai Kang
Fix buildpaths qa warning of libidn2:
WARNING: libidn2-2.0.5-r0 do_package_qa: QA Issue: File
/work/core2-64-poky-linux/libidn2/2.0.5-r0/packages-split/libidn2-
dev/usr/lib/pkgconfig/libidn2.pc
in package contained reference to tmpdir [buildpaths]
Signed-off-by: Kai Kang
---
meta/recipes-extended/libidn/libidn2_2.0.5.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
index 0daf7a6877..da77c4402d 100644
--- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
+++ b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
@@ -26,4 +26,8 @@ EXTRA_OECONF += "--disable-rpath \
LICENSE_${PN} = "(GPLv2+ | LGPLv3)"
LICENSE_${PN}-bin = "GPLv3+"
+do_install_append () {
+sed -i 's#${RECIPE_SYSROOT}##'
${D}${libdir}/pkgconfig/libidn2.pc
+}
+
BBCLASSEXTEND = "native nativesdk"
I have a strong dislike for editing .pc files after the fact. Part of
the concern is sed expressions like this bitrot badly, its hard to tell
if they still work as intended.
Is there not a way we can generate a correct .pc file in the first
place even if that means a patch?
The buildpaths qa issue is caused by a patch to fix compile-host-path qa
issue. But I could NOT reproduce compile-host-path issue when revert the
patch.
I'll turn Khem for some help to check whether could revert that patch.
commit e87b501659eecc22f48b3e3ca8cde6b4de9f663a
Author: Khem Raj
Date: Sun Aug 19 10:23:41 2018 -0700
libidn2: Fix libunistring detection
libunistring is one such library which many autotooled packages
mistake to use from build system if its installed on it. This
is specifically toxic when build host arch is same as target arch
since we only see the problem during runtime but thankfully OE
has build time QA which warns about it.
QA Issue: libidn2: The compile log indicates that host include
and/or library paths were used.
Using --with-libunistring-prefix nudges the autoconf system for the
component to first look into target sysroot before going on to search
on the build host
(From OE-Core rev: 9a4ea4ff856e2379888ea5cdcc0e761956e1f53b)
Signed-off-by: Khem Raj
Signed-off-by: Richard Purdie
diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
index 0d7bddbc7f..0daf7a6877 100644
--- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
+++ b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
@@ -19,6 +19,10 @@ DEPENDS = "virtual/libiconv libunistring"
inherit pkgconfig autotools gettext texinfo gtk-doc lib_package
+EXTRA_OECONF += "--disable-rpath \
+ --with-libunistring-prefix=${STAGING_EXECPREFIXDIR} \
+ "
+
LICENSE_${PN} = "(GPLv2+ | LGPLv3)"
LICENSE_${PN}-bin = "GPLv3+"
Thanks.
Kai
Cheers,
Richard
--
Kai Kang
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
Hi Richard,
Thank you for sharing on the selftest comparison consideration!
I agreed with you that in the high level, selftest should be independent of
which HOST_DISTRO, it shall compared 2 selftest even when the host distro are
different.
But in the case that the build have multiple set of selftest each with slightly
different environments (eg. host distro), in that case, will it better to
compare selftest more closely if possible with same host distro used?
Cheers,
Ee Peng
-Original Message-
From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
Sent: Monday, February 18, 2019 5:08 PM
To: Yeoh, Ee Peng ;
openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
Hi Ee Peng,
On Mon, 2019-02-18 at 08:09 +, Yeoh, Ee Peng wrote:
> I did some testing with the latest from resulttool: Update to use
> gitarchive library function.
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/t2
> 22=b9eecaabe56db5bcafff31e67cdabadc42e2d2e4
>
> I had 2 questions.
> 1. For "resulttool regression", currently it was comparing result id
> set without comprehending the difference in the host distro used to
> executed the oeselftest. Example: it was matching oeselftest run with
> fedora28 host distro with oeselftest run with ubuntu18 host distro, is
> this the expected behavior?
> Match: oeselftest_fedora-28_qemux86-64_20190201181656
>oeselftest_ubuntu-18.04_qemux86-64_20190201175023
> Match: oeselftest_fedora-26_qemux86-64_20190131144317
>oeselftest_fedora-26_qemux86-64_20190131144317
> Match: oeselftest_ubuntu-18.04_qemux86-64_20190201175023
>oeselftest_fedora-28_qemux86-64_20190201181656
> Match: oeselftest_opensuse-42.3_qemux86-64_20190126152612
>oeselftest_opensuse-42.3_qemux86-64_20190126152612
There were two reasons for this:
a) the results of the selftest should be independent of which HOST_DISTRO
they're run on so they can be compared.
b) some builds only have one oe-selftest (a-quick) and some have four (a-full).
In an a-quick build, the HOST_DISTRO would likely therefore be different
between two builds but we still would like the tool to compare them.
> 2. For "resulttool store", I had noticed that it will now generally
> stored testresults.json in a meaningful file directory structure based
> on the store_map except oeselftest. oeselftest currently store
> multiple result id set inside oselftest file directory without
> comprehend the host distro.
>
> For example runtime, store testresult.json with the configured
> store_map.
> ├── oeselftest
> │ └── testresults.json
> ├── runtime
> │ ├── poky
> │ │ ├── qemuarm
> │ │ │ ├── core-image-minimal
> │ │ │ │ └── testresults.json
> │ │ │ ├── core-image-sato
> │ │ │ │ └── testresults.json
> │ │ │ └── core-image-sato-sdk
> │ │ │ └── testresults.json
> │ │ ├── qemuarm64
> │ │ │ ├── core-image-minimal
> │ │ │ │ └── testresults.json
> │ │ │ ├── core-image-sato
> │ │ │ │ └── testresults.json
> │ │ │ └── core-image-sato-sdk
> │ │ │ └── testresults.json
>
> I believe that we shall again comprehend the 'HOST_DISTRO'
> configuration inside the store_map.
> store_map = {
> -"oeselftest": ['TEST_TYPE'],
> +"oeselftest": ['TEST_TYPE','HOST_DISTRO'],
> "runtime": ['TEST_TYPE', 'DISTRO', 'MACHINE', 'IMAGE_BASENAME'],
> "sdk": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE', 'IMAGE_BASENAME'],
> "sdkext": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE',
> 'IMAGE_BASENAME']
>
> Doing so, it will store oeselftest in a more useful file directory
> structure with host distro comprehended.
> └── oeselftest
> ├── fedora-26
> │ └── testresults.json
> ├── fedora-28
> │ └── testresults.json
> ├── opensuse-42.3
> │ └── testresults.json
> └── ubuntu-18.04
> └── testresults.json
The reasoning is the same as the above, its more useful to allow the files to
be directly compared between different host distros.
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
On Mon, 2019-02-18 at 08:33 +, Yeoh, Ee Peng wrote:
> Hi RP,
>
> I have a question for "TESTSERIES".
> * Formalised the handling of "file_name" to "TESTSERIES" which the
> code will now add into the json configuration data if its not
> present, based on the directory name.
>
> May I know why was "TESTSERIES" was added as one of the key
> configuration for regression comparison selection inside
> regression_map?
> regression_map = {
> "oeselftest": ['TEST_TYPE', 'MACHINE'],
> "runtime": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME',
> 'MACHINE', 'IMAGE_PKGTYPE', 'DISTRO'],
> "sdk": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
> 'SDKMACHINE'],
> "sdkext": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME',
> 'MACHINE', 'SDKMACHINE']
> }
>
> Firstly, from the current yocto-testresults repository, I noticed
> that "TESTSERIES" was mostly duplicated with "MACHINE", or "MACHINE"
> & "DISTRO", or "TEST_TYPE" for selftest case.
The store_map doesn't use TESTSERIES as a key since I didn't think it
was needed for the git file layout. Particuarly for the runtime tests,
it does mean we end up with a larger number of results under the
qemux86* files in particular.
When performing regression analysis it seemed like a useful way to know
which results to compare and lowered the number of inexact matches we
had to make.
> Secondly, since "TESTSERIES" was created based on directory name from
> the source directory being used, will this introduce unexpected
> complication to regression comparison in the future if directory name
> for the source was changed? If directory name was changed even
> slightly, example for runtime_core-image-lsb, if the source directory
> name changed from "qemuarm-lsb" to "qemuarm_lsb", I believe the
> regression comparison will not able to compare the result id set even
> though they were having same configurations and they were meant to be
> compare directly.
For Yocto QA usage, the directory names are going to come directly from
the autobuilder target names so they should be consistent. I'd be fine
with adding a parameter to control it, right now it does add useful
information we need for the autobuilder though as it makes the results
more accurate (and hints to the user which autobuilder target the
change came from too).
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
Hi Ee Peng,
On Mon, 2019-02-18 at 08:09 +, Yeoh, Ee Peng wrote:
> I did some testing with the latest from resulttool: Update to use
> gitarchive library function.
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/t222=b9eecaabe56db5bcafff31e67cdabadc42e2d2e4
>
> I had 2 questions.
> 1. For "resulttool regression", currently it was comparing result id
> set without comprehending the difference in the host distro used to
> executed the oeselftest. Example: it was matching oeselftest run with
> fedora28 host distro with oeselftest run with ubuntu18 host distro,
> is this the expected behavior?
> Match: oeselftest_fedora-28_qemux86-64_20190201181656
>oeselftest_ubuntu-18.04_qemux86-64_20190201175023
> Match: oeselftest_fedora-26_qemux86-64_20190131144317
>oeselftest_fedora-26_qemux86-64_20190131144317
> Match: oeselftest_ubuntu-18.04_qemux86-64_20190201175023
>oeselftest_fedora-28_qemux86-64_20190201181656
> Match: oeselftest_opensuse-42.3_qemux86-64_20190126152612
>oeselftest_opensuse-42.3_qemux86-64_20190126152612
There were two reasons for this:
a) the results of the selftest should be independent of which
HOST_DISTRO they're run on so they can be compared.
b) some builds only have one oe-selftest (a-quick) and some have four
(a-full). In an a-quick build, the HOST_DISTRO would likely therefore
be different between two builds but we still would like the tool to
compare them.
> 2. For "resulttool store", I had noticed that it will now generally
> stored testresults.json in a meaningful file directory structure
> based on the store_map except oeselftest. oeselftest currently store
> multiple result id set inside oselftest file directory without
> comprehend the host distro.
>
> For example runtime, store testresult.json with the configured
> store_map.
> ├── oeselftest
> │ └── testresults.json
> ├── runtime
> │ ├── poky
> │ │ ├── qemuarm
> │ │ │ ├── core-image-minimal
> │ │ │ │ └── testresults.json
> │ │ │ ├── core-image-sato
> │ │ │ │ └── testresults.json
> │ │ │ └── core-image-sato-sdk
> │ │ │ └── testresults.json
> │ │ ├── qemuarm64
> │ │ │ ├── core-image-minimal
> │ │ │ │ └── testresults.json
> │ │ │ ├── core-image-sato
> │ │ │ │ └── testresults.json
> │ │ │ └── core-image-sato-sdk
> │ │ │ └── testresults.json
>
> I believe that we shall again comprehend the 'HOST_DISTRO'
> configuration inside the store_map.
> store_map = {
> -"oeselftest": ['TEST_TYPE'],
> +"oeselftest": ['TEST_TYPE','HOST_DISTRO'],
> "runtime": ['TEST_TYPE', 'DISTRO', 'MACHINE', 'IMAGE_BASENAME'],
> "sdk": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE', 'IMAGE_BASENAME'],
> "sdkext": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE',
> 'IMAGE_BASENAME']
>
> Doing so, it will store oeselftest in a more useful file directory
> structure with host distro comprehended.
> └── oeselftest
> ├── fedora-26
> │ └── testresults.json
> ├── fedora-28
> │ └── testresults.json
> ├── opensuse-42.3
> │ └── testresults.json
> └── ubuntu-18.04
> └── testresults.json
The reasoning is the same as the above, its more useful to allow the
files to be directly compared between different host distros.
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
Hi RP,
I have a question for "TESTSERIES".
* Formalised the handling of "file_name" to "TESTSERIES" which the code will
now add into the json configuration data if its not present, based on the
directory name.
May I know why was "TESTSERIES" was added as one of the key configuration for
regression comparison selection inside regression_map?
regression_map = {
"oeselftest": ['TEST_TYPE', 'MACHINE'],
"runtime": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'IMAGE_PKGTYPE', 'DISTRO'],
"sdk": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'SDKMACHINE'],
"sdkext": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'SDKMACHINE']
}
Firstly, from the current yocto-testresults repository, I noticed that
"TESTSERIES" was mostly duplicated with "MACHINE", or "MACHINE" & "DISTRO", or
"TEST_TYPE" for selftest case.
Secondly, since "TESTSERIES" was created based on directory name from the
source directory being used, will this introduce unexpected complication to
regression comparison in the future if directory name for the source was
changed? If directory name was changed even slightly, example for
runtime_core-image-lsb, if the source directory name changed from "qemuarm-lsb"
to "qemuarm_lsb", I believe the regression comparison will not able to compare
the result id set even though they were having same configurations and they
were meant to be compare directly.
Examples:
"runtime_core-image-minimal_qemuarm_20190215014628": {
"configuration": {
"DISTRO": "poky",
"HOST_DISTRO": "ubuntu-18.04",
"IMAGE_BASENAME": "core-image-minimal",
"IMAGE_PKGTYPE": "rpm",
"LAYERS": {
"meta": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
},
"meta-poky": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
},
"meta-yocto-bsp": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
}
},
"MACHINE": "qemuarm",
"STARTTIME": "20190215014628",
"TESTSERIES": "qemuarm",
"TEST_TYPE": "runtime"
},
"runtime_core-image-lsb_qemuarm_20190215014624": {
"configuration": {
"DISTRO": "poky-lsb",
"HOST_DISTRO": "ubuntu-18.04",
"IMAGE_BASENAME": "core-image-lsb",
"IMAGE_PKGTYPE": "rpm",
"LAYERS": {
"meta": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
},
"meta-poky": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
},
"meta-yocto-bsp": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
}
},
"MACHINE": "qemuarm",
"STARTTIME": "20190215014624",
"TESTSERIES": "qemuarm-lsb",
"TEST_TYPE": "runtime"
},
"oeselftest_debian-9_qemux86-64_20190215010815": {
"configuration": {
"HOST_DISTRO": "debian-9",
"HOST_NAME": "debian9-ty-2.yocto.io",
"LAYERS": {
"meta": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
},
"meta-poky": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
},
"meta-selftest": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
},
"meta-yocto-bsp": {
"branch": "master",
"commit": "5fa3b5b15229babc9f96606c79436ab83651bf83",
"commit_count": 53265
}
},
"MACHINE": "qemux86-64",
"STARTTIME": "20190215010815",
"TESTSERIES": "oe-selftest",
"TEST_TYPE": "oeselftest"
},
Please let me know if you have any question for the above.
Best regards,
Yeoh Ee Peng
-Original Message-
From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
Sent: Monday, February 18, 2019 12:10
Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
Hi RP,
Thank you very much again for continuously providing your precious feedbacks to
me.
Also thank you very much for spending great amount of time to improve this
patchset siginificantly.
I did some testing with the latest from resulttool: Update to use gitarchive
library function.
http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/t222=b9eecaabe56db5bcafff31e67cdabadc42e2d2e4
I had 2 questions.
1. For "resulttool regression", currently it was comparing result id set
without comprehending the difference in the host distro used to executed the
oeselftest. Example: it was matching oeselftest run with fedora28 host distro
with oeselftest run with ubuntu18 host distro, is this the expected behavior?
Match: oeselftest_fedora-28_qemux86-64_20190201181656
oeselftest_ubuntu-18.04_qemux86-64_20190201175023
Match: oeselftest_fedora-26_qemux86-64_20190131144317
oeselftest_fedora-26_qemux86-64_20190131144317
Match: oeselftest_ubuntu-18.04_qemux86-64_20190201175023
oeselftest_fedora-28_qemux86-64_20190201181656
Match: oeselftest_opensuse-42.3_qemux86-64_20190126152612
oeselftest_opensuse-42.3_qemux86-64_20190126152612
I believe that we shall comprehend the 'HOST_DISTRO' configuration inside the
regression_map.
regression_map = {
-"oeselftest": ['TEST_TYPE', 'MACHINE'],
+"oeselftest": ['TEST_TYPE', 'HOST_DISTRO', 'MACHINE'],
"runtime": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'IMAGE_PKGTYPE', 'DISTRO'],
"sdk": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'SDKMACHINE'],
"sdkext": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'SDKMACHINE']
}
After comprehending this 'HOST_DISTRO', it was able to perform regression for
oeselftest with the matching host distro.
Match: oeselftest_ubuntu-18.04_qemux86-64_20190201175023
oeselftest_ubuntu-18.04_qemux86-64_20190201175023
Match: oeselftest_opensuse-42.3_qemux86-64_20190126152612
oeselftest_opensuse-42.3_qemux86-64_20190126152612
Match: oeselftest_fedora-26_qemux86-64_20190131144317
oeselftest_fedora-26_qemux86-64_20190131144317
Match: oeselftest_fedora-28_qemux86-64_20190201181656
oeselftest_fedora-28_qemux86-64_20190201181656
2. For "resulttool store", I had noticed that it will now generally stored
testresults.json in a meaningful file directory structure based on the
store_map except oeselftest. oeselftest currently store multiple result id set
inside oselftest file directory without comprehend the host distro.
For example runtime, store testresult.json with the configured store_map.
├── oeselftest
│ └── testresults.json
├── runtime
│ ├── poky
│ │ ├── qemuarm
│ │ │ ├── core-image-minimal
│ │ │ │ └── testresults.json
│ │ │ ├── core-image-sato
│ │ │ │ └── testresults.json
│ │ │ └── core-image-sato-sdk
│ │ │ └── testresults.json
│ │ ├── qemuarm64
│ │ │ ├── core-image-minimal
│ │ │ │ └── testresults.json
│ │ │ ├── core-image-sato
│ │ │ │ └── testresults.json
│ │ │ └── core-image-sato-sdk
│ │ │ └── testresults.json
I believe that we shall again comprehend the 'HOST_DISTRO' configuration inside
the store_map.
store_map = {
-"oeselftest": ['TEST_TYPE'],
+"oeselftest": ['TEST_TYPE','HOST_DISTRO'],
"runtime": ['TEST_TYPE', 'DISTRO', 'MACHINE', 'IMAGE_BASENAME'],
"sdk": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE', 'IMAGE_BASENAME'],
"sdkext": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE', 'IMAGE_BASENAME']
Doing so, it will store oeselftest in a more useful file directory structure
with host distro comprehended.
└── oeselftest
├── fedora-26
│ └── testresults.json
├── fedora-28
│ └── testresults.json
├── opensuse-42.3
│ └── testresults.json
└── ubuntu-18.04
└── testresults.json
Please let me know if you have any question related to above.
Best regards,
Yeoh Ee Peng
-Original Message-
From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
Sent: Monday, February 18, 2019 6:46 AM
To: Yeoh, Ee Peng ;
openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 0/2 v7] test-case-mgmt
On Sun, 2019-02-17 at 17:54 +, Richard Purdie wrote:
> > Despite my changes there are things that still need to be done.
> > Essential things which need to happen before this code merges:
> >
> > * oe-git-archive is importing using the commit/branch of the current
> > repo, not the data in the results file.
Also now fixed. I put my patches into master-next too.
With this working, I was able to run something along the lines of:
for D in $1/*; do
resulttool store $D $2 --allow-empty done
on the autobuilder's recent results which lead to the creation of this
repository:
http://git.yoctoproject.org/cgit.cgi/yocto-testresults/
> > * Revisit and redo the way the git branch handling is happening.
> > We
> > really want to model how
