Re: [OE-core] [PATCH 16/19] meson: update to 0.52.0

2019-10-18 Thread Alexander Kanavin
I certainly don't mean to ignore those reports, it's just that due to my
ongoing health problems, and having to dedicate most of my energy to the
day job (https://mbition.io/en/home/), I am not currently able to work on
the upstream issues in a timely manner the way I used to when maintaining
core was actually my day job (at Intel).

The question of how much effort people who update things in core should
allocate to fixing 'other' layers has been a conflict point for a long
time. I'd prefer to see more aggressive blacklisting/removal of recipes
that no one has an interest in fixing and updating.

Alex

On Thu, 17 Oct 2019 at 15:15, Khem Raj  wrote:

> On Sat, Oct 12, 2019 at 5:20 PM Khem Raj  wrote:
> >
> > On Fri, 2019-10-11 at 13:47 +0200, Alexander Kanavin wrote:
> > > Drop backported patches.
> > >
> > > Signed-off-by: Alexander Kanavin 
> > > ---
> > >  meta/recipes-devtools/meson/meson.inc |  7 +--
> > >  ...efined-by-the-existance-of-a-cross-f.patch | 28 ---
> > >  .../0001-Make-CPU-family-warnings-fatal.patch |  8 +--
> > >  ...etect-windows-also-if-the-system-str.patch | 29 ---
> > >  ...sues-that-arise-when-cross-compiling.patch |  8 +--
> > >  ...pport-building-allarch-recipes-again.patch |  4 +-
> > >  .../meson/meson/0003-native_bindir.patch  | 20 
> > >  .../meson/meson/vala-cross-compile.patch  | 50 ---
> >
> > meson 0.52.x seems to be exposing the dconf build issue.
> >
> > https://errors.yoctoproject.org/Errors/Details/273492/
> >
> > also reported here
> > https://gitlab.gnome.org/GNOME/dconf/issues/59
> >
>
>
> Regardless of this report, this is now merged and I don't see any
> resolution either of a followup
> from the submitter or any other developer. This is quite disheartening
> since it takes a lot of effort to find
> these issues and reports. we should try to be considerate of the
> layers who are trying to keep up with
> OE-Core, like this we won't be able to improve the quality of these
> layers. I understand that there are no breakages seen in OE-cor but we
> should encourage more
> of other layers to test master and especially if there are reports
> than it would be good to heed to them.
>
>
> > > 
> > >  .../{meson_0.51.2.bb => meson_0.52.0.bb}  |  1 -
> > >  ...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} |  0
> > >  10 files changed, 22 insertions(+), 133 deletions(-)
> > >  delete mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-
> > > build-is-defined-by-the-existance-of-a-cross-f.patch
> > >  delete mode 100644 meta/recipes-devtools/meson/meson/0001-
> > > environment.py-detect-windows-also-if-the-system-str.patch
> > >  delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-
> > > compile.patch
> > >  rename meta/recipes-devtools/meson/{meson_0.51.2.bb =>
> > > meson_0.52.0.bb} (97%)
> > >  rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb =>
> > > nativesdk-meson_0.52.0.bb} (100%)
> > >
> > > diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
> > > devtools/meson/meson.inc
> > > index 8219d87c741..ae0091c051c 100644
> > > --- a/meta/recipes-devtools/meson/meson.inc
> > > +++ b/meta/recipes-devtools/meson/meson.inc
> > > @@ -14,14 +14,11 @@ 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-prop-default.patch \
> > > -   file://0001-environment.py-detect-windows-also-if-the-
> > > system-str.patch \
> > > -   file://0001-Cross-build-is-defined-by-the-existance-of-a-
> > > cross-f.patch \
> > > file://0001-mesonbuild-environment.py-check-environment-
> > > for-vari.patch \
> > > file://0001-modules-python.py-do-not-substitute-python-s-
> > > install.patch \
> > > -   file://vala-cross-compile.patch \
> > > "
> > > -SRC_URI[sha256sum] =
> > > "23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"
> > > -SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
> > > +SRC_URI[sha256sum] =
> > > "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
> > > +SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
> &

Re: [OE-core] [PATCH] mesa: Upgrade 19.1.6 -> 19.2.1

2019-10-11 Thread Alexander Kanavin
On Fri, 11 Oct 2019 at 22:20, Fabio Berton 
wrote:

>   - Update patches with devtool finish --force-patch-refresh


I'm not sure what you did exactly, but one of the patches below is
incorrectly updated.

Do use 'devtool upgrade', which properly rebases the patches and allows you
to resolve conflicts.


> +@@ -382,6 +382,10 @@ if not with_platform_android or
> get_option('platform-sdk-version') >= 29
> +   pre_args += '-DUSE_ELF_TLS'
>   endif
>
> --pre_args += '-DGLX_USE_TLS'
>  +if get_option('glx-tls')
>  +  pre_args += '-DGLX_USE_TLS'
>  +endif
> ++
>   if with_glx != 'disabled'
> if not (with_platform_x11 and with_any_opengl)
>   error('Cannot build GLX support without X11 platform support and at
> least one OpenGL API')
>

The fact that 'pre_args += '-DGLX_USE_TLS' is no longer present in the file
should've raised suspicions, and indeed:
"mesa: Rename GLX_USE_TLS to USE_ELF_TLS."
https://gitlab.freedesktop.org/mesa/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32

2019-10-11 Thread Alexander Kanavin
On Fri, 11 Oct 2019 at 21:30, akuster808  wrote:

> > --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
> > +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
> > @@ -1,4 +1,4 @@
> > -From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
> > +From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
> >  From: Ross Burton 
> >  Date: Mon, 5 Sep 2016 22:25:44 +0100
>
> Why did the patch change?
>

rebasing patches with 'devtool upgrade' can do this. I usually don't trim
such non-changes as they're obvious and harmless.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 17/19] libmodulemd-v1: introduce the recipe

2019-10-11 Thread Alexander Kanavin
Upstream has split version 1 of the libmodulemd recipe into
its own branch and removed version 1 from the master
branch and 2.x releases; as libdnf requires v1 of libmodulemd,
this commit introduces a v1-specific revipe.

Signed-off-by: Alexander Kanavin 
---
 meta/conf/distro/include/maintainers.inc  |  1 +
 meta/recipes-devtools/libdnf/libdnf_0.28.1.bb |  2 +-
 ...t-generate-gtkdoc-or-python-bindings.patch | 60 +++
 ...ec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 22 +++
 .../libmodulemd/libmodulemd-v1_git.bb | 26 
 5 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 
meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
 create mode 100644 
meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
 create mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb

diff --git a/meta/conf/distro/include/maintainers.inc 
b/meta/conf/distro/include/maintainers.inc
index ab0c6c55412..7a9d55c5c34 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -356,6 +356,7 @@ RECIPE_MAINTAINER_pn-libmnl = "Khem Raj 
"
 RECIPE_MAINTAINER_pn-libmpc = "Khem Raj "
 RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling 
"
 RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin "
+RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin 
"
 RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia "
 RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia "
 RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin "
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb 
b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
index 4ff294c32cb..3f11e0231fa 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
@@ -13,7 +13,7 @@ SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c 
swig-native"
+DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd-v1 json-c 
swig-native"
 
 inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base
 
diff --git 
a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
 
b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
new file mode 100644
index 000..d950ad5867e
--- /dev/null
+++ 
b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
@@ -0,0 +1,60 @@
+From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin 
+Date: Fri, 6 Sep 2019 17:07:00 +0200
+Subject: [PATCH] Do not generate gtkdoc or python bindings
+
+All of these really need a configuration option.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin 
+---
+ meson.build  | 12 
+ modulemd/meson.build |  8 
+ 2 files changed, 20 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 155c9e7..fe35d5e 100644
+--- a/meson.build
 b/meson.build
+@@ -51,25 +51,13 @@ gnome = import('gnome')
+ pkg = import('pkgconfig')
+ gobject = dependency('gobject-2.0')
+ yaml = dependency('yaml-0.1')
+-gtkdoc = dependency('gtk-doc')
+ 
+ glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+ 
+ sh = find_program('sh')
+ sed = find_program('sed')
+ test = find_program('test')
+ 
+-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
+-if ret.returncode() != 0
+-  error('Missing documentation for GLib.')
+-endif
+-
+-ret = run_command ([test, '-e', join_paths(glib_docpath, 
'gobject/index.html')])
+-if ret.returncode() != 0
+-  error('Missing documentation for GObject.')
+-endif
+-
+ python_name = get_option('python_name')
+ 
+ if python_name != ''
+diff --git a/modulemd/meson.build b/modulemd/meson.build
+index 9a164b5..349c982 100644
+--- a/modulemd/meson.build
 b/modulemd/meson.build
+@@ -523,11 +523,3 @@ configure_file(
+   configuration : xcdata
+ )
+ 
+-gnome.gtkdoc(
+-'modulemd-1.0',
+-install_dir: 'modulemd-1.0',
+-src_dir : './modulemd',
+-main_xml : 'modulemd-docs.xml',
+-install : true,
+-)
+-
diff --git 
a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
 
b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
new file mode 100644
index 000..847b5f700b0
--- /dev/null
+++ 
b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
@@ -0,0 +1,22 @@
+From 4e67f6049b3f822fe6f5af46790a51ace581bf82 Mon Sep 17 00:00:00 2001
+From: Alexander

[OE-core] [PATCH 19/19] createrepo-c: upgrade to 0.15.1

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 .../{createrepo-c_0.15.0.bb => createrepo-c_0.15.1.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.0.bb => 
createrepo-c_0.15.1.bb} (95%)

diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb 
b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb
similarity index 95%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb
index dc1b851b2d7..797db738f47 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb
@@ -8,7 +8,7 @@ SRC_URI = 
"git://github.com/rpm-software-management/createrepo_c \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
"
 
-SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6"
+SRCREV = "bc67f19ed09593e3886ebeee2391e9d51cc3439f"
 
 S = "${WORKDIR}/git"
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 16/19] meson: update to 0.52.0

2019-10-11 Thread Alexander Kanavin
Drop backported patches.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-devtools/meson/meson.inc |  7 +--
 ...efined-by-the-existance-of-a-cross-f.patch | 28 ---
 .../0001-Make-CPU-family-warnings-fatal.patch |  8 +--
 ...etect-windows-also-if-the-system-str.patch | 29 ---
 ...sues-that-arise-when-cross-compiling.patch |  8 +--
 ...pport-building-allarch-recipes-again.patch |  4 +-
 .../meson/meson/0003-native_bindir.patch  | 20 
 .../meson/meson/vala-cross-compile.patch  | 50 ---
 .../{meson_0.51.2.bb => meson_0.52.0.bb}  |  1 -
 ...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} |  0
 10 files changed, 22 insertions(+), 133 deletions(-)
 delete mode 100644 
meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
 delete mode 100644 
meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-compile.patch
 rename meta/recipes-devtools/meson/{meson_0.51.2.bb => meson_0.52.0.bb} (97%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb => 
nativesdk-meson_0.52.0.bb} (100%)

diff --git a/meta/recipes-devtools/meson/meson.inc 
b/meta/recipes-devtools/meson/meson.inc
index 8219d87c741..ae0091c051c 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -14,14 +14,11 @@ 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-prop-default.patch \
-   
file://0001-environment.py-detect-windows-also-if-the-system-str.patch \
-   
file://0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch \

file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \

file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
-   file://vala-cross-compile.patch \
"
-SRC_URI[sha256sum] = 
"23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"
-SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
+SRC_URI[sha256sum] = 
"d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
+SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
 
 SRC_URI_append_class-native = " \
 file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git 
a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
 
b/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
deleted file mode 100644
index a5dbb81b088..000
--- 
a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton 
-
-From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00 2001
-From: Jussi Pakkanen 
-Date: Sun, 6 Oct 2019 15:17:32 +0300
-Subject: [PATCH] Cross build is defined by the existance of a cross file.
-

- mesonbuild/environment.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index e5d041b4..03c65688 100644
 a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -611,7 +611,7 @@ class Environment:
- self.first_invocation = True
- 
- def is_cross_build(self) -> bool:
--return not self.machines.matches_build_machine(MachineChoice.HOST)
-+return self.coredata.is_cross_build()
- 
- def dump_coredata(self):
- return coredata.save(self.coredata, self.get_build_dir())
--- 
-2.20.1
-
diff --git 
a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch 
b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index 444fc081686..fc55dcacf6d 100644
--- 
a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ 
b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,4 +1,4 @@
-From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00 2001
+From c07d29b715209cd5d75b142a00a540d45b00c36d Mon Sep 17 00:00:00 2001
 From: Ross Burton 
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,7 +12,7 @@ Signed-off-by: Ross Burton 
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..86b350b 100644
+index a59cd89..17de654 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -186,7 +186,7 @@ class MachineInfo:
@@ -25,10 +25,10 @@ index 03c6346..86b350b 100644
  endian = literal['endian']
  if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environmen

[OE-core] [PATCH 15/19] vala: upgrade 0.44.7 -> 0.46.3

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-devtools/vala/{vala_0.44.7.bb => vala_0.46.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/vala/{vala_0.44.7.bb => vala_0.46.3.bb} (57%)

diff --git a/meta/recipes-devtools/vala/vala_0.44.7.bb 
b/meta/recipes-devtools/vala/vala_0.46.3.bb
similarity index 57%
rename from meta/recipes-devtools/vala/vala_0.44.7.bb
rename to meta/recipes-devtools/vala/vala_0.46.3.bb
index 807ca7a2139..eda5738c066 100644
--- a/meta/recipes-devtools/vala/vala_0.44.7.bb
+++ b/meta/recipes-devtools/vala/vala_0.46.3.bb
@@ -4,5 +4,5 @@ SRC_URI += 
"file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat
file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
"
 
-SRC_URI[md5sum] = "27fd30535c51af5b87b0e7ffdbd906ef"
-SRC_URI[sha256sum] = 
"bf1ff4f59d5de2d626e98e98ef81cb75dc1e6a27610a7de4133597c430f1bd7c"
+SRC_URI[md5sum] = "809ddac69b039ef509b61993c848613f"
+SRC_URI[sha256sum] = 
"e29c2b1f108dc22c91bb501975a77c938aef079ca7875e1fbf41191e22cc57e3"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 18/19] libmodulemd: remove the recipe

2019-10-11 Thread Alexander Kanavin
Version 2 of the recipe is not actually required by anything; the
lidmodulemd dependency in createrepo-c is optional, and the
libmodulemd feature is not used in YP.

Signed-off-by: Alexander Kanavin 
---
 meta/conf/distro/include/maintainers.inc  |  1 -
 .../createrepo-c/createrepo-c_0.15.0.bb   |  4 +-
 ...ec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 22 --
 ...xplicitly-specify-the-v1-library-in-.patch | 28 
 ...n.build-do-not-generate-gir-or-gtkdo.patch | 71 ---
 .../libmodulemd/libmodulemd_git.bb| 26 ---
 6 files changed, 2 insertions(+), 150 deletions(-)
 delete mode 100644 
meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
 delete mode 100644 
meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
 delete mode 100644 
meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
 delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd_git.bb

diff --git a/meta/conf/distro/include/maintainers.inc 
b/meta/conf/distro/include/maintainers.inc
index 7a9d55c5c34..d85e5b697f5 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -355,7 +355,6 @@ RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton 
"
 RECIPE_MAINTAINER_pn-libmnl = "Khem Raj "
 RECIPE_MAINTAINER_pn-libmpc = "Khem Raj "
 RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling 
"
-RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin "
 RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin 
"
 RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia "
 RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia "
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb 
b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
index ae0a35da847..dc1b851b2d7 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
@@ -12,12 +12,12 @@ SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm 
libmodulemd"
+DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm"
 DEPENDS_append_class-native = " file-replacement-native"
 
 inherit cmake pkgconfig bash-completion distutils3-base
 
-EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} 
-DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF"
+EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} 
-DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF"
 
 BBCLASSEXTEND = "native nativesdk"
 
diff --git 
a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
 
b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
deleted file mode 100644
index 2598c177c4c..000
--- 
a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin 
-Date: Tue, 6 Nov 2018 13:41:29 +0100
-Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin 
-

- spec_tmpl.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec_tmpl.sh b/spec_tmpl.sh
-index 14e895a..fc80fc6 100755
 a/spec_tmpl.sh
-+++ b/spec_tmpl.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
- 
- version=$1
- libmodulemd_v1_version=$2
diff --git 
a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
 
b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
deleted file mode 100644
index 1568d25f9d8..000
--- 
a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin 
-Date: Tue, 21 May 2019 17:59:26 +0200
-Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in
- pkgconfig
-
-Otherwise there would be '-lmodulemd' which resolves
-to v2 version if both v2 and v1 are present in the sysroot.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin 

- modulemd/v1/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
-index 4d54e69..9144ca2 100644
 a/modulemd/v1/meson.build
-+++ b/modulemd/v1/meson.build
-@@ -325,7 +325,7 @@ configure_file(
- )
- 
- pkg.generate(
--libraries :

[OE-core] [PATCH 14/19] p11-kit: upgrade 0.23.16.1 -> 0.23.18.1

2019-10-11 Thread Alexander Kanavin
Drop the patch that has been merged upstream.

Signed-off-by: Alexander Kanavin 
---
 ...-languages-for-which-upstream-does-n.patch | 29 ---
 ...-kit_0.23.16.1.bb => p11-kit_0.23.18.1.bb} |  6 ++--
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 
meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
 rename meta/recipes-support/p11-kit/{p11-kit_0.23.16.1.bb => 
p11-kit_0.23.18.1.bb} (89%)

diff --git 
a/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
 
b/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
deleted file mode 100644
index e902b0b522f..000
--- 
a/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin 
-Date: Wed, 31 Jan 2018 16:47:44 +0200
-Subject: [PATCH] LINGUAS: drop the languages for which upstream does not
- supply .po files
-
-Regenerating them proved to be too painful.
-Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127
-
-Upstream-Status: Inappropriate [missing upstream distribution files]
-Signed-off-by: Alexander Kanavin 
-

- po/LINGUAS | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 767a806c2e20..6ab48001c409 100644
 a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -12,8 +12,6 @@ cy
- da
- de
- el
--en@boldquot
--en@quot
- en_GB
- eo
- es
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb 
b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
similarity index 89%
rename from meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb
rename to meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
index 54455da1bb7..119d8365a18 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
@@ -6,10 +6,8 @@ inherit autotools gettext pkgconfig gtk-doc
 
 DEPENDS = "libtasn1 libffi"
 
-SRC_URI = "git://github.com/p11-glue/p11-kit \
-   
file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \
-   "
-SRCREV = "c689917b393379d288b868f70b2f7b7f6aafe430"
+SRC_URI = "git://github.com/p11-glue/p11-kit"
+SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6"
 S = "${WORKDIR}/git"
 
 AUTOTOOLS_AUXDIR = "${S}/build/litter"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 09/19] webkitgtk: update 2.24.4 -> 2.26.1

2019-10-11 Thread Alexander Kanavin
Drop patches:
- 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch - this
has been a pain to rebase for a while as upstream keeps shifting and
changing the code that needs to be modified. If the issue the patch
is addressing is still relevant, please work with upstream to fix it
at the source

- 0001-gstreamer-add-a-missing-format-string.patch, narrowing.patch
are integrated upstream

- detect-gstreamer-gl.patch is adjusting something that is better done
from the yocto package configuration

Add an option to disable an enabled-by-default sandbox that requires
a component that oe-core does not have.

Signed-off-by: Alexander Kanavin 
---
 ...acros-Append-to-I-and-not-to-isystem.patch | 125 --
 ...streamer-add-a-missing-format-string.patch |  24 
 .../webkitgtk/detect-gstreamer-gl.patch   |  20 ---
 .../webkit/webkitgtk/narrowing.patch  |  31 -
 ...ebkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} |   9 +-
 5 files changed, 3 insertions(+), 206 deletions(-)
 delete mode 100644 
meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
 delete mode 100644 
meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/narrowing.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} 
(93%)

diff --git 
a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
 
b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
deleted file mode 100644
index e71905d26a1..000
--- 
a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Sun, 17 Apr 2016 12:35:41 -0700
-Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
-
-gcc-6 has now introduced stdlib.h in libstdc++ for better
-compliance and its including the C library stdlib.h using
-include_next which is sensitive to order of system header
-include paths. Its infact better to not tinker with the
-system header include paths at all. Since adding /usr/include
-to -system is redundant and compiler knows about it moreover
-now with gcc6 it interferes with compiler's functioning
-and ends up with compile errors e.g.
-
-/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or 
directory
-
-Signed-off-by: Khem Raj 
-
-Upstream-Status: Pending
-

- Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
- Source/WebCore/PlatformGTK.cmake   | 6 +++---
- Source/WebKit/PlatformGTK.cmake| 2 +-
- Source/cmake/WebKitMacros.cmake| 2 +-
- Tools/MiniBrowser/gtk/CMakeLists.txt   | 2 +-
- Tools/TestWebKitAPI/PlatformGTK.cmake  | 2 +-
- 6 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt 
b/Source/JavaScriptCore/shell/CMakeLists.txt
-index 87153e35..cd0beed4 100644
 a/Source/JavaScriptCore/shell/CMakeLists.txt
-+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
-@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
- WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
- WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
- include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} 
${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(jsc ${JSC_SOURCES})
- target_link_libraries(jsc ${JSC_LIBRARIES})
- 
-diff --git a/Source/WebCore/PlatformGTK.cmake 
b/Source/WebCore/PlatformGTK.cmake
-index e0dd9cd9..a2997f3e 100644
 a/Source/WebCore/PlatformGTK.cmake
-+++ b/Source/WebCore/PlatformGTK.cmake
-@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
- target_include_directories(WebCorePlatformGTK2 PRIVATE
- ${WebCore_INCLUDE_DIRECTORIES}
- )
--target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
-+target_include_directories(WebCorePlatformGTK2 PRIVATE
- ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- ${GTK2_INCLUDE_DIRS}
- ${GDK2_INCLUDE_DIRS}
-@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
- target_include_directories(WebCorePlatformGTK PRIVATE
- ${WebCore_INCLUDE_DIRECTORIES}
- )
--target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
-+target_include_directories(WebCorePlatformGTK PRIVATE
- ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- ${GTK_INCLUDE_DIRS}
- ${GDK_INCLUDE_DIRS}
-@@ -206,7 +206,7 @@ include_directories(
- "${WEBCORE_DIR}/bindings/gobject/"
- )
- 
--include_directories(SYSTEM
-+include_directories(
- ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- )
- 
-diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake

[OE-core] [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch  | 2 +-
 .../gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb}  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb} (93%)

diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch 
b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
index 8c9bc954420..5ca4e3e086d 100644
--- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
+++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
@@ -1,4 +1,4 @@
-From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
+From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
 From: Ross Burton 
 Date: Mon, 5 Sep 2016 22:25:44 +0100
 Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb 
b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
similarity index 93%
rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
index 4f97ce06333..50d4d99722f 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
@@ -18,8 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", 
"api-documentation",
 PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six 
python3-pygments"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
 
-SRC_URI[archive.md5sum] = "6239713011369a4fbdc7619350403772"
-SRC_URI[archive.sha256sum] = 
"a51687956d0377ac70904d03fdc73c9e116589b4a01453fa92162442b3657011"
+SRC_URI[archive.md5sum] = "07764836262e154e94922e5f2aa476ae"
+SRC_URI[archive.sha256sum] = 
"de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"
 SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch 
\
file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
file://conditionaltests.patch \
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 11/19] libdazzle: upgrade 3.32.3 -> 3.34.1

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 .../libdazzle/{libdazzle_3.32.3.bb => libdazzle_3.34.1.bb}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/libdazzle/{libdazzle_3.32.3.bb => 
libdazzle_3.34.1.bb} (73%)

diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb 
b/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb
similarity index 73%
rename from meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb
rename to meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb
index e1a11830070..cf61ed5016f 100644
--- a/meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb
+++ b/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb
@@ -7,8 +7,8 @@ inherit gnomebase upstream-version-is-even vala 
distro_features_check gobject-in
 
 DEPENDS = "glib-2.0-native glib-2.0 gtk+3"
 
-SRC_URI[archive.md5sum] = "b6da085649dcda2795e6980a84667950"
-SRC_URI[archive.sha256sum] = 
"6c8d9b1514b5f6422107596f4145b89b8f2a99abef6383e086dfcd28c28667e8"
+SRC_URI[archive.md5sum] = "e796a92dd3f529616ed388c15208359b"
+SRC_URI[archive.sha256sum] = 
"3d981cbb9d9bb87bfaff7bfd44d9847223b3ef81e69225e4d1f6ac725a669505"
 
 GIR_MESON_OPTION = 'with_introspection'
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 08/19] epiphany: upgrade 3.32.4 -> 3.34.1

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 .../epiphany/{epiphany_3.32.4.bb => epiphany_3.34.1.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.32.4.bb => epiphany_3.34.1.bb} 
(84%)

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.32.4.bb 
b/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb
similarity index 84%
rename from meta/recipes-gnome/epiphany/epiphany_3.32.4.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.34.1.bb
index 44af469942b..f5f086391e5 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.32.4.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb
@@ -13,8 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
 SRC_URI = 
"${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive
 \
file://0002-help-meson.build-disable-the-use-of-yelp.patch \
"
-SRC_URI[archive.md5sum] = "6a5eada8a3870ab4d0fcd5168559776f"
-SRC_URI[archive.sha256sum] = 
"c9a828578301af77ac9f3d3ce253b02f9f3a1561840cc8d74dd5645f92d0a995"
+SRC_URI[archive.md5sum] = "50b50e18d99b19f44cc9cd419c6a4ba8"
+SRC_URI[archive.sha256sum] = 
"a07bc997ad2cbf14d58557bb0b63e92d8c33683680c5e50ea6f9b53b36bec1d9"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers 
${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 13/19] mpg123: upgrade 1.25.11 -> 1.25.12

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 .../mpg123/{mpg123_1.25.11.bb => mpg123_1.25.12.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.25.11.bb => mpg123_1.25.12.bb} 
(94%)

diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb 
b/meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb
similarity index 94%
rename from meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb
index d063ef5c599..a18b2f44174 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2 \
file://sdl2.patch"
-SRC_URI[md5sum] = "64749512a6fdc117227abe13fee4cc36"
-SRC_URI[sha256sum] = 
"df063307faa27c7d9efe63d2139b1564cfc7cdbb7c6f449c89ef8faabfa0eab2"
+SRC_URI[md5sum] = "ddb38254966eb38c77f220d456a1839d"
+SRC_URI[sha256sum] = 
"1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1"
 
 inherit autotools pkgconfig
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 07/19] sysprof: update to 3.34.1

2019-10-11 Thread Alexander Kanavin
0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
is replaced by a meson option.

Signed-off-by: Alexander Kanavin 
---
 ...thing-in-help-as-it-requires-itstool.patch | 27 --
 ...-Define-NT_GNU_BUILD_ID-if-undefined.patch | 35 +++
 .../files/define-NT_GNU_BUILD_ID.patch| 22 
 .../{sysprof_3.32.0.bb => sysprof_3.34.1.bb}  | 16 +
 4 files changed, 45 insertions(+), 55 deletions(-)
 delete mode 100644 
meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
 create mode 100644 
meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
 delete mode 100644 
meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
 rename meta/recipes-kernel/sysprof/{sysprof_3.32.0.bb => sysprof_3.34.1.bb} 
(63%)

diff --git 
a/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
 
b/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
deleted file mode 100644
index ade51cf864f..000
--- 
a/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin 
-Date: Wed, 23 Aug 2017 18:38:26 +0300
-Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin 
-

- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 3986273..ae2f65e 100644
 a/meson.build
-+++ b/meson.build
-@@ -164,7 +164,6 @@ subdir('tools')
- subdir('tests')
- 
- subdir('data')
--subdir('help')
- subdir('po')
- 
- meson.add_install_script('build-aux/meson/post_install.sh')
--- 
-2.7.4
-
diff --git 
a/meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
 
b/meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
new file mode 100644
index 000..75aa86cdbf0
--- /dev/null
+++ 
b/meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
@@ -0,0 +1,35 @@
+From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Mon, 18 Jul 2011 16:00:17 -0700
+Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined
+
+On uclibc elf.h does not have GNU extentions but we need this define
+so we define it locally if its not getting it from elf.h
+
+Signed-off-by: Khem Raj 
+
+Upstream-Status: Pending
+
+%% original patch: define-NT_GNU_BUILD_ID.patch
+---
+ src/libsysprof/elfparser.h | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h
+index 160e4c9..94fa5c0 100644
+--- a/src/libsysprof/elfparser.h
 b/src/libsysprof/elfparser.h
+@@ -18,6 +18,10 @@
+ 
+ #include 
+ 
++#ifndef NT_GNU_BUILD_ID
++#define NT_GNU_BUILD_ID 3
++#endif
++
+ typedef struct ElfSym ElfSym;
+ typedef struct ElfParser ElfParser;
+ 
+-- 
+2.17.1
+
diff --git a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch 
b/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
deleted file mode 100644
index f75ddad43a1..000
--- a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-On uclibc elf.h does not have GNU extentions but we need this define
-so we define it locally if its not getting it from elf.h
-
-Signed-off-by: Khem Raj 
-
-Upstream-Status: Pending
-
-Index: git/elfparser.h
-===
 git.orig/lib/util/elfparser.h  2011-07-16 18:57:41.0 -0700
-+++ git/lib/util/elfparser.h   2011-07-16 20:28:54.733829895 -0700
-@@ -17,6 +17,10 @@
-  */
- #include 
- 
-+#ifndef NT_GNU_BUILD_ID
-+#define NT_GNU_BUILD_ID 3
-+#endif
-+
- typedef struct ElfSym ElfSym;
- typedef struct ElfParser ElfParser;
- 
diff --git a/meta/recipes-kernel/sysprof/sysprof_3.32.0.bb 
b/meta/recipes-kernel/sysprof/sysprof_3.34.1.bb
similarity index 63%
rename from meta/recipes-kernel/sysprof/sysprof_3.32.0.bb
rename to meta/recipes-kernel/sysprof/sysprof_3.34.1.bb
index b92933806cf..6d04cce5303 100644
--- a/meta/recipes-kernel/sysprof/sysprof_3.32.0.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.34.1.bb
@@ -2,23 +2,26 @@ SUMMARY = "System-wide Performance Profiler for Linux"
 HOMEPAGE = "http://www.sysprof.com;
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-
file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
+
file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607"
 
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gettext systemd upstream-

[OE-core] [PATCH 12/19] libsecret: upgrade 0.19.0 -> 0.19.1

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 .../libsecret/{libsecret_0.19.0.bb => libsecret_0.19.1.bb}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/libsecret/{libsecret_0.19.0.bb => 
libsecret_0.19.1.bb} (81%)

diff --git a/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb 
b/meta/recipes-gnome/libsecret/libsecret_0.19.1.bb
similarity index 81%
rename from meta/recipes-gnome/libsecret/libsecret_0.19.0.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.19.1.bb
index 7da8e90084d..0d76075239f 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.19.1.bb
@@ -8,8 +8,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native"
 
 PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, 
libxslt-native xmlto-native"
 
-SRC_URI[archive.md5sum] = "483d293e73e7257c6d9fc18579b0e1ea"
-SRC_URI[archive.sha256sum] = 
"8049b09a4e737911aa647e50aee3d06b5db7aa902608ca43a0dd10d83e1d67f9"
+SRC_URI[archive.md5sum] = "ea673119c00570d6434f8fd3636f1eb8"
+SRC_URI[archive.sha256sum] = 
"8583e10179456ae2c83075d95455f156dc08db6278b32bf4bd61819335a30e3a"
 
 # http://errors.yoctoproject.org/Errors/Details/20228/
 ARM_INSTRUCTION_SET_armv4 = "arm"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 06/19] glib-networking: update to 2.62.1

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 .../{glib-networking_2.60.3.bb => glib-networking_2.62.1.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/glib-networking/{glib-networking_2.60.3.bb => 
glib-networking_2.62.1.bb} (88%)

diff --git a/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb 
b/meta/recipes-core/glib-networking/glib-networking_2.62.1.bb
similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.60.3.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.62.1.bb
index 0278ab2fb68..81d3fd43d9e 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.62.1.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SECTION = "libs"
 DEPENDS = "glib-2.0"
 
-SRC_URI[archive.md5sum] = "e8fd0462a82269fb4bbd6c07a1e7d0f4"
-SRC_URI[archive.sha256sum] = 
"d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5"
+SRC_URI[archive.md5sum] = "64ca1e1e43e623b916059585bf7e4758"
+SRC_URI[archive.sha256sum] = 
"3c55ae6771ad7a79fa606a834f4686ed555c2774ed6e9ece6f3c0f6a3dab7110"
 
 PACKAGECONFIG ??= "gnutls"
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 03/19] runqemu: unset another environment variable for 'egl-headless'

2019-10-11 Thread Alexander Kanavin
Some host distributions (opensuse for example) are using 'pkgconf',
which, unlike the original pkg-config, appends PKG_CONFIG_SYSROOT_DIR
to every directory from the .pc file.

Signed-off-by: Alexander Kanavin 
---
 scripts/runqemu | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/runqemu b/scripts/runqemu
index 22671f19ec3..15cc56b93ec 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -462,6 +462,7 @@ class BaseConfig(object):
 del os.environ['PKG_CONFIG_PATH']
 del os.environ['PKG_CONFIG_DIR']
 del os.environ['PKG_CONFIG_LIBDIR']
+del os.environ['PKG_CONFIG_SYSROOT_DIR']
 except KeyError:
 pass
 try:
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 04/19] gobject-introspection: update to 1.62.0

2019-10-11 Thread Alexander Kanavin
Upstream has removed autotools support entirely, so we can drop
the chunks of patches that touch it.

Signed-off-by: Alexander Kanavin 
---
 ...t-cross-compilation-support-to-meson.patch |  20 +-
 ...pository-directory-for-native-builds.patch |   6 +-
 ...lete-upstream-attempt-at-cross-compi.patch |  48 -
 ...-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 201 --
 ...g-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch |  61 +-
 ...0.2.bb => gobject-introspection_1.62.0.bb} |   6 +-
 6 files changed, 18 insertions(+), 324 deletions(-)
 delete mode 100644 
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
 delete mode 100644 
meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
 rename 
meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.60.2.bb => 
gobject-introspection_1.62.0.bb} (96%)

diff --git 
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
index 5747d61c192..639f9c8f61a 100644
--- 
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
+++ 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
@@ -1,4 +1,4 @@
-From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001
+From 0417a1bb08745f2bf5310d20b342c2b3b9b212d3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin 
 Date: Thu, 15 Nov 2018 15:10:05 +0100
 Subject: [PATCH] Port cross-compilation support to meson
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin 
  3 files changed, 68 insertions(+), 18 deletions(-)
 
 diff --git a/gir/meson.build b/gir/meson.build
-index 85ae575..327c134 100644
+index c312100..a028033 100644
 --- a/gir/meson.build
 +++ b/gir/meson.build
-@@ -36,16 +36,29 @@ gir_files = [
+@@ -41,16 +41,29 @@ gir_files = [
  typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
  install_data(gir_files, install_dir: girdir)
  
@@ -56,7 +56,7 @@ index 85ae575..327c134 100644
  
  dep_type = glib_dep.type_name()
  if dep_type == 'internal'
-@@ -58,6 +71,12 @@ if dep_type == 'internal'
+@@ -63,6 +76,12 @@ if dep_type == 'internal'
'--extra-library=glib-2.0', 
'--extra-library=gobject-2.0']
  endif
  
@@ -69,7 +69,7 @@ index 85ae575..327c134 100644
  # Take a glob and print to newlines
  globber = '''
  from glob import glob
-@@ -84,8 +103,8 @@ glib_command = scanner_command + [
+@@ -89,8 +108,8 @@ glib_command = scanner_command + [
  
  if dep_type == 'pkgconfig'
glib_command += ['--external-library', '--pkg=glib-2.0']
@@ -80,8 +80,8 @@ index 85ae575..327c134 100644
glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
glib_files += join_paths(glib_libincdir, 'glibconfig.h')
-@@ -339,7 +358,7 @@ endforeach
- if giounix_dep.found()
+@@ -345,7 +364,7 @@ if giounix_dep.found()
+   dep_type = giounix_dep.type_name()
if dep_type == 'pkgconfig'
  gio_command += ['--pkg=gio-unix-2.0']
 -giounix_includedir = 
join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
@@ -89,7 +89,7 @@ index 85ae575..327c134 100644
  # Get the installed gio-unix header list
  ret = run_command(python, '-c', 
globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
  if ret.returncode() != 0
-@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository',
+@@ -428,15 +447,24 @@ gir_files += custom_target('gir-girepository',
  )
  
  typelibs = []
@@ -119,10 +119,10 @@ index 85ae575..327c134 100644
  install_dir: typelibdir,
)
 diff --git a/meson.build b/meson.build
-index 95bbd2b..f7baefd 100644
+index a5e825f..a28490a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -163,7 +163,9 @@ endif
+@@ -168,7 +168,9 @@ endif
  subdir('girepository')
  subdir('tools')
  subdir('giscanner')
diff --git 
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
index a4f45a142dd..a15401aeb2f 100644
--- 
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
+++ 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
@@ -1,4 +1,4 @@
-From 8f01066e935a7323ff6e53f27ed1b5fb74fa11eb Mon Sep 17 00:00:00 2001
+From 673623851fb70c0e43cf79cef67b3751432ebe72 Mon Sep 17 00:00:00 2001
 From: Sascha Silbe 
 Date: Fri, 8 Jun 2018 13:55:10 +0200
 Subject: [PATCH] Re

[OE-core] [PATCH 05/19] glib-2.0: upgrade to 2.62.1

2019-10-11 Thread Alexander Kanavin
Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where
upstream has removed the problematic bit.

Signed-off-by: Alexander Kanavin 
---
 ...t-write-bindir-into-pkg-config-files.patch | 31 +++---
 ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++
 ...-correctly-when-building-with-mingw3.patch | 22 +++
 ...-time-check-for-strlcpy-before-attem.patch | 62 ---
 ...ot-hardcode-linux-as-the-host-system.patch | 27 
 .../glib-2.0/glib-2.0/relocate-modules.patch  |  8 +--
 .../glib-2.0/uclibc_musl_translation.patch| 22 ---
 ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} |  8 +--
 meta/recipes-core/glib-2.0/glib.inc   |  2 +
 9 files changed, 75 insertions(+), 141 deletions(-)
 create mode 100644 
meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
 delete mode 100644 
meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
 delete mode 100644 
meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
 delete mode 100644 
meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} 
(69%)

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
index ede29c90bab..edac4c9f75d 100644
--- 
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
@@ -1,4 +1,4 @@
-From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
+From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 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
@@ -9,33 +9,44 @@ 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(-)
+ gio/meson.build  | 16 
+ glib/meson.build |  6 +++---
+ 2 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/gio/meson.build b/gio/meson.build
-index 85d8b14..657720a 100644
+index 71e88c4..8ce3987 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+@@ -831,14 +831,14 @@ pkg.generate(libgio,
 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
 'bindir=' + join_paths('${prefix}', get_option('bindir')),
 'giomoduledir=' + giomodulesdir,
+-   'gio=' + join_paths('${bindir}', 'gio'),
+-   'gio_querymodules=' + join_paths('${bindir}', 
'gio-querymodules'),
 -   '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')],
+-   'gdbus=' + join_paths('${bindir}', 'gdbus'),
+-   'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
+-   'gresource=' + join_paths('${bindir}', 'gresource'),
+-   'gsettings=' + join_paths('${bindir}', 'gsettings')],
++   'gio=gio',
++   'gio_querymodules=gio-querymodules',
 +   'glib_compile_schemas=glib-compile-schemas',
 +   'glib_compile_resources=glib-compile-resources',
-+   'gdbus_codegen=gdbus-codegen'],
++   'gdbus=gdbus',
++   'gdbus_codegen=gdbus-codegen',
++   'gresource=gresource',
++   'gsettings=gsettings'],
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
+index 91a48f1..978fb73 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+@@ -375,9 +375,9 @@ pkg.generate(libglib,
subdirs : ['glib-2.0'],
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
diff --git 
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
 
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
new file mode 100644
index 000..d8cf269bb8e
--- /dev/null
+++ 
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
@@ -0,0 +1,34 @@
+From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001
+From: Kh

[OE-core] [PATCH 02/19] oe-selftest: extend virgl gtk test to also check the SDL option

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 meta/lib/oeqa/selftest/cases/runtime_test.py | 17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py 
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 3f212bd0eac..8f98a9ead46 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -166,9 +166,9 @@ class TestImage(OESelftestTestCase):
 bitbake('core-image-full-cmdline socat')
 bitbake('-c testimage core-image-full-cmdline')
 
-def test_testimage_virgl_gtk(self):
+def test_testimage_virgl_gtk_sdl(self):
 """
-Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk frontend
+Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk and SDL frontends
 Expected: 1. Check that virgl kernel driver is loaded and 3d 
acceleration is enabled
   2. Check that kmscube demo runs without crashing.
 Product: oe-core
@@ -181,18 +181,27 @@ class TestImage(OESelftestTestCase):
 self.skipTest('virgl isn\'t working with Debian 8')
 
 qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')
 features = 'INHERIT += "testimage"\n'
 if 'gtk+' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
gtk+"\n'
+if 'sdl' not in qemu_packageconfig:
+features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n'
 if 'virglrenderer' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
virglrenderer"\n'
 if 'glx' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+if 'opengl' not in sdl_packageconfig:
+features += 'PACKAGECONFIG_append_pn-libsdl2-native = " opengl"\n'
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
-features += 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
-self.write_config(features)
+features_gtk = features + 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
+self.write_config(features_gtk)
+bitbake('core-image-minimal')
+bitbake('-c testimage core-image-minimal')
+features_sdl = features + 'TEST_RUNQEMUPARAMS = "sdl gl"\n'
+self.write_config(features_sdl)
 bitbake('core-image-minimal')
 bitbake('-c testimage core-image-minimal')
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend

2019-10-11 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 scripts/runqemu | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 1a5aca98ac7..22671f19ec3 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -67,9 +67,9 @@ of the following environment variables (in any order):
 nographic - disable video console
 sdl - choose the SDL UI frontend
 gtk - choose the Gtk UI frontend
-gl - enable virgl-based GL acceleration (also needs gtk option)
-gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs 
gtk option)
-egl-headless - enable headless EGL output; use vnc or spice to see it
+gl - enable virgl-based GL acceleration (also needs gtk or sdl options)
+gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs 
gtk or sdl options)
+egl-headless - enable headless EGL output; use vnc (via publicvnc option) 
or spice to see it
 serial - enable a serial console on /dev/ttyS0
 serialstdio - enable a serial console on the console (regardless of 
graphics mode)
 slirp - enable user networking, no root privileges is required
@@ -437,7 +437,12 @@ class BaseConfig(object):
 self.qemu_opt_script += ' -nographic'
 self.kernel_cmdline_script += ' console=ttyS0'
 elif arg == 'sdl':
-self.qemu_opt_script += ' -display sdl'
+if 'gl' in sys.argv[1:]:
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=on'
+elif 'gl-es' in sys.argv[1:]:
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=es'
+else:
+self.qemu_opt_script += ' -display sdl'
 elif arg == 'gtk':
 if 'gl' in sys.argv[1:]:
 self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 08/10] elfutils: do not depend on target libtool

2019-10-10 Thread Alexander Kanavin
This seems to be entirely unneeded.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-devtools/elfutils/elfutils_0.177.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.177.bb 
b/meta/recipes-devtools/elfutils/elfutils_0.177.bb
index 78c3791936d..818794266ce 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.177.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.177.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://sourceware.org/elfutils;
 SECTION = "base"
 LICENSE = "GPLv2 & LGPLv3+ & GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "libtool bzip2 zlib virtual/libintl"
+DEPENDS = "bzip2 zlib virtual/libintl"
 DEPENDS_append_libc-musl = " argp-standalone fts musl-obstack "
 # The Debian patches below are from:
 # 
http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 10/10] license_image.bbclass: check and reject packages which have incompatible licenses

2019-10-10 Thread Alexander Kanavin
The use case is setting INCOMPATIBLE_LICENSE per image,
rather than as an awkward, and too strict global setting.

This for example would allow building development images with gplv3 tools,
but production images without them, and checking that nothing gpl3-licensed
gets into the latter.

Examples are provided via the selftest: four scenarios are tested:

- bash is added to the image, with a default gpl3 license; this is rejected
- bash is added to the image, with a "gpl3 & other" license; this is also 
rejected
- bash is added to the image, with a "gpl3 | other" license; this is accepted, 
but
only 'other' is added to the license manifest (this was already handled 
correctly
previously).
- bash is added to the image with a default gpl3 license, and is additionally
whitelisted for that image; this is accepted.

Eventually, this would allow deprecating the meta-gplv2 layer, while still
enforcing the no-gpl3 rule where possible and needed.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/license_image.bbclass| 10 +-
 .../oeqa/selftest/cases/incompatible_lic.py   | 34 +++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/meta/classes/license_image.bbclass 
b/meta/classes/license_image.bbclass
index 3f102d0fbc3..b5399b6d960 100644
--- a/meta/classes/license_image.bbclass
+++ b/meta/classes/license_image.bbclass
@@ -43,10 +43,16 @@ def write_license_files(d, license_manifest, pkg_dic, 
rootfs=True):
 bad_licenses = [canonical_license(d, l) for l in bad_licenses]
 bad_licenses = expand_wildcard_licenses(d, bad_licenses)
 
+whitelist = []
+for lic in bad_licenses:
+whitelist.extend((d.getVar("WHITELIST_" + lic) or "").split())
+
 with open(license_manifest, "w") as license_file:
 for pkg in sorted(pkg_dic):
-if bad_licenses:
+if bad_licenses and pkg not in whitelist:
 try:
+if incompatible_pkg_license(d, bad_licenses, 
pkg_dic[pkg]["LICENSE"]):
+bb.fatal("Package %s has an incompatible license %s 
and cannot be installed into the image." %(pkg, pkg_dic[pkg]["LICENSE"]))
 (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \
 oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"],
 bad_licenses, canonical_license, d)
@@ -56,6 +62,8 @@ def write_license_files(d, license_manifest, pkg_dic, 
rootfs=True):
 pkg_dic[pkg]["LICENSES"] = re.sub(r'[|&()*]', ' ', 
pkg_dic[pkg]["LICENSE"])
 pkg_dic[pkg]["LICENSES"] = re.sub(r'  *', ' ', 
pkg_dic[pkg]["LICENSES"])
 pkg_dic[pkg]["LICENSES"] = pkg_dic[pkg]["LICENSES"].split()
+if pkg in whitelist:
+bb.warn("Including %s with an incompatible license %s into 
the image, because it has been whitelisted." %(pkg, pkg_dic[pkg]["LICENSE"]))
 
 if not "IMAGE_MANIFEST" in pkg_dic[pkg]:
 # Rootfs manifest
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py 
b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
index 8fb93af8a89..424a9e69c3e 100644
--- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
+++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
@@ -39,3 +39,37 @@ class IncompatibleLicenseTests(OESelftestTestCase):
 # INCOMPATIBLE_LICENSE contains this license
 def test_incompatible_nonspdx_license(self):
 self.lic_test('incompatible-nonspdx-license', 'FooLicense', 
'FooLicense')
+
+class IncompatibleLicensePerImageTests(OESelftestTestCase):
+def default_config(self):
+return """
+IMAGE_INSTALL_append = "bash"
+INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
+"""
+
+def test_bash_default(self):
+self.write_config(self.default_config())
+error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash 
has an incompatible license GPLv3+ and cannot be installed into the image."
+
+result = bitbake('core-image-minimal', ignore_status=True)
+if error_msg not in result.output:
+raise AssertionError(result.output)
+
+def test_bash_and_license(self):
+self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = 
" & SomeLicense"')
+error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash 
has an incompatible license GPLv3+ & SomeLicense and cannot be installed into 
the image."
+
+result = bitbake('core-image-minimal', ignore_status=True)
+if error_msg not in result.output:
+raise AssertionError(result.output)
+
+def test_bash_or_license(self):
+self.write_config

[OE-core] [PATCH 03/10] python3: make gdbm optional

2019-10-10 Thread Alexander Kanavin
The use case is building a gpl3-free image, without having
to rely on outdated recipes from meta-gplv2 layer.

Signed-off-by: Alexander Kanavin 
---
 ...fig-append-STAGING_LIBDIR-python-sys.patch | 10 +++---
 ...ON3HOME-is-set-use-instead-of-PYTHON.patch | 10 +++---
 ...report-missing-dependencies-for-disa.patch | 31 +++
 ...tutils-prefix-is-inside-staging-area.patch |  2 +-
 meta/recipes-devtools/python/python3_3.7.4.bb | 22 +
 5 files changed, 57 insertions(+), 18 deletions(-)
 create mode 100644 
meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch

diff --git 
a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
 
b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
index 1741f5753b4..1709011be8a 100644
--- 
a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++ 
b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
@@ -1,4 +1,4 @@
-From 17796e353acf08acd604610f34840a4a9d2f4b54 Mon Sep 17 00:00:00 2001
+From eff903c600f4c40f5753e95ab1557126fc6e0c9c Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin 
 Date: Thu, 31 Jan 2019 16:46:30 +0100
 Subject: [PATCH] distutils/sysconfig: append
@@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin 
  2 files changed, 4 insertions(+)
 
 diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index e07a6c8..6b8c129 100644
+index 0a034ee..3dfd0a3 100644
 --- a/Lib/distutils/sysconfig.py
 +++ b/Lib/distutils/sysconfig.py
-@@ -421,6 +421,8 @@ def _init_posix():
+@@ -439,6 +439,8 @@ def _init_posix():
  platform=sys.platform,
  multiarch=getattr(sys.implementation, '_multiarch', ''),
  ))
@@ -28,10 +28,10 @@ index e07a6c8..6b8c129 100644
  build_time_vars = _temp.build_time_vars
  global _config_vars
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 9ee4d31..e586abd 100644
+index 87fa5e6..756a41c 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
-@@ -412,6 +412,8 @@ def _init_posix(vars):
+@@ -419,6 +419,8 @@ def _init_posix(vars):
  """Initialize the module as appropriate for POSIX systems."""
  # _sysconfigdata is generated at build time, see _generate_posix_vars()
  name = _get_sysconfigdata_name()
diff --git 
a/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
 
b/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
index a0ed7cc830e..a146c747f83 100644
--- 
a/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
+++ 
b/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
@@ -1,4 +1,4 @@
-From ffe7797637f08cd6ee4c82e2d67462c5e194d30a Mon Sep 17 00:00:00 2001
+From 5ce3ac59531828ff682646fbba59b2126b28a8aa Mon Sep 17 00:00:00 2001
 From: Jaewon Lee 
 Date: Thu, 25 Apr 2019 15:34:26 -0700
 Subject: [PATCH] main.c: if OEPYTHON3HOME is set use instead of PYTHONHOME
@@ -12,15 +12,16 @@ to set a different path for python3
 Signed-off-by: Jaewon Lee 
 
 Upstream-Status: Inappropriate [OE specific configuration]
+
 ---
  Modules/main.c | 17 +
  1 file changed, 13 insertions(+), 4 deletions(-)
 
 diff --git a/Modules/main.c b/Modules/main.c
-index a745381..b553e30 100644
+index acc59c6..407085a 100644
 --- a/Modules/main.c
 +++ b/Modules/main.c
-@@ -1855,10 +1855,19 @@ config_init_home(_PyCoreConfig *config)
+@@ -1834,10 +1834,19 @@ config_init_home(_PyCoreConfig *config)
  }
  return _Py_INIT_OK();
  }
@@ -44,6 +45,3 @@ index a745381..b553e30 100644
  }
  config->home = home;
  return _Py_INIT_OK();
--- 
-2.7.4
-
diff --git 
a/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch
 
b/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch
new file mode 100644
index 000..c15295c034c
--- /dev/null
+++ 
b/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch
@@ -0,0 +1,31 @@
+From e3b59cb9658e1d3efa3535840939a0fa92a70a5a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin 
+Date: Mon, 7 Oct 2019 13:22:14 +0200
+Subject: [PATCH] setup.py: do not report missing dependencies for disabled
+ modules
+
+Reporting those missing dependencies is misleading as the modules would not
+have been built anyway. This particularly matters in oe-core's automated
+build completeness checker which relies on the report.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin 
+---
+ setup.py | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 4b53668..0097643 100644
+--- a/setup.py
+

[OE-core] [PATCH 06/10] iproute2: make elfutils support optional

2019-10-10 Thread Alexander Kanavin
The use case is as well allowing gpl3-free builds without
pulling in outdated meta-gpl2 recipes.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-connectivity/iproute2/iproute2.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc 
b/meta/recipes-connectivity/iproute2/iproute2.inc
index d72871767f9..fc31b8444ee 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -9,14 +9,15 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817"
 
-DEPENDS = "flex-native bison-native iptables elfutils libcap"
+DEPENDS = "flex-native bison-native iptables libcap"
 
 inherit update-alternatives bash-completion pkgconfig
 
 CLEANBROKEN = "1"
 
-PACKAGECONFIG ??= "tipc"
+PACKAGECONFIG ??= "tipc elf"
 PACKAGECONFIG[tipc] = ",,libmnl,"
+PACKAGECONFIG[elf] = ",,elfutils,"
 
 EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} 
DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \
 ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' 
SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 09/10] license.bbclass: split incompatible license check into a helper function

2019-10-10 Thread Alexander Kanavin
This would help with checking incompatible licenses at do_rootfs step
in image creation, where it is beneficial to pass the license string
directly to the function.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/license.bbclass | 25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index adca881c85b..648a4d78922 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -287,17 +287,7 @@ def incompatible_license_contains(license, truevalue, 
falsevalue, d):
 bad_licenses = expand_wildcard_licenses(d, bad_licenses)
 return truevalue if license in bad_licenses else falsevalue
 
-def incompatible_license(d, dont_want_licenses, package=None):
-"""
-This function checks if a recipe has only incompatible licenses. It also
-take into consideration 'or' operand.  dont_want_licenses should be passed
-as canonical (SPDX) names.
-"""
-import oe.license
-license = d.getVar("LICENSE_%s" % package) if package else None
-if not license:
-license = d.getVar('LICENSE')
-
+def incompatible_pkg_license(d, dont_want_licenses, license):
 # Handles an "or" or two license sets provided by
 # flattened_licenses(), pick one that works if possible.
 def choose_lic_set(a, b):
@@ -311,6 +301,19 @@ def incompatible_license(d, dont_want_licenses, 
package=None):
 return any(not oe.license.license_ok(canonical_license(d, l), \
dont_want_licenses) for l in licenses)
 
+def incompatible_license(d, dont_want_licenses, package=None):
+"""
+This function checks if a recipe has only incompatible licenses. It also
+take into consideration 'or' operand.  dont_want_licenses should be passed
+as canonical (SPDX) names.
+"""
+import oe.license
+license = d.getVar("LICENSE_%s" % package) if package else None
+if not license:
+license = d.getVar('LICENSE')
+
+return incompatible_pkg_license(d, dont_want_licenses, license)
+
 def check_license_flags(d):
 """
 This function checks if a recipe has any LICENSE_FLAGS that
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 07/10] bind: do not RDEPEND on bash

2019-10-10 Thread Alexander Kanavin
Nothing in the target installation actually needs it.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-connectivity/bind/bind_9.11.5-P4.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb 
b/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
index 69b11740734..f4e985036d5 100644
--- a/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
@@ -133,7 +133,5 @@ PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 
'python3', 'python3-
 FILES_python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \
 ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}"
 
-RDEPENDS_${PN} = "bash"
-RDEPENDS_${PN}-utils = "bash"
 RDEPENDS_${PN}-dev = ""
 RDEPENDS_python3-bind = "python3-core python3-ply"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 04/10] python3: un-break disabling the readline PACKAGECONFIG

2019-10-10 Thread Alexander Kanavin
Previously the readline module would have been built regardless of
readline's presence in the sysroot, and the recipe would
fail at package_qa.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-devtools/python/python3_3.7.4.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/python/python3_3.7.4.bb 
b/meta/recipes-devtools/python/python3_3.7.4.bb
index 58e2fa5abff..09b942cf3ad 100644
--- a/meta/recipes-devtools/python/python3_3.7.4.bb
+++ b/meta/recipes-devtools/python/python3_3.7.4.bb
@@ -102,6 +102,7 @@ do_configure_prepend () {
 cat > ${B}/Modules/Setup.local << EOF
 *disabled*
 ${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '', '_gdbm _dbm', d)}
+${@bb.utils.contains('PACKAGECONFIG', 'readline', '', 'readline', d)}
 EOF
 }
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 05/10] libcheck: split /usr/bin/checkmk into its own package

2019-10-10 Thread Alexander Kanavin
This allows not pulling in gawk, which is gplv3 licensed when
only the libcheck library itself is needed. checkmk is a
development tool that writes out a C boilerplate for tests.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-support/libcheck/libcheck_0.12.0.bb | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libcheck/libcheck_0.12.0.bb 
b/meta/recipes-support/libcheck/libcheck_0.12.0.bb
index 94b0dc1bbd1..25ac2c4b260 100644
--- a/meta/recipes-support/libcheck/libcheck_0.12.0.bb
+++ b/meta/recipes-support/libcheck/libcheck_0.12.0.bb
@@ -18,7 +18,12 @@ inherit autotools pkgconfig texinfo
 CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk"
 
 RREPLACES_${PN} = "check (<= 0.9.5)"
-RDEPENDS_${PN} += "gawk"
-RDEPENDS_${PN}_class-native = ""
 
 BBCLASSEXTEND = "native nativesdk"
+
+PACKAGES =+ "checkmk"
+
+FILES_checkmk = "${bindir}/checkmk"
+
+RDEPENDS_checkmk = "gawk"
+
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 02/10] perl: make gdbm optional

2019-10-10 Thread Alexander Kanavin
Recent versions of gdbm are gplv3, so in some scenarios
it is beneficial to not depend on it.

(thanks Ross for leading the way with the db option :)

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-devtools/perl/perl_5.30.0.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb 
b/meta/recipes-devtools/perl/perl_5.30.0.bb
index ba2a8437d47..1d906a75150 100644
--- a/meta/recipes-devtools/perl/perl_5.30.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.30.0.bb
@@ -35,12 +35,13 @@ S = "${WORKDIR}/perl-${PV}"
 
 inherit upstream-version-is-even
 
-DEPENDS += "gdbm zlib virtual/crypt"
+DEPENDS += "zlib virtual/crypt"
 
 PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0"
 
-PACKAGECONFIG ??= "bdb"
+PACKAGECONFIG ??= "bdb gdbm"
 PACKAGECONFIG[bdb] = ",-Ui_db,db"
+PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm"
 
 # Don't generate comments in enc2xs output files. They are not reproducible
 export ENC2XS_NO_COMMENTS = "1"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 01/10] socat: turn hard readline dependency into an option

2019-10-10 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-connectivity/socat/socat_1.7.3.3.bb | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb 
b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
index 067f7c64443..1dbbe5cd558 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.dest-unreach.org/socat/;
 
 SECTION = "console/network"
 
-DEPENDS = "openssl readline"
+DEPENDS = "openssl"
 
 LICENSE = "GPL-2.0-with-OpenSSL-exception"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -39,9 +39,10 @@ TERMBITS_SHIFTS_powerpc64 = "sc_cv_sys_crdly_shift=12 \
  sc_cv_sys_tabdly_shift=10 \
  sc_cv_sys_csize_shift=8"
 
-PACKAGECONFIG_class-target ??= "tcp-wrappers"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG_class-target ??= "tcp-wrappers readline"
+PACKAGECONFIG ??= "readline"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
+PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
 
 do_install_prepend () {
 mkdir -p ${D}${bindir}
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 03/13] qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips

2019-10-10 Thread Alexander Kanavin
On Thu, 10 Oct 2019 at 08:16, Changqing Li 
wrote:

> After switch from -vga vmware to -vga std (use qemux86-64),  start image
> by "runqemu nographic",
>
> Memory used by process Xorg raised a lot,   for my image,   from ~%7 to
> ~%34 (check by ps aux --sort -rss)
>
> also check memory by command "systemctl status xserver-nodm",  raised from
> ~60M to ~120M.
>
> with the high raise of memory usage of Xorg, when run oe-test on the
> target,  OOM is happened like:
>
> [ 1038.221438] *Out of memory*: Killed process 180 (Xorg)
> total-vm:335368kB, anon-rss:68824kB, file-rss:0kB, shmem-rss:140kB
>
>
> Also test with poky distro,  and image core-image-sato, also installed
> procps.
>
> 1. "ps aux --sort -rss":  Xorg from  ~3.6%  to ~ 17.4%
>
> 2. "systemctl status xserver-nodm":  from ~65M to ~131M
>
>
> Any idea about how to resolve this problem?  do we really need unify all
> boards to -vga=std? Thanks.
>

The increased memory usage is due to glamor loading the full 3D stack, mesa
and friends. You can drop opengl from DISTRO_FEATURES, or otherwise disable
glamor in xorg recipe via PACKAGECONFIG.

Or you can bump the available RAM for your image like is already done for
core-image-sato.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [RFC PATCH 2/2] license_image.bbclass: check and reject packages which have incompatible licenses

2019-10-09 Thread Alexander Kanavin
It wouldn't be too hard to add a condition that checks the (image-specific)
whitelist, I just wanted to gather a bit of feedback for the overall idea :)

Alex

On Wed, 9 Oct 2019 at 20:15, Christopher Larson  wrote:

> Does this obey the whitelist? Can I whitelist a gplv3 package to get it
> installed, ideally with a warning rather than silent or error? I don't have
> the code in front of me at the moment. I have a class in meta-mentor that
> does this sort of check, so wanted to see how the implementations compare.
> On a related note,
> https://github.com/MentorEmbedded/meta-mentor/blob/master/meta-mentor-common/classes/incompatible-recipe-check.bbclass
> +
> https://github.com/MentorEmbedded/meta-mentor/blob/95d05dcc12651a7b246f91b240120f92d196b0de/meta-mel-support/recipes-core/packagegroups/packagegroup-tools-benchmark.bb#L10
> might be of interest to you in your gplv2 work, perhaps? Specifically
> handling the whitelisting.
>
> On Wed, Oct 9, 2019 at 8:45 AM Alexander Kanavin 
> wrote:
>
>> The use case is setting INCOMPATIBLE_LICENSE per image,
>> rather than as an awkward, and too strict global setting.
>>
>> This for example would allow building development images with gplv3 tools,
>> but production images without them, and checking that nothing
>> gpl3-licensed
>> gets into the latter.
>>
>> Examples are provided via the selftest: three scenarios are tested:
>>
>> - bash is added to the image, with a default gpl3 license; this is
>> rejected
>> - bash is added to the image, with a "gpl3 & other" license; this is also
>> rejected
>> - bash is added to the image, with a "gpl3 | other" license; this is
>> accepted, but
>> only 'other' is added to the license manifest (this was already handled
>> correctly
>> previously).
>>
>> Eventually, this would allow deprecating the meta-gplv2 layer, while still
>> enforcing the no-gpl3 rule where possible and needed.
>>
>> Signed-off-by: Alexander Kanavin 
>> ---
>>  meta/classes/license_image.bbclass|  2 ++
>>  .../oeqa/selftest/cases/incompatible_lic.py   | 29 +++
>>  2 files changed, 31 insertions(+)
>>
>> diff --git a/meta/classes/license_image.bbclass
>> b/meta/classes/license_image.bbclass
>> index 3f102d0fbc3..e5cb1b8c77d 100644
>> --- a/meta/classes/license_image.bbclass
>> +++ b/meta/classes/license_image.bbclass
>> @@ -47,6 +47,8 @@ def write_license_files(d, license_manifest, pkg_dic,
>> rootfs=True):
>>  for pkg in sorted(pkg_dic):
>>  if bad_licenses:
>>  try:
>> +if incompatible_pkg_license(d, bad_licenses,
>> pkg_dic[pkg]["LICENSE"]):
>> +bb.fatal("Package %s has an incompatible license
>> %s and cannot be installed into the image." %(pkg, pkg_dic[pkg]["LICENSE"]))
>>  (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"])
>> = \
>>
>>  oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"],
>>  bad_licenses, canonical_license, d)
>> diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
>> b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
>> index 8fb93af8a89..e80c9783122 100644
>> --- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
>> +++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
>> @@ -39,3 +39,32 @@ class IncompatibleLicenseTests(OESelftestTestCase):
>>  # INCOMPATIBLE_LICENSE contains this license
>>  def test_incompatible_nonspdx_license(self):
>>  self.lic_test('incompatible-nonspdx-license', 'FooLicense',
>> 'FooLicense')
>> +
>> +class IncompatibleLicensePerImageTests(OESelftestTestCase):
>> +def default_config(self):
>> +return """
>> +IMAGE_INSTALL_append = "bash"
>> +INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
>> +"""
>> +
>> +def test_bash_default(self):
>> +self.write_config(self.default_config())
>> +error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package
>> bash has an incompatible license GPLv3+ and cannot be installed into the
>> image."
>> +
>> +result = bitbake('core-image-minimal', ignore_status=True)
>> +if error_msg not in result.output:
>> +raise AssertionError(result.output)
>> +
>> +def test_bash_and_license(self):
>> +self.wr

[OE-core] [RFC PATCH 1/2] license.bbclass: split incompatible license check into a helper function

2019-10-09 Thread Alexander Kanavin
This would help with checking incompatible licenses at do_rootfs step
in image creation, where it is beneficial to pass the license string
directly to the function.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/license.bbclass | 25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index adca881c85b..648a4d78922 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -287,17 +287,7 @@ def incompatible_license_contains(license, truevalue, 
falsevalue, d):
 bad_licenses = expand_wildcard_licenses(d, bad_licenses)
 return truevalue if license in bad_licenses else falsevalue
 
-def incompatible_license(d, dont_want_licenses, package=None):
-"""
-This function checks if a recipe has only incompatible licenses. It also
-take into consideration 'or' operand.  dont_want_licenses should be passed
-as canonical (SPDX) names.
-"""
-import oe.license
-license = d.getVar("LICENSE_%s" % package) if package else None
-if not license:
-license = d.getVar('LICENSE')
-
+def incompatible_pkg_license(d, dont_want_licenses, license):
 # Handles an "or" or two license sets provided by
 # flattened_licenses(), pick one that works if possible.
 def choose_lic_set(a, b):
@@ -311,6 +301,19 @@ def incompatible_license(d, dont_want_licenses, 
package=None):
 return any(not oe.license.license_ok(canonical_license(d, l), \
dont_want_licenses) for l in licenses)
 
+def incompatible_license(d, dont_want_licenses, package=None):
+"""
+This function checks if a recipe has only incompatible licenses. It also
+take into consideration 'or' operand.  dont_want_licenses should be passed
+as canonical (SPDX) names.
+"""
+import oe.license
+license = d.getVar("LICENSE_%s" % package) if package else None
+if not license:
+license = d.getVar('LICENSE')
+
+return incompatible_pkg_license(d, dont_want_licenses, license)
+
 def check_license_flags(d):
 """
 This function checks if a recipe has any LICENSE_FLAGS that
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [RFC PATCH 2/2] license_image.bbclass: check and reject packages which have incompatible licenses

2019-10-09 Thread Alexander Kanavin
The use case is setting INCOMPATIBLE_LICENSE per image,
rather than as an awkward, and too strict global setting.

This for example would allow building development images with gplv3 tools,
but production images without them, and checking that nothing gpl3-licensed
gets into the latter.

Examples are provided via the selftest: three scenarios are tested:

- bash is added to the image, with a default gpl3 license; this is rejected
- bash is added to the image, with a "gpl3 & other" license; this is also 
rejected
- bash is added to the image, with a "gpl3 | other" license; this is accepted, 
but
only 'other' is added to the license manifest (this was already handled 
correctly
previously).

Eventually, this would allow deprecating the meta-gplv2 layer, while still
enforcing the no-gpl3 rule where possible and needed.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/license_image.bbclass|  2 ++
 .../oeqa/selftest/cases/incompatible_lic.py   | 29 +++
 2 files changed, 31 insertions(+)

diff --git a/meta/classes/license_image.bbclass 
b/meta/classes/license_image.bbclass
index 3f102d0fbc3..e5cb1b8c77d 100644
--- a/meta/classes/license_image.bbclass
+++ b/meta/classes/license_image.bbclass
@@ -47,6 +47,8 @@ def write_license_files(d, license_manifest, pkg_dic, 
rootfs=True):
 for pkg in sorted(pkg_dic):
 if bad_licenses:
 try:
+if incompatible_pkg_license(d, bad_licenses, 
pkg_dic[pkg]["LICENSE"]):
+bb.fatal("Package %s has an incompatible license %s 
and cannot be installed into the image." %(pkg, pkg_dic[pkg]["LICENSE"]))
 (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \
 oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"],
 bad_licenses, canonical_license, d)
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py 
b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
index 8fb93af8a89..e80c9783122 100644
--- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
+++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
@@ -39,3 +39,32 @@ class IncompatibleLicenseTests(OESelftestTestCase):
 # INCOMPATIBLE_LICENSE contains this license
 def test_incompatible_nonspdx_license(self):
 self.lic_test('incompatible-nonspdx-license', 'FooLicense', 
'FooLicense')
+
+class IncompatibleLicensePerImageTests(OESelftestTestCase):
+def default_config(self):
+return """
+IMAGE_INSTALL_append = "bash"
+INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
+"""
+
+def test_bash_default(self):
+self.write_config(self.default_config())
+error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash 
has an incompatible license GPLv3+ and cannot be installed into the image."
+
+result = bitbake('core-image-minimal', ignore_status=True)
+if error_msg not in result.output:
+raise AssertionError(result.output)
+
+def test_bash_and_license(self):
+self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = 
" & SomeLicense"')
+error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash 
has an incompatible license GPLv3+ & SomeLicense and cannot be installed into 
the image."
+
+result = bitbake('core-image-minimal', ignore_status=True)
+if error_msg not in result.output:
+raise AssertionError(result.output)
+
+def test_bash_or_license(self):
+self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = 
" | SomeLicense"')
+
+bitbake('core-image-minimal')
+
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 2/2] ethtool, libcap: fix upstream version check

2019-10-02 Thread Alexander Kanavin
On Wed, 2 Oct 2019 at 20:18, Adrian Bunk  wrote:

> On Wed, Oct 02, 2019 at 08:08:08PM +0200, Alexander Kanavin wrote:
> > On Wed, 2 Oct 2019 at 19:51, Adrian Bunk  wrote:
> >
> > > Works for me without your patch:
> >
> > I am not sure what this may mean; but for me the patch definitely solves
> > the problem.
>
> It means that even without your patch devtool is able to tell me that
> there is a new upstream version of ethtool available.
>
> I was originally wondering whether there is a problem that also affects
> other users of KERNELORG_MIRROR, and was then surprised that it worked
> for me without the change the way I tried.
>
> How are you reproducing the problem?
>

The same way. I am getting the following on my home computer and on both of
my work computers (which are on two different networks). Note the IP
address is different, and the file size is smaller, as it's gzip-compressed:

ak@linux-f9zs:~/development/poky/build> devtool check-upgrade-status ethtool
NOTE: Starting bitbake server...
NOTE: Reconnecting to bitbake server...
NOTE: Retrying server connection (#1)...
NOTE: Reconnecting to bitbake server...
NOTE: Previous bitbake instance shutting down?, waiting to retry...
NOTE: Retrying server connection (#2)...
Loading cache: 100%
|#|
Time: 0:00:00
Loaded 1301 entries from dependency cache.
--2019-10-02 20:25:30--
https://cdn.kernel.org/pub/software/network/ethtool/
Resolving cdn.kernel.org (cdn.kernel.org)... 151.101.113.176
Connecting to cdn.kernel.org (cdn.kernel.org)|151.101.113.176|:443...
connected.
HTTP request sent, awaiting response... 200 OK
Length: 2155 (2.1K) [text/html]
Saving to: ‘/tmp/wget-index-l2jg_z9r/wget-listing-mo7c995y’


2019-10-02 20:25:30 (89.5 MB/s) -
‘/tmp/wget-index-l2jg_z9r/wget-listing-mo7c995y’ saved [2155/2155]

WARNING:root:Some characters could not be decoded, and were replaced with
REPLACEMENT CHARACTER.
INFO: ethtool   5.2 UNKNOWN_BROKEN  Changhyeok
Bae 

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 2/2] ethtool, libcap: fix upstream version check

2019-10-02 Thread Alexander Kanavin
On Wed, 2 Oct 2019 at 19:51, Adrian Bunk  wrote:

> Works for me without your patch:
>

I am not sure what this may mean; but for me the patch definitely solves
the problem.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/2] ethtool, libcap: fix upstream version check

2019-10-02 Thread Alexander Kanavin
The default URI returns a gzip-compressed index page
which browsers can auto-detect, but we can't.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-extended/ethtool/ethtool_5.2.bb | 2 ++
 meta/recipes-support/libcap/libcap_2.27.bb   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/meta/recipes-extended/ethtool/ethtool_5.2.bb 
b/meta/recipes-extended/ethtool/ethtool_5.2.bb
index e9759bd21bd..67e7fadee0c 100644
--- a/meta/recipes-extended/ethtool/ethtool_5.2.bb
+++ b/meta/recipes-extended/ethtool/ethtool_5.2.bb
@@ -14,6 +14,8 @@ SRC_URI = 
"${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
 SRC_URI[md5sum] = "79cff0d4af62b030ad28be90414b5c4a"
 SRC_URI[sha256sum] = 
"8ad6cb30f6e1767d9d23a5cb5f606f3b51f83e85ebf0153c1506194f6709e90b"
 
+UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/;
+
 inherit autotools ptest bash-completion
 
 RDEPENDS_${PN}-ptest += "make"
diff --git a/meta/recipes-support/libcap/libcap_2.27.bb 
b/meta/recipes-support/libcap/libcap_2.27.bb
index 4f3bac84909..3f64ff76364 100644
--- a/meta/recipes-support/libcap/libcap_2.27.bb
+++ b/meta/recipes-support/libcap/libcap_2.27.bb
@@ -13,6 +13,8 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
 SRC_URI[md5sum] = "2e8f9fab32eb5ccb37969fe317fd17aa"
 SRC_URI[sha256sum] = 
"dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a"
 
+UPSTREAM_CHECK_URI = 
"https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/;
+
 inherit lib_package
 
 # do NOT pass target cflags to host compilations
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/2] binutils: drop UPSTREAM_VERSION_UNKNOWN

2019-10-02 Thread Alexander Kanavin
As there is now a new version of binutils,
upstream version check works again.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-devtools/binutils/binutils-2.32.inc | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/binutils/binutils-2.32.inc 
b/meta/recipes-devtools/binutils/binutils-2.32.inc
index d3c52936d16..19baf8a8839 100644
--- a/meta/recipes-devtools/binutils/binutils-2.32.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.32.inc
@@ -14,11 +14,8 @@ def binutils_branch_version(d):
 pvsplit = d.getVar('PV').split('.')
 return pvsplit[0] + "_" + pvsplit[1]
 
-# Actual upstream version is 2.32 (without the .0), so we have to set
-# UPSTREAM_VERSION_UNKNOWN to avoid the version check failure. The line can
-# be removed when a new version of binutils is released (if the PV is then
-# correctly set to match the upstream version tag).
-UPSTREAM_VERSION_UNKNOWN = "1"
+# When upgrading to 2.33, please make sure there is no trailing .0, so
+# that upstream version check can work correctly.
 PV = "2.32.0"
 CVE_VERSION = "2.32"
 BINUPV = "${@binutils_branch_version(d)}"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] Yocto Project Status WW40’19

2019-10-01 Thread Alexander Kanavin
On Tue, 1 Oct 2019 at 16:54, Stephen K Jolley 
wrote:

> A significant performance problem has been found on the autobuilder where
> some builds are scaling in time badly as the sstate cache grows, taking 12
> hours or more in some cases. Unfortunately nobody seems motivated to help
> work on this kind of issue.
>

Wait a moment, I believe there is a patch for this issue?
http://lists.openembedded.org/pipermail/openembedded-core/2019-September/287445.html

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH v2] ruby: fix non-IPv6 support

2019-09-27 Thread Alexander Kanavin
On Fri, 27 Sep 2019 at 17:24, André Draszik  wrote:

> Can't the auto-updater do it? (Without the repackaging?)
>

I think it fails at the rebasing patches step - merge conflicts can only be
resolved by a human.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH v2] ruby: fix non-IPv6 support

2019-09-27 Thread Alexander Kanavin
Just wanted to request, would you be able to provide a ruby version upgrade
as well?

Alex

On Fri, 27 Sep 2019 at 16:10, André Draszik  wrote:

> From: André Draszik 
>
> When IPv6 support is disabled, this recipe mis-configures
> ruby so that it end up non-working:
> --enable-wide-getaddrinfo instructs ruby to re-implement
> the standard getaddinfo(), but IPv6 support is still
> automatically detected via ext/socket/extconf.rb
> independently of that flag.
>
> To re-implement getaddrinfo(), ruby uses the obsolete
> getipnodebyaddr() and getipnodebyname() functions - i.e.
> according to the man-page, glibc provided those only in
> glibc 2.1.91-95; and of course compilation fails. [1]
>
> Switch to ruby's standard --enable-ipv6= configure
> options to make the build work without warnings, and
> ruby work at runtime as well.
>
> [1] Compilation and linking actually succeed, albeit with
> a warning regarding implicit declaration / unresolved
> symbols. The error is only obvious at runtime due to the
> unresolved symbols...
>
> Signed-off-by: André Draszik 
>
> ---
> v2:
> * switch to --enable-ipv6/--disable-ipv6 instead of
>   --enable-ipv6=yes/no, as the latter is not actually
>   recognised
> ---
>  meta/recipes-devtools/ruby/ruby_2.5.5.bb | 7 +--
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb
> b/meta/recipes-devtools/ruby/ruby_2.5.5.bb
> index fdd3852a78..feb654cb6a 100644
> --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb
> +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb
> @@ -9,17 +9,12 @@ SRC_URI += " \
>  SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400"
>  SRC_URI[sha256sum] =
> "28a945fdf340e6ba04fc890b98648342e3cccfd6d223a48f3810572f11b2514c"
>
> -# it's unknown to configure script, but then passed to extconf.rb
> -# maybe it's not really needed as we're hardcoding the result with
> -# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
> -UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
> -
>  PACKAGECONFIG ??= ""
>  PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
>
>  PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no,
> valgrind"
>  PACKAGECONFIG[gmp] = "--with-gmp=yes, --with-gmp=no, gmp"
> -PACKAGECONFIG[ipv6] = ",--enable-wide-getaddrinfo,"
> +PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
>
>  EXTRA_AUTORECONF += "--exclude=aclocal"
>
> --
> 2.23.0.rc1
>
> --
> ___
> 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


[OE-core] [PATCH 2/4] oe-selftest: extend virgl gtk test to also check the SDL option

2019-09-17 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 meta/lib/oeqa/selftest/cases/runtime_test.py | 17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py 
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 3f212bd0eac..8f98a9ead46 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -166,9 +166,9 @@ class TestImage(OESelftestTestCase):
 bitbake('core-image-full-cmdline socat')
 bitbake('-c testimage core-image-full-cmdline')
 
-def test_testimage_virgl_gtk(self):
+def test_testimage_virgl_gtk_sdl(self):
 """
-Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk frontend
+Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk and SDL frontends
 Expected: 1. Check that virgl kernel driver is loaded and 3d 
acceleration is enabled
   2. Check that kmscube demo runs without crashing.
 Product: oe-core
@@ -181,18 +181,27 @@ class TestImage(OESelftestTestCase):
 self.skipTest('virgl isn\'t working with Debian 8')
 
 qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')
 features = 'INHERIT += "testimage"\n'
 if 'gtk+' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
gtk+"\n'
+if 'sdl' not in qemu_packageconfig:
+features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n'
 if 'virglrenderer' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
virglrenderer"\n'
 if 'glx' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+if 'opengl' not in sdl_packageconfig:
+features += 'PACKAGECONFIG_append_pn-libsdl2-native = " opengl"\n'
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
-features += 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
-self.write_config(features)
+features_gtk = features + 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
+self.write_config(features_gtk)
+bitbake('core-image-minimal')
+bitbake('-c testimage core-image-minimal')
+features_sdl = features + 'TEST_RUNQEMUPARAMS = "sdl gl"\n'
+self.write_config(features_sdl)
 bitbake('core-image-minimal')
 bitbake('-c testimage core-image-minimal')
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 4/4] strace: add a timeout for running ptests

2019-09-17 Thread Alexander Kanavin
5.2 kernel has introduced a significant performance regression
where some of the tests take many minutes to complete (where
previously it was seconds). While we're getting to the bottom
of the issue and working with upstream to resove it, this
change allows tests to proceed instead of getting stuck and
eventually timing out.

https://bugzilla.yoctoproject.org/show_bug.cgi?id=13506

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-devtools/strace/strace/run-ptest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/strace/strace/run-ptest 
b/meta/recipes-devtools/strace/strace/run-ptest
index 8070d831799..2fed984e901 100755
--- a/meta/recipes-devtools/strace/strace/run-ptest
+++ b/meta/recipes-devtools/strace/strace/run-ptest
@@ -1,2 +1,3 @@
 #!/bin/sh
+export TIMEOUT_DURATION=30
 make -B -C tests -k test-suite.log
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 3/4] runqemu: unset another environment variable for 'egl-headless'

2019-09-17 Thread Alexander Kanavin
Some host distributions (opensuse for example) are using 'pkgconf',
which, unlike the original pkg-config, appends PKG_CONFIG_SYSROOT_DIR
to every directory from the .pc file.

Signed-off-by: Alexander Kanavin 
---
 scripts/runqemu | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/runqemu b/scripts/runqemu
index 18091a29c3b..3ebe9d66ff8 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -461,6 +461,7 @@ class BaseConfig(object):
 del os.environ['PKG_CONFIG_PATH']
 del os.environ['PKG_CONFIG_DIR']
 del os.environ['PKG_CONFIG_LIBDIR']
+del os.environ['PKG_CONFIG_SYSROOT_DIR']
 except KeyError:
 pass
 try:
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/4] runqemu: add options that enable virgl with the SDL frontend

2019-09-17 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 scripts/runqemu | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 68ba7dcfb94..18091a29c3b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -67,9 +67,9 @@ of the following environment variables (in any order):
 nographic - disable video console
 sdl - choose the SDL UI frontend
 gtk - choose the Gtk UI frontend
-gl - enable virgl-based GL acceleration (also needs gtk option)
-gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs 
gtk option)
-egl-headless - enable headless EGL output; use vnc or spice to see it
+gl - enable virgl-based GL acceleration (also needs gtk or sdl options)
+gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs 
gtk or sdl options)
+egl-headless - enable headless EGL output; use vnc (via publicvnc option) 
or spice to see it
 serial - enable a serial console on /dev/ttyS0
 serialstdio - enable a serial console on the console (regardless of 
graphics mode)
 slirp - enable user networking, no root privileges is required
@@ -436,7 +436,12 @@ class BaseConfig(object):
 self.qemu_opt_script += ' -nographic'
 self.kernel_cmdline_script += ' console=ttyS0'
 elif arg == 'sdl':
-self.qemu_opt_script += ' -display sdl'
+if 'gl' in sys.argv[1:]:
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=on'
+elif 'gl-es' in sys.argv[1:]:
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=es'
+else:
+self.qemu_opt_script += ' -display sdl'
 elif arg == 'gtk':
 if 'gl' in sys.argv[1:]:
 self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 3/3] oe-selftest: extend virgl gtk test to also check the SDL option

2019-09-13 Thread Alexander Kanavin
On Fri, 13 Sep 2019 at 21:15, Ross Burton  wrote:

> On 12/09/2019 16:36, Alexander Kanavin wrote:
> > -def test_testimage_virgl_gtk(self):
> > +def test_testimage_virgl_gtk_sdl(self):
>
> Failing on the autobuilder:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/707/steps/8/logs/step2d
>

Can I see the following two please?

WARNING: core-image-minimal-1.0-r0 do_testimage: Check full boot log:
/home/pokybuild/yocto-worker/oe-selftest/build/build-st-31169/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/testimage/qemu_boot_log.20190913155532
ERROR: Logfile of failure stored in:
/home/pokybuild/yocto-worker/oe-selftest/build/build-st-31169/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_testimage.45597

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/3] runqemu: decouple gtk and gl options

2019-09-12 Thread Alexander Kanavin
This will allow not having to multiply these options for the sdl
frontend, instead combining them as needed.

Signed-off-by: Alexander Kanavin 
---
 meta/lib/oeqa/selftest/cases/runtime_test.py |  2 +-
 scripts/runqemu  | 21 +---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py 
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 20969d2c48a..3f212bd0eac 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -191,7 +191,7 @@ class TestImage(OESelftestTestCase):
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
-features += 'TEST_RUNQEMUPARAMS = "gtk-gl"\n'
+features += 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
 self.write_config(features)
 bitbake('core-image-minimal')
 bitbake('-c testimage core-image-minimal')
diff --git a/scripts/runqemu b/scripts/runqemu
index 4415e9b69f8..68ba7dcfb94 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -65,9 +65,10 @@ of the following environment variables (in any order):
   MACHINE - the machine name (optional, autodetected from KERNEL filename if 
unspecified)
   Simplified QEMU command-line options can be passed with:
 nographic - disable video console
-sdl - choose the SDL frontend instead of the Gtk+ default
-gtk-gl - enable virgl-based GL acceleration using Gtk+ frontend
-gtk-gl-es - enable virgl-based GL acceleration, using OpenGL ES and Gtk+ 
frontend
+sdl - choose the SDL UI frontend
+gtk - choose the Gtk UI frontend
+gl - enable virgl-based GL acceleration (also needs gtk option)
+gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs 
gtk option)
 egl-headless - enable headless EGL output; use vnc or spice to see it
 serial - enable a serial console on /dev/ttyS0
 serialstdio - enable a serial console on the console (regardless of 
graphics mode)
@@ -436,10 +437,16 @@ class BaseConfig(object):
 self.kernel_cmdline_script += ' console=ttyS0'
 elif arg == 'sdl':
 self.qemu_opt_script += ' -display sdl'
-elif arg == 'gtk-gl':
-self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
-elif arg == 'gtk-gl-es':
-self.qemu_opt_script += ' -vga virtio -display gtk,gl=es'
+elif arg == 'gtk':
+if 'gl' in sys.argv[1:]:
+self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
+elif 'gl-es' in sys.argv[1:]:
+self.qemu_opt_script += ' -vga virtio -display gtk,gl=es'
+else:
+self.qemu_opt_script += ' -display gtk'
+elif arg == 'gl' or arg == 'gl-es':
+# These args are handled inside sdl or gtk blocks above
+pass
 elif arg == 'egl-headless':
 self.qemu_opt_script += ' -vga virtio -display egl-headless'
 # As runqemu can be run within bitbake (when using testimage, 
for example),
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 3/3] oe-selftest: extend virgl gtk test to also check the SDL option

2019-09-12 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 meta/lib/oeqa/selftest/cases/runtime_test.py | 17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py 
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 3f212bd0eac..8f98a9ead46 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -166,9 +166,9 @@ class TestImage(OESelftestTestCase):
 bitbake('core-image-full-cmdline socat')
 bitbake('-c testimage core-image-full-cmdline')
 
-def test_testimage_virgl_gtk(self):
+def test_testimage_virgl_gtk_sdl(self):
 """
-Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk frontend
+Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk and SDL frontends
 Expected: 1. Check that virgl kernel driver is loaded and 3d 
acceleration is enabled
   2. Check that kmscube demo runs without crashing.
 Product: oe-core
@@ -181,18 +181,27 @@ class TestImage(OESelftestTestCase):
 self.skipTest('virgl isn\'t working with Debian 8')
 
 qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')
 features = 'INHERIT += "testimage"\n'
 if 'gtk+' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
gtk+"\n'
+if 'sdl' not in qemu_packageconfig:
+features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n'
 if 'virglrenderer' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
virglrenderer"\n'
 if 'glx' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+if 'opengl' not in sdl_packageconfig:
+features += 'PACKAGECONFIG_append_pn-libsdl2-native = " opengl"\n'
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
-features += 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
-self.write_config(features)
+features_gtk = features + 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
+self.write_config(features_gtk)
+bitbake('core-image-minimal')
+bitbake('-c testimage core-image-minimal')
+features_sdl = features + 'TEST_RUNQEMUPARAMS = "sdl gl"\n'
+self.write_config(features_sdl)
 bitbake('core-image-minimal')
 bitbake('-c testimage core-image-minimal')
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/3] runqemu: add options that enable virgl with the SDL frontend

2019-09-12 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 scripts/runqemu | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 68ba7dcfb94..18091a29c3b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -67,9 +67,9 @@ of the following environment variables (in any order):
 nographic - disable video console
 sdl - choose the SDL UI frontend
 gtk - choose the Gtk UI frontend
-gl - enable virgl-based GL acceleration (also needs gtk option)
-gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs 
gtk option)
-egl-headless - enable headless EGL output; use vnc or spice to see it
+gl - enable virgl-based GL acceleration (also needs gtk or sdl options)
+gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs 
gtk or sdl options)
+egl-headless - enable headless EGL output; use vnc (via publicvnc option) 
or spice to see it
 serial - enable a serial console on /dev/ttyS0
 serialstdio - enable a serial console on the console (regardless of 
graphics mode)
 slirp - enable user networking, no root privileges is required
@@ -436,7 +436,12 @@ class BaseConfig(object):
 self.qemu_opt_script += ' -nographic'
 self.kernel_cmdline_script += ' console=ttyS0'
 elif arg == 'sdl':
-self.qemu_opt_script += ' -display sdl'
+if 'gl' in sys.argv[1:]:
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=on'
+elif 'gl-es' in sys.argv[1:]:
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=es'
+else:
+self.qemu_opt_script += ' -display sdl'
 elif arg == 'gtk':
 if 'gl' in sys.argv[1:]:
 self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH v3] rpm: make rpm work in toolchain.

2019-09-12 Thread Alexander Kanavin
Thanks, I think this looks more or less correct now.

Alex

On Thu, 12 Sep 2019 at 09:53, Zheng Ruoqin 
wrote:

> We need to configure rpm to use package architecture from yocto build
> system.
>
> Install rpmrc and rpm/platform to ${SDKTARGETSYSROOT} because config file
> in host-sysroot as /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux
> will be covered by another ARCH which result in previous config settings
> inefficacy.
>
> To resolve it, put config file in target-sysroot like
> /opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its
> own target-sysroot, config file will not be covered.
>
> Signed-off-by: Zheng Ruoqin 
> ---
>  meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 16 
>  1 file changed, 16 insertions(+)
>
> diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> index 063f4269a5..5634f6702f 100644
> --- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> +++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> @@ -102,6 +102,9 @@ do_install_append_class-native() {
>  done
>  }
>
> +REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}-${DISTRO}-${TARGET_OS}"
> +SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
> +
>  do_install_append_class-nativesdk() {
>  for tool in ${WRAPPER_TOOLS}; do
>  create_wrapper ${D}$tool \
> @@ -112,6 +115,17 @@ do_install_append_class-nativesdk() {
>  done
>
>  rm -rf ${D}/var
> +install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
> +
> +cat >${D}/${SDKTARGETSYSROOT}/etc/rpmrc < +arch_compat: ${MACHINE_ARCH}: all any noarch ${PACKAGE_EXTRA_ARCHS}
> +EOF
> +
> +# Arch Info should be fixed as '-' is instead of '_'.
> +sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +cat >${D}/${SDKTARGETSYSROOT}/etc/rpm/platform < +${MACHINE_ARCH}-pc-linux
> +EOF
>  }
>
>  # Rpm's make install creates var/tmp which clashes with base-files
> packaging
> @@ -133,6 +147,8 @@ FILES_${PN} += "${libdir}/rpm-plugins/*.so \
>
>  FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \
>  "
> +FILES_${PN}_append_class-nativesdk += "${SDKTARGETSYSROOT}"
> +
>
>  PACKAGES += "python3-rpm"
>  PROVIDES += "python3-rpm"
> --
> 2.17.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] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-11 Thread Alexander Kanavin
On Wed, 11 Sep 2019 at 14:35, Ross Burton  wrote:

>
> See I knew that but had blocked it out because it's so horrible.
>
> One day we need to sit down with upstream Python and figure out how to
> handle cross-compilation properly.
>
> I finally managed to make my own builds fail (had to turn off Python in
> libxml2) and beat at it to build without a target Python.  Fabio: can
> you try building Mesa with these two patches:
>
>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=ross/mut=5f3559d8bb61212e0f9a6543f2dce2bdf77c48b5
>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=ross/mut=4f8995aaa2ec557a0603ddc664d929317b0c0b6e
>

I have to say, the latter patch is rather ugly. It would be better to split
python3native class into two: python3native (just for running scripts, does
not depend on target python3), and python3target (for actually obtaining
information about the target configuration, does need target python3).
Until then, I'd just pull in target python, for simplicity's sake (also
there's one or two recipes where the same meson problem happens).

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-10 Thread Alexander Kanavin
The best way is like in your latest patch - inherit python3native and
DEPENDS = "python3". No need for further tweaks, why did you try them?

Alex

On Tue, 10 Sep 2019 at 15:59, Fabio Berton 
wrote:

> Adding python3-native doesn't work.
>
> Hmm... it seems that adding "export STAGING_LIBDIR =
> "${STAGING_LIBDIR_NATIVE}"" and removing python3 from DEPENDS worked.
>
> Alexander, I don't know what is the best way to do this, maybe you can
> help here.
>
> Thanks!
>
> On Tue, Sep 10, 2019 at 7:40 AM Alexander Kanavin
>  wrote:
> >
> > On Tue, 10 Sep 2019 at 11:50, Ross Burton  wrote:
> >>
> >> On 09/09/2019 19:41, Alexander Kanavin wrote:
> >> > and find_installation() method of meson does not merely look for the
> >> > native python binary, it runs the binary with a meson-supplied python
> >> > script designed to obtain all sorts of information, including
> >> > target-specific things that we patch native python to report. If the
> >> > target python installation is not present in sysroot, the script will
> >> > fail, and meson will declare that 'there is no valid installation of
> >> > python on your system'.
> >>
> >> So the python3-native pokes around the target python3 to get the right
> >> values?
> >
> >
> > Yes, if STAGING_LIBDIR is set, via this patch:
> >
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
> >
> > (don't shoot the pianist, it was working like this pre-rewrite as well).
> >
> > Alex
> > --
> > ___
> > 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] rpm: make rpm work in toolchain.

2019-09-10 Thread Alexander Kanavin
On Tue, 10 Sep 2019 at 13:56, Zheng, Ruoqin 
wrote:

> 3. Actually, my first plan  is to write ${MACHINE_ARCH} in toolchain, but
> it was rejected
>
> +++ b/meta/classes/toolchain-scripts.bbclass
>
> @@ -101,6 +101,7 @@ toolchain_shared_env_script () {
>
> echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
>
> echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
>
> echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
>
> +   echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
>
> echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
>
>
>
> I guess if it can work, maybe post-relocate-setup.d/ facility will be
> usefull.
>

What I would like to avoid is placing rpm-specific things into SDK recipes
that have nothing to do with rpm. So please investigate
post-relocate-setup.d/, and if it is not good enough, we can perhaps extend
it.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-10 Thread Alexander Kanavin
On Tue, 10 Sep 2019 at 10:07, Zheng, Ruoqin 
wrote:

> In last patch, I put the config file in meta-environment as its do_install
> task is in the target environment which means the value of ${PACKAGE_ARCHS}
> is right.
>
> And it finally produce a nativesdk package.
>
>
>
> If I put the config file in nativesdk-rpm, the value of ${PACKAGE_ARCHS}
> will always be “all any noarch x86_64-nativesdk” which is not suitable for
> x86, arm and other ARCHS.
>
>
>
> So I’d like to put config file in the rpm of meta-environment. Did you
> have any good Suggestions?
>

You probably need to use the post-relocate-setup.d/ facility, like the
nativesdk-meson recipe does. I am not sure if PACKAGE_ARCHS is accessible
from it, but it does seem like the right mechanism for tweaking settings
that are specific to nativesdk packages.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-10 Thread Alexander Kanavin
On Tue, 10 Sep 2019 at 11:50, Ross Burton  wrote:

> On 09/09/2019 19:41, Alexander Kanavin wrote:
> > and find_installation() method of meson does not merely look for the
> > native python binary, it runs the binary with a meson-supplied python
> > script designed to obtain all sorts of information, including
> > target-specific things that we patch native python to report. If the
> > target python installation is not present in sysroot, the script will
> > fail, and meson will declare that 'there is no valid installation of
> > python on your system'.
>
> So the python3-native pokes around the target python3 to get the right
> values?
>

Yes, if STAGING_LIBDIR is set, via this patch:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch

(don't shoot the pianist, it was working like this pre-rewrite as well).

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-09 Thread Alexander Kanavin
On Mon, 9 Sep 2019 at 18:49, Ross Burton  wrote:

> > As I had previously suggested... can you try adding 'python3' to DEPENDS
> > of mesa, and see if that helps please? I think that would allow avoiding
> > this patch altogether.
>
> So why does Meson need *target* Python to be present when building Mesa?
>

Because mesa does this:

prog_python = import('python').find_installation('python3')

and find_installation() method of meson does not merely look for the native
python binary, it runs the binary with a meson-supplied python script
designed to obtain all sorts of information, including target-specific
things that we patch native python to report. If the target python
installation is not present in sysroot, the script will fail, and meson
will declare that 'there is no valid installation of python on your system'.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-09 Thread Alexander Kanavin
Thanks, now it's future-proof :)

Alex

On Mon, 9 Sep 2019 at 16:54, Fabio Berton 
wrote:

> Hi Alexander!
>
> I sent a v2 with python3 in depends and dropped the patch.
>
> Thanks!
>
> On Fri, Sep 6, 2019 at 5:33 PM Alexander Kanavin 
> wrote:
> >
> > On Fri, 6 Sep 2019 at 22:12, Otavio Salvador <
> otavio.salva...@ossystems.com.br> wrote:
> >>
> >> > As I had previously suggested... can you try adding 'python3' to
> DEPENDS of mesa, and see if that helps please? I think that would allow
> avoiding this patch altogether.
> >>
> >> Why a new build dependency if this works just fine?
> >
> >
> > 1. Less patches is always better than more patches, especially if they
> are non-upstreamable.
> >
> > 2. The patch reverts to something that meson has deprecated and will
> likely remove in the future.
> >
> https://github.com/mesonbuild/meson/blob/master/docs/markdown/Python-3-module.md
> >
> > 3. Meson's currently supported way of detecting python does in fact rely
> on python's target configuration being available, as it picks up settings
> from it. I had fixed a similar issue elsewhere recently.
> >
> > Alex
> >
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Alexander Kanavin
On Mon, 9 Sep 2019 at 13:19, Zheng, Ruoqin 
wrote:

> ->What do these two sed commands do? If we create /etc/rpmrc just above,
> can it have the right content from the beginning?
>
>
>
> Well, in the environment in Yocto Build system, the value of
> ${PACKAGE_ARCHS} include “–nativesdk” as not needed in SDK environment.
>
> And the ARCH name of core2-64 rpm is core2_64 like
> rpm-4.14.2.1-r0.core2_64.rpm.
>
> So I modify the ARCH name in etc/rpmrc.
>

Thanks, can you put a comment in front of the sed commands explaining that?
It would be useful to anyone who reads the recipe.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Alexander Kanavin
On Mon, 9 Sep 2019 at 13:08, Zheng, Ruoqin 
wrote:

> I'd like to explain the path ${SDKTARGETSYSROOT} in this patch.
>
> As you see, ${SDKTARGETSYSROOT} for x86_64 is
> /opt/poky/2.7+snapshot/sysroots/core2-64-pokysdk-linux.
>
> I make it because config file in host-sysroot as
> /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux  will be covered by
> another ARCH.
> For example, first install SDK for x86_64, and next install SDK for x86,
> as host-sysroot is same, the same config file will be covered. In that case
> config settings for x86_64 will be inefficacy.
>
> To resolve that problem, I put config file in target-sysroot like
> /opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its
> own target-sysroot, config file will not be covered.
>

I see, thanks. Can you add this information to the patch please?

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Alexander Kanavin
On Mon, 9 Sep 2019 at 12:58, Zheng Ruoqin 
wrote:

>  rm -rf ${D}/var
> +install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
>

Why not simply ${D}/etc/rpm?


> +sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
>

What do these two sed commands do? If we create /etc/rpmrc just above, can
it have the right content from the beginning?
  "

> +FILES_${PN}_append_class-nativesdk += "${SDKTARGETSYSROOT}"
>

Same question: why is ${SDKTARGETSYSROOT} needed? The configuration files
should be in /etc, and rpm should be instructed to pick them up from there,
same way as it is done for -native variant when building an image.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-06 Thread Alexander Kanavin
On Fri, 6 Sep 2019 at 22:12, Otavio Salvador <
otavio.salva...@ossystems.com.br> wrote:

> > As I had previously suggested... can you try adding 'python3' to DEPENDS
> of mesa, and see if that helps please? I think that would allow avoiding
> this patch altogether.
>
> Why a new build dependency if this works just fine?
>

1. Less patches is always better than more patches, especially if they are
non-upstreamable.

2. The patch reverts to something that meson has deprecated and will likely
remove in the future.
https://github.com/mesonbuild/meson/blob/master/docs/markdown/Python-3-module.md

3. Meson's currently supported way of detecting python does in fact rely on
python's target configuration being available, as it picks up settings from
it. I had fixed a similar issue elsewhere recently.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-06 Thread Alexander Kanavin
On Fri, 6 Sep 2019 at 20:47, Fabio Berton 
wrote:

> +Subject: [PATCH] Revert "meson: Improve detection of Python when using
> Meson
> + >=0.50."
> +Organization: O.S. Systems Software LTDA.
> +
> +This reverts commit cb3072488cd327155206e92d1ad8eb72a23ab04e.
> +
> +Upstream-Status: Inappropriate [embedded specific]
> +
> +This change need to be fix upstream. As a workaround revert this
> +commit to prevent blocking update mesa recipe.
> +
> +Without this we get this error:
> +
> +/---
> +|meson.build:765:2: ERROR: 
> +|['../build/tmp/work/cortexa9hf-neon-imx-oel-linux-gnueabi/
> +|mesa/2_19.1.6-r0/recipe-sysroot-native/usr/bin/python3-native/python3']>
> +|is not a valid python or it is missing setuptools
> +\---
>

As I had previously suggested... can you try adding 'python3' to DEPENDS of
mesa, and see if that helps please? I think that would allow avoiding this
patch altogether.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 1/5] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

2019-09-06 Thread Alexander Kanavin
I think the native dsitro features should still be in lockstep with target
distro features, for simplicity's sake. For example here, we enable native
opengl support only if the target also will have it. If the host system
can't handle opengl, then there'll be a runtime error from qemu.

Trying to manage native distro features according to what the host system
can do sounds like a lot of complexity, I'd rather just install missing
packages on the host, or print runtime/test time errors.

Alex

On Fri, 6 Sep 2019 at 16:26, Khem Raj  wrote:

>
>
> On Fri, Sep 6, 2019 at 4:18 AM Alexander Kanavin 
> wrote:
>
>> This will allow better control over native virgl/qemu configurations.
>>
>> Adjust gtk+3/cairo native configurations to actually ignore opengl
>> when building for -native: we do not need it, and it would cause build
>> failures as only a limited subset of mesa-native is currently built.
>>
>> Drop native/nativesdk overrides from virglrenderer/libepoxy recipes
>> as opengl feature is now correctly set for those variants.
>>
>> Signed-off-by: Alexander Kanavin 
>> ---
>>  meta/conf/bitbake.conf | 4 ++--
>>  meta/recipes-gnome/gtk+/gtk+3.inc  | 2 ++
>>  meta/recipes-graphics/cairo/cairo_1.16.0.bb| 2 ++
>>  meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb   | 2 --
>>  meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb | 2 --
>>  5 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>> index a0a7f4911e0..d36f4c6ccef 100644
>> --- a/meta/conf/bitbake.conf
>> +++ b/meta/conf/bitbake.conf
>> @@ -824,8 +824,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
>>
>>  # Normally target distro features will not be applied to native builds:
>>  # Native distro features on this list will use the target feature value
>> -DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
>> -DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
>> +DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"
>> +DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"
>>
>>  DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit
>> gobject-introspection-data ldconfig"
>>  MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
>> diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc
>> b/meta/recipes-gnome/gtk+/gtk+3.inc
>> index 77b6c31536b..2f9e05b1cd4 100644
>> --- a/meta/recipes-gnome/gtk+/gtk+3.inc
>> +++ b/meta/recipes-gnome/gtk+/gtk+3.inc
>> @@ -47,6 +47,8 @@ do_compile_prepend() {
>>
>>  PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland
>> x11', d)} \
>> ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11',
>> 'glx', '', d)}"
>> +PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES',
>> 'x11', d)}"
>> +PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES',
>> 'x11', d)}"
>>
>
> Should we extend distro features to non target recipes as well I wonder
> since I might have a development system which has full x11 and capable of
> running GTK with X11 but target maybe not will
> So is distro feature in someway related in these
> Different classes of recipes ?
>
>>
>>  PACKAGECONFIG[x11] =
>> "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11
>> libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite
>> libxfixes"
>>  # this is provided by oe-core patch that removes epoxy/gl dependency
>> from a X11 build
>> diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
>> b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
>> index f32e9ba1bcd..84c7b0adde9 100644
>> --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
>> +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
>> @@ -41,6 +41,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
>>  PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}
>> \
>> ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11
>> xcb', '', d)} \
>> ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl',
>> 'opengl', '', d)}"
>> +PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES',
>> 'x11', 'x11 xcb', '', d)}"
>> +PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES',
>> 'x11', 'x11 xcb', '', d)}"
>>
>>  PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-

[OE-core] [PATCH 5/5] oe-selftest: extend virgl gtk test to also check the SDL option

2019-09-06 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 meta/lib/oeqa/selftest/cases/runtime_test.py | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py 
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 7b48fe562ef..d8698f37375 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -166,9 +166,9 @@ class TestImage(OESelftestTestCase):
 bitbake('core-image-full-cmdline socat')
 bitbake('-c testimage core-image-full-cmdline')
 
-def test_testimage_virgl_gtk(self):
+def test_testimage_virgl_gtk_sdl(self):
 """
-Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk frontend
+Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk and SDL frontends
 Expected: 1. Check that virgl kernel driver is loaded and 3d 
acceleration is enabled
   2. Check that kmscube demo runs without crashing.
 Product: oe-core
@@ -185,13 +185,19 @@ class TestImage(OESelftestTestCase):
 features = 'INHERIT += "testimage"\n'
 if 'gtk+' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
gtk+"\n'
+if 'sdl' not in qemu_packageconfig:
+features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n'
 if 'opengl' not in qemu_distrofeatures:
 features += 'DISTRO_FEATURES_append = " opengl"\n'
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
-features += 'TEST_RUNQEMUPARAMS = "gtk-gl"\n'
-self.write_config(features)
+features_gtk = features + 'TEST_RUNQEMUPARAMS = "gtk-gl"\n'
+self.write_config(features_gtk)
+bitbake('core-image-minimal')
+bitbake('-c testimage core-image-minimal')
+features_sdl = features + 'TEST_RUNQEMUPARAMS = "sdl-gl"\n'
+self.write_config(features_sdl)
 bitbake('core-image-minimal')
 bitbake('-c testimage core-image-minimal')
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 4/5] runqemu: add options that enable virgl with the SDL frontend

2019-09-06 Thread Alexander Kanavin
Also, add an option to use Gtk without virgl acceleration.

Signed-off-by: Alexander Kanavin 
---
 scripts/runqemu | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index b5200106244..80d59424d78 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -65,9 +65,12 @@ of the following environment variables (in any order):
   MACHINE - the machine name (optional, autodetected from KERNEL filename if 
unspecified)
   Simplified QEMU command-line options can be passed with:
 nographic - disable video console
-sdl - choose the SDL frontend instead of the Gtk+ default
-gtk-gl - enable virgl-based GL acceleration using Gtk+ frontend
-gtk-gl-es - enable virgl-based GL acceleration, using OpenGL ES and Gtk+ 
frontend
+sdl - choose the SDL frontend without GL acceleration
+sdl-gl - enable virgl-based GL acceleration using SDL frontend
+sdl-gl-es - enable virgl-based GL acceleration, using OpenGL ES and SDL 
frontend
+gtk - choose the Gtk frontend without GL acceleration
+gtk-gl - enable virgl-based GL acceleration using Gtk frontend
+gtk-gl-es - enable virgl-based GL acceleration, using OpenGL ES and Gtk 
frontend
 egl-headless - enable headless EGL output; use vnc or spice to see it
 serial - enable a serial console on /dev/ttyS0
 serialstdio - enable a serial console on the console (regardless of 
graphics mode)
@@ -436,6 +439,12 @@ class BaseConfig(object):
 self.kernel_cmdline_script += ' console=ttyS0'
 elif arg == 'sdl':
 self.qemu_opt_script += ' -display sdl'
+elif arg == 'sdl-gl':
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=on'
+elif arg == 'sdl-gl-es':
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=es'
+elif arg == 'gtk':
+self.qemu_opt_script += ' -display gtk'
 elif arg == 'gtk-gl':
 self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
 elif arg == 'gtk-gl-es':
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/5] libsdl2: enable opengl option for native/nativesdk, subject to 'opengl' in DISTRO_FEATURES

2019-09-06 Thread Alexander Kanavin
This allows virgl support in qemu with the SDL frontend

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb 
b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
index 3a0654b866b..0d8d724374e 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
@@ -40,8 +40,8 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
 # and BSP layers to pick either (desktop) opengl, gles2, or no GL
 PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
 
-PACKAGECONFIG_class-native = "x11"
-PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', 
d)}"
+PACKAGECONFIG_class-native = "x11 ${PACKAGECONFIG_GL}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', 
d)} ${PACKAGECONFIG_GL}"
 PACKAGECONFIG ??= " \
 ${PACKAGECONFIG_GL} \
 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/5] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

2019-09-06 Thread Alexander Kanavin
This will allow better control over native virgl/qemu configurations.

Adjust gtk+3/cairo native configurations to actually ignore opengl
when building for -native: we do not need it, and it would cause build
failures as only a limited subset of mesa-native is currently built.

Drop native/nativesdk overrides from virglrenderer/libepoxy recipes
as opengl feature is now correctly set for those variants.

Signed-off-by: Alexander Kanavin 
---
 meta/conf/bitbake.conf | 4 ++--
 meta/recipes-gnome/gtk+/gtk+3.inc  | 2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb| 2 ++
 meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb   | 2 --
 meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a0a7f4911e0..d36f4c6ccef 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -824,8 +824,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data 
ldconfig"
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc 
b/meta/recipes-gnome/gtk+/gtk+3.inc
index 77b6c31536b..2f9e05b1cd4 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -47,6 +47,8 @@ do_compile_prepend() {
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', 
d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 
'glx', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', 
d)}"
 
 PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk 
fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender 
libxcomposite libxfixes"
 # this is provided by oe-core patch that removes epoxy/gl dependency from a 
X11 build
diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb 
b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
index f32e9ba1bcd..84c7b0adde9 100644
--- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -41,6 +41,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', 
'', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 
'opengl', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 
'x11 xcb', '', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 
'x11', 'x11 xcb', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no 
--disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb 
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
index c8d1650c637..5d7639a929e 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
@@ -14,8 +14,6 @@ UPSTREAM_CHECK_URI = 
"https://github.com/anholt/libepoxy/releases;
 inherit meson pkgconfig distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
 
 PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl"
 PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl"
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb 
b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb
index d2b11c103a3..65365eb900a 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb
@@ -17,5 +17,3 @@ inherit autotools pkgconfig distro_features_check
 BBCLASSEXTEND = "native nativesdk"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 3/5] qemu: enable virglrenderer and glx options subject to 'opengl' DISTRO_FEATURE

2019-09-06 Thread Alexander Kanavin
Note that to actually use accelerated GL passthrough, there are two options

1) a suitable frontend need to be also enabled - gtk+ and SDL both seem to work 
well.
Previously I struggled to make SDL work, but now it seems fine.

2) it is also possible to render off-screen with -display egl-headless option,
and see the output with a VNC viewer (for which, qemu needs to be started
with a VNC server):

$ runqemu kvm egl-headless publicvnc

Signed-off-by: Alexander Kanavin 
---
 meta/lib/oeqa/selftest/cases/runtime_test.py  | 15 ++-
 .../qemu/qemu-system-native_4.1.0.bb  |  4 +++-
 meta/recipes-devtools/qemu/qemu_4.1.0.bb  |  5 -
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py 
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 20969d2c48a..7b48fe562ef 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -181,13 +181,12 @@ class TestImage(OESelftestTestCase):
 self.skipTest('virgl isn\'t working with Debian 8')
 
 qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 
'qemu-system-native')
 features = 'INHERIT += "testimage"\n'
 if 'gtk+' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
gtk+"\n'
-if 'virglrenderer' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
virglrenderer"\n'
-if 'glx' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+if 'opengl' not in qemu_distrofeatures:
+features += 'DISTRO_FEATURES_append = " opengl"\n'
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
@@ -215,12 +214,10 @@ class TestImage(OESelftestTestCase):
 dripath = subprocess.check_output("pkg-config 
--variable=dridriverdir dri", shell=True)
 except subprocess.CalledProcessError as e:
 self.skipTest("Could not determine the path to dri drivers on the 
host via pkg-config.\nPlease install Mesa development files (particularly, 
dri.pc) on the host machine.")
-qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 
'qemu-system-native')
 features = 'INHERIT += "testimage"\n'
-if 'virglrenderer' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
virglrenderer"\n'
-if 'glx' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+if 'opengl' not in qemu_distrofeatures:
+features += 'DISTRO_FEATURES_append = " opengl"\n'
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb 
b/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
index d83ee59375c..7394385d30b 100644
--- a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
@@ -9,7 +9,9 @@ DEPENDS = "glib-2.0-native zlib-native pixman-native 
qemu-native bison-native"
 
 EXTRA_OECONF_append = " --target-list=${@get_qemu_system_target_list(d)}"
 
-PACKAGECONFIG ??= "fdt alsa kvm"
+PACKAGECONFIG ??= "fdt alsa kvm \
+${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' 
,d)} \
+"
 
 # Handle distros such as CentOS 5 32-bit that do not have kvm support
 PACKAGECONFIG_remove = "${@'kvm' if not 
os.path.exists('/usr/include/linux/kvm.h') else ''}"
diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb 
b/meta/recipes-devtools/qemu/qemu_4.1.0.bb
index f0c1daabe15..a4018cc4485 100644
--- a/meta/recipes-devtools/qemu/qemu_4.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_4.1.0.bb
@@ -21,5 +21,8 @@ do_install_append_class-nativesdk() {
 PACKAGECONFIG ??= " \
 fdt sdl kvm \
 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' 
,d)} \
+"
+PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm \
+${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' 
,d)} \
 "
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 0/5] virgl: add SDL support and enable by default

2019-09-06 Thread Alexander Kanavin
This patchset adds two enhancements to qemu virgl support (which is
a virtualized accelerated 3D graphics support for the qemu guests):

1. SDL qemu frontend now comes with virgl fully enabled and working
(over ssh X11 forwarding as well!), so using the gtk frontend
is no longer necessary. 'oe-selftest' is adjusted to test both
frontends.

2. virgl itself is enabled by default in qemu, when 'opengl' is in
DISTRO_FEATURES. This adds a few native dependencies to qemu-system-native
(particularly, libdrm, virglrenderer and a special minimal configuration
of mesa-native). I tested the impact on build times: it is about 25-30
seconds on a 16 core machine. 'bitbake core-image-minimal' goes from
26m45 to 27m13.

Gtk qemu frontend remains disabled by default, as it adds more to the build 
times.

The following changes since commit f399b2d73b828f70536857e3e9189b1deb4a4143:

  poky: Use 5.2 kernel by default (2019-09-06 08:25:29 +0100)

are available in the Git repository at:

  git://git.yoctoproject.org/poky-contrib akanavin/qemu-split-virgl-gtk
  
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/qemu-split-virgl-gtk

Alexander Kanavin (5):
  bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk
from target
  libsdl2: enable opengl option for native/nativesdk, subject to
'opengl' in DISTRO_FEATURES
  qemu: enable virglrenderer and glx options subject to 'opengl'
DISTRO_FEATURE
  runqemu: add options that enable virgl with the SDL frontend
  oe-selftest: extend virgl gtk test to also check the SDL option

 meta/conf/bitbake.conf|  4 +--
 meta/lib/oeqa/selftest/cases/runtime_test.py  | 29 ++-
 .../qemu/qemu-system-native_4.1.0.bb  |  4 ++-
 meta/recipes-devtools/qemu/qemu_4.1.0.bb  |  5 +++-
 meta/recipes-gnome/gtk+/gtk+3.inc |  2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb   |  2 ++
 .../libepoxy/libepoxy_1.5.3.bb|  2 --
 .../libsdl2/libsdl2_2.0.10.bb |  4 +--
 .../virglrenderer/virglrenderer_0.8.0.bb  |  2 --
 scripts/runqemu   | 15 --
 10 files changed, 43 insertions(+), 26 deletions(-)

-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] package.bbclass: allow shell-style wildcards in PRIVATE_LIBS

2019-09-06 Thread Alexander Kanavin
PRIVATE_LIBS is used to exclude 'private' libraries from getting added to
automatic runtime dependency resolution. This variable currently has to list
all libraries by name, which becomes a maintenance issue if the list
of such libraries frequently changes, or is very large.

This change allows using shell-style wildcards in the variable, similar
to how FILES lists what gets packaged.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/package.bbclass | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 114d6559f5e..aa8451ffe8b 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1646,7 +1646,8 @@ python package_do_shlibs() {
 prov = (this_soname, ldir, pkgver)
 if not prov in sonames:
 # if library is private (only used by package) then do not 
build shlib for it
-if not private_libs or this_soname not in private_libs:
+import fnmatch
+if not private_libs or len([i for i in private_libs if 
fnmatch.fnmatch(this_soname, i)]) == 0:
 sonames.add(prov)
 if libdir_re.match(os.path.dirname(file)):
 needs_ldconfig = True
@@ -1829,7 +1830,8 @@ python package_do_shlibs() {
 # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on 
system library libfoo.so.1
 # but skipping it is still better alternative than providing own
 # version and then adding runtime dependency for the same system 
library
-if private_libs and n[0] in private_libs:
+import fnmatch
+if private_libs and len([i for i in private_libs if 
fnmatch.fnmatch(n[0], i)]) > 0:
 bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % 
(pkg, n[0]))
 continue
 if n[0] in shlib_provider.keys():
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH V2] python3native, pythonnative: export PYTHON_LIBRARY and PYTHON_INCLUDE_DIR

2019-09-04 Thread Alexander Kanavin
Thanks, this looks good now.

Alex

On Wed, 4 Sep 2019 at 20:49, Khem Raj  wrote:

> packages can use
>
> find_package(PythonInterp REQUIRED)
> find_package(PythonLibs REQUIRED)
>
> while we control PYTHON pointing to native py3 the libs and include
> directories will then point to build host version, which can result in
> unexpected combination and if we are lucky we get errors if its quite
> different e.g. py2 libs/includes and py3 executable
>
> This variable can be then used to export PYTHON_LIBRARY and
> PYTHON_INCLUDE_DIR so that above find_packages can work correctly
>
> see [1] for how it happens in cmake
>
> LLDB uses it see [2]
>
> [1]
> https://github.com/Kitware/CMake/blob/master/Modules/FindPythonLibs.cmake
> [2]
> https://github.com/llvm/llvm-project/blob/master/lldb/cmake/modules/LLDBConfig.cmake#L226
>
> Signed-off-by: Khem Raj 
> ---
> v2: Use PYTHON_DIR variable
>
>  meta/classes/python3native.bbclass | 8 
>  meta/classes/pythonnative.bbclass  | 8 
>  2 files changed, 16 insertions(+)
>
> diff --git a/meta/classes/python3native.bbclass
> b/meta/classes/python3native.bbclass
> index a3acaf61bb..768302488b 100644
> --- a/meta/classes/python3native.bbclass
> +++ b/meta/classes/python3native.bbclass
> @@ -9,6 +9,14 @@ DEPENDS_append = " python3-native "
>  export STAGING_INCDIR
>  export STAGING_LIBDIR
>
> +# Packages can use
> +# find_package(PythonInterp REQUIRED)
> +# find_package(PythonLibs REQUIRED)
> +# which ends up using libs/includes from build host
> +# Therefore pre-empt that effort
> +export PYTHON_LIBRARY="${STAGING_LIBDIR}/${PYTHON_DIR}"
> +export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
> +
>  export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
>
>  # suppress host user's site-packages dirs.
> diff --git a/meta/classes/pythonnative.bbclass
> b/meta/classes/pythonnative.bbclass
> index ae6600cd15..604423b80e 100644
> --- a/meta/classes/pythonnative.bbclass
> +++ b/meta/classes/pythonnative.bbclass
> @@ -12,6 +12,14 @@ DEPENDS_append = " python-native "
>  export STAGING_INCDIR
>  export STAGING_LIBDIR
>
> +# Packages can use
> +# find_package(PythonInterp REQUIRED)
> +# find_package(PythonLibs REQUIRED)
> +# which ends up using libs/includes from build host
> +# Therefore pre-empt that effort
> +export PYTHON_LIBRARY="${STAGING_LIBDIR}/${PYTHON_DIR}"
> +export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
> +
>  # suppress host user's site-packages dirs.
>  export PYTHONNOUSERSITE = "1"
>
> --
> 2.23.0
>
> --
> ___
> 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 2/2] python3native: export PYTHON_LIBRARY and PYTHON_INCLUDE_DIR

2019-09-04 Thread Alexander Kanavin
On Wed, 4 Sep 2019 at 20:10, Khem Raj  wrote:

> +export PYTHON_LIBRARY="${STAGING_LIBDIR}/${PYTHON_BINABI}"
> +export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_BINABI}
>

You need to explain why this is needed. Where are these variables used?

Also, python3-dir.bbclass already has all the needed settings, so please
use it.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 1/2] python3: Expose PYTHON_BINABI in global config metadata

2019-09-04 Thread Alexander Kanavin
On Wed, 4 Sep 2019 at 20:10, Khem Raj  wrote:

>  # llvm version being used, so always bump it with llvm recipe version bump
>  LLVMVERSION ?= "8.0.1"
>
> +# This should be bumped when python3 recipe's MIN_VER is bumped e.g. 3.7
> -> 3.8
> +PYTHON_BINABI = "3.7m"
> +
>

This is already set in python3-dir.bbclass, so please use the values from
there.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] package.bbclass: allow shell-style wildcards in PRIVATE_LIBS

2019-09-04 Thread Alexander Kanavin
On Wed, 4 Sep 2019 at 16:57, Quentin Schulz <
quentin.sch...@streamunlimited.com> wrote:

> > the original code is not adding any lines at all while yours adds eight
> so
> > I'd just keep the patch as it is.
> >
>
> Added lines vs added execution time.
>

I am fairly certain do_package spends the bulk of its time elsewhere, so
you are really optimizing the wrong spot here :)

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] package.bbclass: allow shell-style wildcards in PRIVATE_LIBS

2019-09-04 Thread Alexander Kanavin
On Wed, 4 Sep 2019 at 14:55, Quentin Schulz <
quentin.sch...@streamunlimited.com> wrote:

> So we just need to invert the logic actually.
>
> matched = False
> for pattern in private_libs:
> if fnmatch.fnmatch(this_soname, pattern)]) == 0:
> matched = True
> break
>
> if not matched:
> sonames.add(prov)
>

I think you are looking for the "for...else" feature in Python :) Still,
the original code is not adding any lines at all while yours adds eight so
I'd just keep the patch as it is.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] meta-environment: make rpm and dnf work in toolchain

2019-09-04 Thread Alexander Kanavin
On Wed, 4 Sep 2019 at 03:44, Zheng, Ruoqin 
wrote:

> Thank you for your advice and I have a question.
>
>
>
> 1:-> This does not seem like the right place to me to adjust the settings.
>
>
>
> Well, did you mean that I shouldn’t adjust the settings in
> meta-environment recipe, instead of it, adjust the settings in the
> nativesdk-meson recipe?
>

What I mean is that you take nativesdk-meson recipe as an example of how to
do special configuration for nativesdk, and do similar adjustments to
dnf/rpm recipes. Specifically, the wrapper can set up environment
variables, and the script in post-relocate-setup.d/ can  write
configuration files.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] package.bbclass: allow shell-style wildcards in PRIVATE_LIBS

2019-09-04 Thread Alexander Kanavin
On Wed, 4 Sep 2019 at 09:32, Quentin Schulz <
quentin.sch...@streamunlimited.com> wrote:

> > +++ b/meta/classes/package.bbclass
> > @@ -1646,7 +1646,8 @@ python package_do_shlibs() {
> >  prov = (this_soname, ldir, pkgver)
> >  if not prov in sonames:
> >  # if library is private (only used by package) then
> do not build shlib for it
> > -if not private_libs or this_soname not in
> private_libs:
> > +import fnmatch
> > +if not private_libs or len([i for i in private_libs
> if fnmatch.fnmatch(this_soname, i)]) == 0:
>
> We only need to know if this_soname is matching one of the patterns, we
> don't need to check for each and every pattern.
>
> Something like:
>
> for pattern in private_libs:
> if fnmatch.fnmatch(this_soname, pattern)]) == 0:
> sonames.add(prov)
> break
>
> would be possible?
>

Actually, this suggested code snippet looks altogether wrong to me. We do
need to check the file against every pattern, and only if it matches none
of them, it gets added to sonames. Note the original code says 'this_soname
not in private_libs', which also means going over every item in the list.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] package.bbclass: allow shell-style wildcards in PRIVATE_LIBS

2019-09-04 Thread Alexander Kanavin
On Wed, 4 Sep 2019 at 09:32, Quentin Schulz <
quentin.sch...@streamunlimited.com> wrote:

> >  # if library is private (only used by package) then
> do not build shlib for it
> > -if not private_libs or this_soname not in
> private_libs:
> > +import fnmatch
> > +if not private_libs or len([i for i in private_libs
> if fnmatch.fnmatch(this_soname, i)]) == 0:
>
> We only need to know if this_soname is matching one of the patterns, we
> don't need to check for each and every pattern.
>
> Something like:
>
> for pattern in private_libs:
> if fnmatch.fnmatch(this_soname, pattern)]) == 0:
> sonames.add(prov)
> break
>
> would be possible?
>

Yes, although there should only be very few patterns, and most of the time
just one: *.so*. Not worth it I'd say. There are other spots in do_package
which truly slow down things and could use a bit of optimization.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] package.bbclass: allow shell-style wildcards in PRIVATE_LIBS

2019-09-03 Thread Alexander Kanavin
PRIVATE_LIBS is used to exclude 'private' libraries from getting added to
automatic runtime dependency resolution. This variable currently has to list
all libraries by name, which becomes a maintenance issue if the list
of such libraries frequently changes, or is very large.

This change allows using shell-style wildcards in the variable, similar
to how FILES lists what gets packaged.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/package.bbclass | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 114d6559f5e..aa8451ffe8b 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1646,7 +1646,8 @@ python package_do_shlibs() {
 prov = (this_soname, ldir, pkgver)
 if not prov in sonames:
 # if library is private (only used by package) then do not 
build shlib for it
-if not private_libs or this_soname not in private_libs:
+import fnmatch
+if not private_libs or len([i for i in private_libs if 
fnmatch.fnmatch(this_soname, i)]) == 0:
 sonames.add(prov)
 if libdir_re.match(os.path.dirname(file)):
 needs_ldconfig = True
@@ -1829,7 +1830,8 @@ python package_do_shlibs() {
 # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on 
system library libfoo.so.1
 # but skipping it is still better alternative than providing own
 # version and then adding runtime dependency for the same system 
library
-if private_libs and n[0] in private_libs:
+import fnmatch
+if private_libs and len([i for i in private_libs if 
fnmatch.fnmatch(n[0], i)]) > 0:
 bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % 
(pkg, n[0]))
 continue
 if n[0] in shlib_provider.keys():
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] package.bbclass: add PRIVATE_LIBS_ALL

2019-09-03 Thread Alexander Kanavin
On Tue, 3 Sep 2019 at 17:29, Alexander Kanavin 
wrote:

> PRIVATE_LIBS is used to exclude 'private' libraries from getting added to
> automatic runtime dependency resolution. That variable has to list
> all libraries by name which becomes a maintenance issue if the list
> of such libraries frequently changes, or is very large.
>
> PRIVATE_LIBS_ALL allows declaring all libraries private, either
> for a specific target package (e.g. -ptest), or for all packages
> produced by a recipe.
>

Please discard this, we can use fnmatch.fnmatch(*filename*, *pattern*) to
simply allow wildcards in PRIVATE_LIBS. I will make another patch.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] package.bbclass: add PRIVATE_LIBS_ALL

2019-09-03 Thread Alexander Kanavin
PRIVATE_LIBS is used to exclude 'private' libraries from getting added to
automatic runtime dependency resolution. That variable has to list
all libraries by name which becomes a maintenance issue if the list
of such libraries frequently changes, or is very large.

PRIVATE_LIBS_ALL allows declaring all libraries private, either
for a specific target package (e.g. -ptest), or for all packages
produced by a recipe.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/package.bbclass | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 114d6559f5e..f6ccd908b4a 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1646,7 +1646,7 @@ python package_do_shlibs() {
 prov = (this_soname, ldir, pkgver)
 if not prov in sonames:
 # if library is private (only used by package) then do not 
build shlib for it
-if not private_libs or this_soname not in private_libs:
+if (not private_libs or this_soname not in private_libs) 
and not private_libs_all:
 sonames.add(prov)
 if libdir_re.match(os.path.dirname(file)):
 needs_ldconfig = True
@@ -1739,6 +1739,7 @@ python package_do_shlibs() {
 for pkg in shlib_pkgs:
 private_libs = d.getVar('PRIVATE_LIBS_' + pkg) or 
d.getVar('PRIVATE_LIBS') or ""
 private_libs = private_libs.split()
+private_libs_all = d.getVar('PRIVATE_LIBS_ALL_' + pkg) or 
d.getVar('PRIVATE_LIBS_ALL')
 needs_ldconfig = False
 bb.debug(2, "calculating shlib provides for %s" % pkg)
 
@@ -1821,6 +1822,7 @@ python package_do_shlibs() {
 
 private_libs = d.getVar('PRIVATE_LIBS_' + pkg) or 
d.getVar('PRIVATE_LIBS') or ""
 private_libs = private_libs.split()
+private_libs_all = d.getVar('PRIVATE_LIBS_ALL_' + pkg) or 
d.getVar('PRIVATE_LIBS_ALL')
 
 deps = list()
 for n in needed[pkg]:
@@ -1829,8 +1831,8 @@ python package_do_shlibs() {
 # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on 
system library libfoo.so.1
 # but skipping it is still better alternative than providing own
 # version and then adding runtime dependency for the same system 
library
-if private_libs and n[0] in private_libs:
-bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % 
(pkg, n[0]))
+if (private_libs and n[0] in private_libs) or private_libs_all:
+bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS or 
PRIVATE_LIBS_ALL' % (pkg, n[0]))
 continue
 if n[0] in shlib_provider.keys():
 shlib_provider_path = []
@@ -2113,7 +2115,7 @@ python package_depchains() {
 
 # Since bitbake can't determine which variables are accessed during package
 # iteration, we need to list them here:
-PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS 
RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm 
pkg_postinst_ontarget INITSCRIPT_NAME INITSCRIPT_PARAMS DEBIAN_NOAUTONAME 
ALTERNATIVE PKGE PKGV PKGR USERADD_PARAM GROUPADD_PARAM CONFFILES 
SYSTEMD_SERVICE LICENSE SECTION pkg_preinst pkg_prerm RREPLACES GROUPMEMS_PARAM 
SYSTEMD_AUTO_ENABLE SKIP_FILEDEPS PRIVATE_LIBS"
+PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS 
RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm 
pkg_postinst_ontarget INITSCRIPT_NAME INITSCRIPT_PARAMS DEBIAN_NOAUTONAME 
ALTERNATIVE PKGE PKGV PKGR USERADD_PARAM GROUPADD_PARAM CONFFILES 
SYSTEMD_SERVICE LICENSE SECTION pkg_preinst pkg_prerm RREPLACES GROUPMEMS_PARAM 
SYSTEMD_AUTO_ENABLE SKIP_FILEDEPS PRIVATE_LIBS PRIVATE_LIBS_ALL"
 
 def gen_packagevar(d):
 ret = []
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] meta-environment: make rpm and dnf work in toolchain

2019-09-02 Thread Alexander Kanavin
On Mon, 2 Sep 2019 at 03:16, Zheng Ruoqin 
wrote:

> We need to configure dnf and rpm to use and make it compatible with
> package architecture from yocto build system.
> +
> +mkdir -p ${D}/${SDKTARGETSYSROOT}/etc/rpm
> +echo "arch_compat: ${MACHINE_ARCH}: ${PACKAGE_ARCHS}" >
> ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +echo "${MACHINE_ARCH}-pc-linux" >
> ${D}/${SDKTARGETSYSROOT}/etc/rpm/platform
> +
> +mkdir -p ${D}/${SDKTARGETSYSROOT}/etc/dnf/vars
> +echo "${DEFAULTTUNE}:${MACHINE_ARCH}:${TARGET_ARCH}" >
> ${D}/${SDKTARGETSYSROOT}/etc/dnf/vars/arch
> +sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/dnf/vars/arch
>

This does not seem like the right place to me to adjust the settings. I
think (not sure; never tried it) that the right technique is in the
nativesdk-meson recipe:

install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
install -m 0755 ${WORKDIR}/meson-setup.py
${D}${SDKPATHNATIVE}/post-relocate-setup.d/

# We need to wrap the real meson with a thin env setup wrapper.
mv ${D}${bindir}/meson ${D}${bindir}/meson.real
install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 5/5] oe-selftest: extend virgl gtk test to also check the SDL option

2019-09-01 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 meta/lib/oeqa/selftest/cases/runtime_test.py | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py 
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 7b48fe562ef..d8698f37375 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -166,9 +166,9 @@ class TestImage(OESelftestTestCase):
 bitbake('core-image-full-cmdline socat')
 bitbake('-c testimage core-image-full-cmdline')
 
-def test_testimage_virgl_gtk(self):
+def test_testimage_virgl_gtk_sdl(self):
 """
-Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk frontend
+Summary: Check host-assisted accelerate OpenGL functionality in qemu 
with gtk and SDL frontends
 Expected: 1. Check that virgl kernel driver is loaded and 3d 
acceleration is enabled
   2. Check that kmscube demo runs without crashing.
 Product: oe-core
@@ -185,13 +185,19 @@ class TestImage(OESelftestTestCase):
 features = 'INHERIT += "testimage"\n'
 if 'gtk+' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
gtk+"\n'
+if 'sdl' not in qemu_packageconfig:
+features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n'
 if 'opengl' not in qemu_distrofeatures:
 features += 'DISTRO_FEATURES_append = " opengl"\n'
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
-features += 'TEST_RUNQEMUPARAMS = "gtk-gl"\n'
-self.write_config(features)
+features_gtk = features + 'TEST_RUNQEMUPARAMS = "gtk-gl"\n'
+self.write_config(features_gtk)
+bitbake('core-image-minimal')
+bitbake('-c testimage core-image-minimal')
+features_sdl = features + 'TEST_RUNQEMUPARAMS = "sdl-gl"\n'
+self.write_config(features_sdl)
 bitbake('core-image-minimal')
 bitbake('-c testimage core-image-minimal')
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/5] libsdl2: enable opengl option for native/nativesdk, subject to 'opengl' in DISTRO_FEATURES

2019-09-01 Thread Alexander Kanavin
This allows virgl support in qemu with the SDL frontend

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb 
b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
index 3a0654b866b..0d8d724374e 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
@@ -40,8 +40,8 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
 # and BSP layers to pick either (desktop) opengl, gles2, or no GL
 PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
 
-PACKAGECONFIG_class-native = "x11"
-PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', 
d)}"
+PACKAGECONFIG_class-native = "x11 ${PACKAGECONFIG_GL}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', 
d)} ${PACKAGECONFIG_GL}"
 PACKAGECONFIG ??= " \
 ${PACKAGECONFIG_GL} \
 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 3/5] qemu: enable virglrenderer and glx options subject to 'opengl' DISTRO_FEATURE

2019-09-01 Thread Alexander Kanavin
Note that to actually use accelerated GL passthrough, there are two options

1) a suitable frontend need to be also enabled - gtk+ and SDL both seem to work 
well.
Previously I struggled to make SDL work, but now it seems fine.

2) it is also possible to render off-screen with -display egl-headless option,
and see the output with a VNC viewer (for which, qemu needs to be started
with a VNC server):

$ runqemu kvm egl-headless publicvnc

Signed-off-by: Alexander Kanavin 
---
 meta/lib/oeqa/selftest/cases/runtime_test.py  | 15 ++-
 .../qemu/qemu-system-native_4.1.0.bb  |  4 +++-
 meta/recipes-devtools/qemu/qemu_4.1.0.bb  |  5 -
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py 
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 20969d2c48a..7b48fe562ef 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -181,13 +181,12 @@ class TestImage(OESelftestTestCase):
 self.skipTest('virgl isn\'t working with Debian 8')
 
 qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 
'qemu-system-native')
 features = 'INHERIT += "testimage"\n'
 if 'gtk+' not in qemu_packageconfig:
 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
gtk+"\n'
-if 'virglrenderer' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
virglrenderer"\n'
-if 'glx' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+if 'opengl' not in qemu_distrofeatures:
+features += 'DISTRO_FEATURES_append = " opengl"\n'
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
@@ -215,12 +214,10 @@ class TestImage(OESelftestTestCase):
 dripath = subprocess.check_output("pkg-config 
--variable=dridriverdir dri", shell=True)
 except subprocess.CalledProcessError as e:
 self.skipTest("Could not determine the path to dri drivers on the 
host via pkg-config.\nPlease install Mesa development files (particularly, 
dri.pc) on the host machine.")
-qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 
'qemu-system-native')
 features = 'INHERIT += "testimage"\n'
-if 'virglrenderer' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " 
virglrenderer"\n'
-if 'glx' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+if 'opengl' not in qemu_distrofeatures:
+features += 'DISTRO_FEATURES_append = " opengl"\n'
 features += 'TEST_SUITES = "ping ssh virgl"\n'
 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
 features += 'IMAGE_INSTALL_append = " kmscube"\n'
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb 
b/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
index d83ee59375c..7394385d30b 100644
--- a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb
@@ -9,7 +9,9 @@ DEPENDS = "glib-2.0-native zlib-native pixman-native 
qemu-native bison-native"
 
 EXTRA_OECONF_append = " --target-list=${@get_qemu_system_target_list(d)}"
 
-PACKAGECONFIG ??= "fdt alsa kvm"
+PACKAGECONFIG ??= "fdt alsa kvm \
+${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' 
,d)} \
+"
 
 # Handle distros such as CentOS 5 32-bit that do not have kvm support
 PACKAGECONFIG_remove = "${@'kvm' if not 
os.path.exists('/usr/include/linux/kvm.h') else ''}"
diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb 
b/meta/recipes-devtools/qemu/qemu_4.1.0.bb
index f0c1daabe15..a4018cc4485 100644
--- a/meta/recipes-devtools/qemu/qemu_4.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_4.1.0.bb
@@ -21,5 +21,8 @@ do_install_append_class-nativesdk() {
 PACKAGECONFIG ??= " \
 fdt sdl kvm \
 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' 
,d)} \
+"
+PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm \
+${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' 
,d)} \
 "
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/5] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

2019-09-01 Thread Alexander Kanavin
This will allow better control over native virgl/qemu configurations.

Adjust gtk+3/cairo native configurations to actually ignore opengl
when building for -native: we do not need it, and it would cause build
failures as only a limited subset of mesa-native is currently built.

Drop native/nativesdk overrides from virglrenderer/libepoxy recipes
as opengl feature is now correctly set for those variants.

Signed-off-by: Alexander Kanavin 
---
 meta/conf/bitbake.conf | 4 ++--
 meta/recipes-gnome/gtk+/gtk+3.inc  | 2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb| 2 ++
 meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb   | 2 --
 meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a0a7f4911e0..d36f4c6ccef 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -824,8 +824,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data 
ldconfig"
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc 
b/meta/recipes-gnome/gtk+/gtk+3.inc
index 77b6c31536b..2f9e05b1cd4 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -47,6 +47,8 @@ do_compile_prepend() {
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', 
d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 
'glx', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', 
d)}"
 
 PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk 
fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender 
libxcomposite libxfixes"
 # this is provided by oe-core patch that removes epoxy/gl dependency from a 
X11 build
diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb 
b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
index f32e9ba1bcd..84c7b0adde9 100644
--- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -41,6 +41,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', 
'', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 
'opengl', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 
'x11 xcb', '', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 
'x11', 'x11 xcb', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no 
--disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb 
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
index c8d1650c637..5d7639a929e 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
@@ -14,8 +14,6 @@ UPSTREAM_CHECK_URI = 
"https://github.com/anholt/libepoxy/releases;
 inherit meson pkgconfig distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
 
 PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl"
 PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl"
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb 
b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb
index d2b11c103a3..65365eb900a 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb
@@ -17,5 +17,3 @@ inherit autotools pkgconfig distro_features_check
 BBCLASSEXTEND = "native nativesdk"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 4/5] runqemu: add options that enable virgl with the SDL frontend

2019-09-01 Thread Alexander Kanavin
Also, add an option to use Gtk without virgl acceleration.

Signed-off-by: Alexander Kanavin 
---
 scripts/runqemu | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index b5200106244..80d59424d78 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -65,9 +65,12 @@ of the following environment variables (in any order):
   MACHINE - the machine name (optional, autodetected from KERNEL filename if 
unspecified)
   Simplified QEMU command-line options can be passed with:
 nographic - disable video console
-sdl - choose the SDL frontend instead of the Gtk+ default
-gtk-gl - enable virgl-based GL acceleration using Gtk+ frontend
-gtk-gl-es - enable virgl-based GL acceleration, using OpenGL ES and Gtk+ 
frontend
+sdl - choose the SDL frontend without GL acceleration
+sdl-gl - enable virgl-based GL acceleration using SDL frontend
+sdl-gl-es - enable virgl-based GL acceleration, using OpenGL ES and SDL 
frontend
+gtk - choose the Gtk frontend without GL acceleration
+gtk-gl - enable virgl-based GL acceleration using Gtk frontend
+gtk-gl-es - enable virgl-based GL acceleration, using OpenGL ES and Gtk 
frontend
 egl-headless - enable headless EGL output; use vnc or spice to see it
 serial - enable a serial console on /dev/ttyS0
 serialstdio - enable a serial console on the console (regardless of 
graphics mode)
@@ -436,6 +439,12 @@ class BaseConfig(object):
 self.kernel_cmdline_script += ' console=ttyS0'
 elif arg == 'sdl':
 self.qemu_opt_script += ' -display sdl'
+elif arg == 'sdl-gl':
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=on'
+elif arg == 'sdl-gl-es':
+self.qemu_opt_script += ' -vga virtio -display sdl,gl=es'
+elif arg == 'gtk':
+self.qemu_opt_script += ' -display gtk'
 elif arg == 'gtk-gl':
 self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
 elif arg == 'gtk-gl-es':
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 0/5] virgl: add SDL support and enable by default

2019-09-01 Thread Alexander Kanavin
This patchset adds two enhancements to qemu virgl support (which is
a virtualized accelerated 3D graphics support for the qemu guests):

1. SDL qemu frontend now comes with virgl fully enabled and working
(over ssh X11 forwarding as well!), so using the gtk frontend
is no longer necessary. 'oe-selftest' is adjusted to test both
frontends.

2. virgl itself is enabled by default in qemu, when 'opengl' is in
DISTRO_FEATURES. This pulls in a few components during build (particularly,
libdrm, virglrenderer and a special minimal configuration of mesa-native).
I tested the impact on build times: it is about 25-30 seconds on a 16 core
machine. 'bitbake core-image-minimal' goes from 26m45 to 27m13.

Gtk qemu frontend remains disabled by default, as it adds more to the build 
times.

The following changes since commit 270bd86740a080fb56d932a5c0eb70d6ce2a2b3c:

  libepoxy: enable x11 PACKAGECONFIG for native/nativesdk (2019-09-01 17:08:18 
+0200)

are available in the Git repository at:

  git://git.yoctoproject.org/poky-contrib akanavin/qemu-split-virgl-gtk
  
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/qemu-split-virgl-gtk

Alexander Kanavin (5):
  bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk
from target
  libsdl2: enable opengl option for native/nativesdk, subject to
'opengl' in DISTRO_FEATURES
  qemu: enable virglrenderer and glx options subject to 'opengl'
DISTRO_FEATURE
  runqemu: add options that enable virgl with the SDL frontend
  oe-selftest: extend virgl gtk test to also check the SDL option

 meta/conf/bitbake.conf|  4 +--
 meta/lib/oeqa/selftest/cases/runtime_test.py  | 29 ++-
 .../qemu/qemu-system-native_4.1.0.bb  |  4 ++-
 meta/recipes-devtools/qemu/qemu_4.1.0.bb  |  5 +++-
 meta/recipes-gnome/gtk+/gtk+3.inc |  2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb   |  2 ++
 .../libepoxy/libepoxy_1.5.3.bb|  2 --
 .../libsdl2/libsdl2_2.0.10.bb |  4 +--
 .../virglrenderer/virglrenderer_0.8.0.bb  |  2 --
 scripts/runqemu   | 15 --
 10 files changed, 43 insertions(+), 26 deletions(-)

-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/2] default-providers.inc: set mesa as the provider for native(sdk) virtual/libgl

2019-09-01 Thread Alexander Kanavin
native/nativesdk libepoxy and libsdl2 require this to be set, when they
have the respective opengl features enabled.

Signed-off-by: Alexander Kanavin 
---
 meta/conf/distro/include/default-providers.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/conf/distro/include/default-providers.inc 
b/meta/conf/distro/include/default-providers.inc
index 8f4d44d884c..ea88bd4876a 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -5,6 +5,8 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/egl ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native"
+PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
 PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/2] libepoxy: enable x11 PACKAGECONFIG for native/nativesdk

2019-09-01 Thread Alexander Kanavin
This is needed to enable virgl support in qemu with SDL frontend

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb 
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
index dd706a96063..c8d1650c637 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
@@ -23,8 +23,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 
'x11', d)} egl"
 
 EXTRA_OEMESON += "-Dtests=false"
 
-PACKAGECONFIG_class-native = "egl"
-PACKAGECONFIG_class-nativesdk = "egl"
+PACKAGECONFIG_class-native = "egl x11"
+PACKAGECONFIG_class-nativesdk = "egl x11"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 1/2] default-providers.inc: set mesa as the provider for native virtual/libgl

2019-09-01 Thread Alexander Kanavin
On Sun, 1 Sep 2019 at 11:39, Alexander Kanavin 
wrote:

> native libepoxy and libsdl2 require this to be set, when they
> have the respective opengl features enabled.
>

nativesdk needs the same fix, will resend.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/2] libepoxy: enable x11 PACKAGECONFIG for native/nativesdk

2019-09-01 Thread Alexander Kanavin
This is needed to enable virgl support in qemu with SDL frontend

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb 
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
index dd706a96063..c8d1650c637 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
@@ -23,8 +23,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 
'x11', d)} egl"
 
 EXTRA_OEMESON += "-Dtests=false"
 
-PACKAGECONFIG_class-native = "egl"
-PACKAGECONFIG_class-nativesdk = "egl"
+PACKAGECONFIG_class-native = "egl x11"
+PACKAGECONFIG_class-nativesdk = "egl x11"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/2] default-providers.inc: set mesa as the provider for native virtual/libgl

2019-09-01 Thread Alexander Kanavin
native libepoxy and libsdl2 require this to be set, when they
have the respective opengl features enabled.

Signed-off-by: Alexander Kanavin 
---
 meta/conf/distro/include/default-providers.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/conf/distro/include/default-providers.inc 
b/meta/conf/distro/include/default-providers.inc
index 8f4d44d884c..189dd8fe400 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -5,6 +5,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/egl ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
 PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/2] libffi: fix upstream version check

2019-08-30 Thread Alexander Kanavin
As there is no version newer than 3.3-rc0 yet, an exception
from the check is needed.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-support/libffi/libffi_3.3~rc0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-support/libffi/libffi_3.3~rc0.bb 
b/meta/recipes-support/libffi/libffi_3.3~rc0.bb
index 3e2845546e0..8acb699d4ab 100644
--- a/meta/recipes-support/libffi/libffi_3.3~rc0.bb
+++ b/meta/recipes-support/libffi/libffi_3.3~rc0.bb
@@ -16,6 +16,9 @@ SRC_URI = 
"https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.
"
 SRC_URI[md5sum] = "8d2a82a78faf10a5e53c27d986e8f04e"
 SRC_URI[sha256sum] = 
"403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf"
+UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/;
+UPSTREAM_CHECK_REGEX = "libffi-(?P\d+(\.\d+)+)\.tar"
+UPSTREAM_VERSION_UNKNOWN = "1"
 
 EXTRA_OECONF += "--disable-builddir"
 EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/2] lsb-release: fix upstream version check

2019-08-30 Thread Alexander Kanavin
With the new recipe matching the tarbal version, there is
no need for an exception from the check.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb 
b/meta/recipes-extended/lsb/lsb-release_1.4.bb
index 4d8b3d3d3c4..52e30267f50 100644
--- a/meta/recipes-extended/lsb/lsb-release_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = 
"file://README;md5=12da544b1a3a5a1795a21160b49471cf"
 SRC_URI = 
"${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \

file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \
"
-UPSTREAM_VERSION_UNKNOWN = "1"
 
 SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
 SRC_URI[sha256sum] = 
"99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 11/13] eglinfo: remove the recipe

2019-08-30 Thread Alexander Kanavin
Last commit upstream was in Sep 2014; pull requests have been ignored since.

I believe eglinfo from mesa-demos is an adequate and maintained alternative.

Also this recipe was using an ugly waf blob placed directly into oe-core, which
was also dependent on python 2.

Signed-off-by: Alexander Kanavin 
---
 .../eglinfo/eglinfo-fb_1.0.0.bb   |   7 -
 .../eglinfo/eglinfo-wayland_1.0.0.bb  |  13 --
 .../eglinfo/eglinfo-x11_1.0.0.bb  |  13 --
 meta/recipes-graphics/eglinfo/eglinfo.inc |  38 
 ...INCDIR-to-searchpath-for-egl-headers.patch |  33 
 ...01-Check-for-libegl-using-pkg-config.patch |  36 
 meta/recipes-graphics/eglinfo/files/waf   | 169 --
 7 files changed, 309 deletions(-)
 delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
 delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb
 delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
 delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo.inc
 delete mode 100644 
meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
 delete mode 100644 
meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch
 delete mode 100755 meta/recipes-graphics/eglinfo/files/waf

diff --git a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb 
b/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
deleted file mode 100644
index cccdd2073d4..000
--- a/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-EGLINFO_PLATFORM ?= "fb"
-EGLINFO_BINARY_NAME ?= "eglinfo-fb"
-
-require eglinfo.inc
-
-SUMMARY += "(Framebuffer version)"
-CXXFLAGS += "-DMESA_EGL_NO_X11_HEADERS=1"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb 
b/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb
deleted file mode 100644
index 87a131aa7b9..000
--- a/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-EGLINFO_PLATFORM ?= "wayland"
-EGLINFO_BINARY_NAME ?= "eglinfo-wayland"
-
-require eglinfo.inc
-
-DEPENDS += "wayland"
-
-inherit distro_features_check
-
-# depends on wayland
-REQUIRED_DISTRO_FEATURES += "wayland"
-
-SUMMARY += "(Wayland version)"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb 
b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
deleted file mode 100644
index 48ab8805d8c..000
--- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-EGLINFO_PLATFORM ?= "x11"
-EGLINFO_BINARY_NAME ?= "eglinfo-x11"
-
-require eglinfo.inc
-
-DEPENDS += "virtual/libx11"
-
-inherit distro_features_check
-
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES += "x11"
-
-SUMMARY += "(X11 version)"
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc 
b/meta/recipes-graphics/eglinfo/eglinfo.inc
deleted file mode 100644
index 6dcb0c5a19d..000
--- a/meta/recipes-graphics/eglinfo/eglinfo.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Utility for printing information EGL and its client APIs (OpenGL, 
OpenGL ES, OpenVG)"
-SECTION = "graphics"
-LICENSE = "Zlib"
-HOMEPAGE = "https://github.com/dv1/eglinfo;
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c"
-
-DEPENDS = "virtual/egl"
-
-SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \
-   file://waf \
-   file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \
-   file://0001-Check-for-libegl-using-pkg-config.patch \
-   "
-SRCREV = "223817ee37988042db7873cfb5b2e899dfe35c10"
-
-CVE_PRODUCT = "eglinfo"
-
-S = "${WORKDIR}/git"
-
-inherit waf distro_features_check pkgconfig
-# depends on virtual/egl
-REQUIRED_DISTRO_FEATURES ?= "opengl"
-
-# BSP layers should add .bbappend files for the -x11 and -fb .bb recipes, which
-# append the respective EGL/OpenGLES/OpenVG libraries to DEPENDS and set
-# EGL_DEVICE as appropriate.
-EGLINFO_DEVICE ?= "generic"
-
-EXTRA_OECONF = "--platform=${EGLINFO_PLATFORM} \
---device=${EGLINFO_DEVICE} \
---sysroot ${STAGING_DIR_TARGET}"
-
-do_configure_prepend() {
-   install -D -m 0755 ${WORKDIR}/waf ${S}/waf
-}
-do_install_append() {
-   mv ${D}/${bindir}/eglinfo ${D}/${bindir}/${EGLINFO_BINARY_NAME}
-}
diff --git 
a/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
 
b/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
deleted file mode 100644
index 61327eb36b4..000
--- 
a/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 99a5784d33ad5e0e6fa003

[OE-core] [PATCH 12/13] webkitgtk: use Python 3 for builds

2019-08-30 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-sato/webkit/webkitgtk_2.24.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb
index 0e5ee5ba006..71082421688 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb
@@ -69,7 +69,7 @@ EXTRA_OECMAKE = " \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', 
'-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
${@bb.utils.contains('GTKDOC_ENABLED', 'True', 
'-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \
-DENABLE_MINIBROWSER=ON \
--DPYTHON_EXECUTABLE=`which python` \
+-DPYTHON_EXECUTABLE=`which python3` \
"
 
 # Javascript JIT is not supported on ARC
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 13/13] webkitgtk: update 2.24.3 -> 2.24.4

2019-08-30 Thread Alexander Kanavin
In particular this brings an important fix for builds with py3:
"Fix build issue which would cause media controls to disappear when Python 3.x 
was used during the build process."

https://webkitgtk.org/2019/08/28/webkitgtk2.24.4-released.html

Signed-off-by: Alexander Kanavin 
---
 ...tings-so-that-gtkdoc-generation-work.patch | 10 +++---
 ...uild-failure-https-bugs.webkit.org-s.patch | 33 ---
 ...ebkitgtk_2.24.3.bb => webkitgtk_2.24.4.bb} |  5 ++-
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 
meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.24.3.bb => webkitgtk_2.24.4.bb} 
(96%)

diff --git 
a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
 
b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
index 664cea9c759..e7c668c0406 100644
--- 
a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
+++ 
b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
@@ -1,4 +1,4 @@
-From d3796ad1a19233ee5d3492a5560d7ede882f89cf Mon Sep 17 00:00:00 2001
+From 4b5e02212a31b82fc9b3becad90542274816fc29 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin 
 Date: Thu, 11 Aug 2016 17:13:51 +0300
 Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
@@ -17,23 +17,23 @@ Signed-off-by: Alexander Kanavin 
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake
-index 2ee05550..6cb6313d 100644
+index b0fb31ca..6cb6313d 100644
 --- a/Source/cmake/GtkDoc.cmake
 +++ b/Source/cmake/GtkDoc.cmake
 @@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
  add_custom_command(
  OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
  DEPENDS ${DocumentationDependencies}
--COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" 
"CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" 
${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
+-COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" 
"CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" 
"LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" 
${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
 +COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" 
"CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" 
"LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" 
${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
  COMMAND touch ${_stamp_name}
  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
  VERBATIM
 diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py
-index 81ee8cdc..3e11c2f0 100644
+index 054cafa1..416de7d1 100644
 --- a/Tools/gtkdoc/gtkdoc.py
 +++ b/Tools/gtkdoc/gtkdoc.py
-@@ -317,9 +317,9 @@ class GTKDoc(object):
+@@ -320,9 +320,9 @@ class GTKDoc(object):
  additional_ldflags = '%s %s' % (additional_ldflags, arg)
  ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) 
+ ldflags
  current_ld_library_path = env.get('LD_LIBRARY_PATH')
diff --git 
a/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch
 
b/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch
deleted file mode 100644
index e550a0d4579..000
--- 
a/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4bc241539246f7a17d07357257ab47cb96bc4b69 Mon Sep 17 00:00:00 2001
-From: "ysuz...@apple.com" 
-Date: Thu, 18 Apr 2019 07:30:18 +
-Subject: [PATCH] Unreviewed, fix build failure
- https://bugs.webkit.org/show_bug.cgi?id=195938
-
-Including .
-
-* bmalloc/AvailableMemory.cpp:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244422 
268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-Upstream-Status: Backport 
[https://github.com/WebKit/webkit/commit/84c111dc0d83b5acf60706ef49bc2f5e91112471]
-Signed-off-by: Khem Raj 

- Source/bmalloc/bmalloc/AvailableMemory.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/bmalloc/bmalloc/AvailableMemory.cpp 
b/Source/bmalloc/bmalloc/AvailableMemory.cpp
-index 595889fe..b72000d5 100644
 a/Source/bmalloc/bmalloc/AvailableMemory.cpp
-+++ b/Source/bmalloc/bmalloc/AvailableMemory.cpp
-@@ -32,6 +32,7 @@
- #include "PerProcess.h"
- #include "Scavenger.h"
- #include "Sizes.h"
-+#include 
- #include 
- #if BOS(DARWIN)
- #if BPLATFORM(IOS_FAMILY)
--- 
-2.22.0
-
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb 

  1   2   3   4   5   6   7   8   9   10   >