[PATCH 1/5] runqemu: add options that enable virgl with the SDL frontend

[PATCH 1/5] runqemu: add options that enable virgl with the SDL frontend

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 scripts/runqemu | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index a05facd0db6..5c56c3fe6c1 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

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

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 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

[PATCH 3/5] gcr: update to 3.34.0

[Alexander Kanavin]

inherit gettext, as gcr is now gettextized.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-gnome/gcr/{gcr_3.28.1.bb => gcr_3.34.0.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/gcr/{gcr_3.28.1.bb => gcr_3.34.0.bb} (81%)

diff --git a/meta/recipes-gnome/gcr/gcr_3.28.1.bb b/meta/recipes-gnome/gcr/gcr_3.34.0.bb
similarity index 81%
rename from meta/recipes-gnome/gcr/gcr_3.28.1.bb
rename to meta/recipes-gnome/gcr/gcr_3.34.0.bb
index 2299199c31f..c5593904947 100644
--- a/meta/recipes-gnome/gcr/gcr_3.28.1.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.34.0.bb
@@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 DEPENDS = "intltool-native gtk+3 p11-kit glib-2.0 libgcrypt \
            ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
 
-inherit gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection
+inherit gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection gettext
 # depends on gtk+3, but also x11 through gtk+-x11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[archive.md5sum] = "afd88cacfd54c1ac5b3e0eb35e3aa674"
-SRC_URI[archive.sha256sum] = "95204aa2111c301778ebfbe60975ce3ed698c958430ffcc2a785ac5e593d168b"
+SRC_URI[archive.md5sum] = "4af28919fb1dd36d93603e8230283b6f"
+SRC_URI[archive.sha256sum] = "29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
-- 
2.17.1

[PATCH 4/5] btrfs-tools: update to 5.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../btrfs-tools/{btrfs-tools_5.2.2.bb => btrfs-tools_5.3.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.2.2.bb => btrfs-tools_5.3.bb} (97%)

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.2.2.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.3.bb
similarity index 97%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.2.2.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.3.bb
index 6b73c01dccb..12b5c4562dc 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.2.2.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.3.bb
@@ -14,7 +14,7 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
 DEPENDS_append_class-target = " udev"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "55a8c9626fb906c20c3206f8fd39b9a8fb259b79"
+SRCREV = "de7856cee5907938441f765ebab7cc106b7faf70"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
-- 
2.17.1

[PATCH 5/5] libmodulemd-v1: update to 1.8.16

[Alexander Kanavin]

Upstream added support for optional docs, so
0001-Do-not-generate-gtkdoc-or-python-bindings.patch is replaced
with an option to disable gtk-doc (as the modulemd feature is not used
in oe-core anyway).

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...t-generate-gtkdoc-or-python-bindings.patch | 60 -------------------
 .../libmodulemd/libmodulemd-v1_git.bb         |  7 +--
 2 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch

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
deleted file mode 100644
index d950ad5867e..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-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 <alex.kanavin@gmail.com>
----
- 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_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
index 9790470f4fe..5409051d79f 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
@@ -4,18 +4,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
 
 SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \
            file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
-           file://0001-Do-not-generate-gtkdoc-or-python-bindings.patch \
            "
 
-PV = "1.8.15"
-SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5"
+PV = "1.8.16"
+SRCREV = "d0dcf7b373b3cf85cd39eb3bc23d31e06195a75a"
 UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)"
 
 S = "${WORKDIR}/git"
 
 inherit meson gobject-introspection
 
-EXTRA_OEMESON = "-Ddeveloper_build=false"
+EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false"
 
 DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
 
-- 
2.17.1

Re: [PATCH 3/5] gcr: update to 3.34.0

[Ross Burton]

On 24/10/2019 12:11, Alexander Kanavin wrote:
> inherit gettext, as gcr is now gettextized.

Note that gettexting means intltool-native is no longer a build 
dependency.  No need to send a patch, I've queued it locally.

Ross

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

[Ross Burton]

Sorry, but:

2019-10-30 05:06:57,094 - oe-selftest - INFO - FAIL: 
runtime_test.TestImage.test_testimage_virgl_gtk_sdl 
(subunit.RemotedTestCase)
2019-10-30 05:06:57,097 - oe-selftest - INFO - 
----------------------------------------------------------------------
2019-10-30 05:06:57,097 - oe-selftest - INFO - 
testtools.testresult.real._StringException: Traceback (most recent call 
last):
   File 
"/home/pokybuild/yocto-worker/oe-selftest/build/meta/lib/oeqa/selftest/cases/runtime_test.py", 
line 206, in test_testimage_virgl_gtk_sdl
     bitbake('-c testimage core-image-minimal')
   File 
"/home/pokybuild/yocto-worker/oe-selftest/build/meta/lib/oeqa/utils/commands.py", 
line 221, in bitbake
     return runCmd(cmd, ignore_status, timeout, output_log=output_log, 
**options)
   File 
"/home/pokybuild/yocto-worker/oe-selftest/build/meta/lib/oeqa/utils/commands.py", 
line 199, in runCmd
     raise AssertionError("Command '%s' returned non-zero exit status 
%d:\n%s" % (command, result.status, exc_output))
AssertionError: Command 'bitbake  -c testimage core-image-minimal' 
returned non-zero exit status 1:
Loading cache...done.
Loaded 1332 entries from dependency cache.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION           = "1.44.0"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal-4.8"
TARGET_SYS           = "x86_64-poky-linux"
MACHINE              = "qemux86-64"
DISTRO               = "poky"
DISTRO_VERSION       = "3.0"
TUNE_FEATURES        = "m64 core2"
TARGET_FPU           = ""
meta
meta-poky
meta-yocto-bsp       = "ross/mut:db5c0617da6bcfbe947b81dbf71fa123a6257fa0"
meta-selftest        = "master:74201d531e64b3d5b0bfb17d7189d416c485a1fb"
Initialising tasks...done.
Sstate summary: Wanted 0 Found 0 Missed 0 Current 124 (0% match, 100% 
complete)
NOTE: Executing Tasks
NOTE: Setscene tasks completed
NOTE: Running task 1013 of 1013 
(/home/pokybuild/yocto-worker/oe-selftest/build/meta/recipes-core/images/core-image-minimal.bb:do_testimage)
NOTE: recipe core-image-minimal-1.0-r0: task do_testimage: Started
WARNING: core-image-minimal-1.0-r0 do_testimage: Last 25 lines of text:
[    0.942844] io scheduler kyber registered
[    0.944231] input: Power Button as 
/devices/LNXSYSTM:00/LNXPWRBN:00/input/input0
[    0.949516] ACPI: Power Button [PWRF]
[    0.969010] PCI Interrupt Link [LNKB] enabled at IRQ 10
[    0.989213] PCI Interrupt Link [LNKC] enabled at IRQ 11
[    1.027830] PCI Interrupt Link [LNKA] enabled at IRQ 10
[    1.031426] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
[    1.057292] 00:05: ttyS0 at I/O 0x3f8 (irq = 4, base_baud = 115200) 
is a 16550A
[    1.088281] 00:06: ttyS1 at I/O 0x2f8 (irq = 3, base_baud = 115200) 
is a 16550A
[    1.093703] Linux agpgart interface v0.103
[    1.095192] [drm] pci: virtio-vga detected at 0000:00:02.0
[    1.096746] virtio-pci 0000:00:02.0: 
remove_conflicting_pci_framebuffers: bar 0: 0xfe000000 -> 0xfe7fffff
[    1.099351] random: fast init done
[    1.100408] virtio-pci 0000:00:02.0: 
remove_conflicting_pci_framebuffers: bar 2: 0xfe800000 -> 0xfe803fff
[    1.103035] random: crng init done
[    1.104086] virtio-pci 0000:00:02.0: 
remove_conflicting_pci_framebuffers: bar 4: 0xfebd0000 -> 0xfebd0fff
[    1.106696] virtio-pci 0000:00:02.0: vgaarb: deactivate vga console
[    1.110129] Console: switching to colour dummy device 80x25
[    1.111417] [drm] virgl 3d acceleration enabled
[    1.112331] [drm] EDID support available.
[    1.115106] [TTM] Zone  kernel: Available graphics memory: 116016 KiB
[    1.116401] [TTM] Initializing pool allocator
[    1.117279] [TTM] Initializing DMA pool allocator
[    1.118253] [drm] number of scanouts: 1
[    1.119032] [drm] number of cap sets: 2
WARNING: core-image-minimal-1.0-r0 do_testimage: Check full boot log: 
/home/pokybuild/yocto-worker/oe-selftest/build/build-st-5770/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/testimage/qemu_boot_log.20191030031548
WARNING: core-image-minimal-1.0-r0 do_testimage: Qemu ended 
unexpectedly, dump data from host is in 
/home/pokybuild/yocto-worker/oe-selftest/build/build-st-5770/tmp/log/runtime-hostdump/201910300316_qemu
WARNING: core-image-minimal-1.0-r0 do_testimage: qemu-system ended 
unexpectedly
ERROR: core-image-minimal-1.0-r0 do_testimage: testimage received 
SIGTERM, shutting down...
ERROR: core-image-minimal-1.0-r0 do_testimage: core-image-minimal - 
FAILED - tests were interrupted during execution
ERROR: Logfile of failure stored in: 
/home/pokybuild/yocto-worker/oe-selftest/build/build-st-5770/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/log.do_testimage.47342
NOTE: recipe core-image-minimal-1.0-r0: task do_testimage: Failed
ERROR: Task 
(/home/pokybuild/yocto-worker/oe-selftest/build/meta/recipes-core/images/core-image-minimal.bb:do_testimage) 
failed with exit code '1'
NOTE: Tasks Summary: Attempted 1013 tasks of which 1012 didn't need to 
be rerun and 1 failed.
NOTE: The errors for this build are stored in 
/home/pokybuild/yocto-worker/oe-selftest/build/build-st-5770/tmp/log/error-report/error_report_20191030031548.txt
You can send the errors to a reports server by running:
   send-error-report 
/home/pokybuild/yocto-worker/oe-selftest/build/build-st-5770/tmp/log/error-report/error_report_20191030031548.txt 
[-s server]
NOTE: The contents of these logs will be posted in public if you use the 
above command with the default server. Please ensure you remove any 
identifying or proprietary information when prompted before sending.
Summary: 1 task failed:
 
/home/pokybuild/yocto-worker/oe-selftest/build/meta/recipes-core/images/core-image-minimal.bb:do_testimage
Summary: There were 4 WARNING messages shown.
Summary: There were 2 ERROR messages shown, returning a non-zero exit code.

https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/771/steps/8/logs/step2d

Centos 7 worker, if that matters.

Ross

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

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 520 bytes --]

On Thu, 31 Oct 2019 at 00:14, Ross Burton <ross.burton@intel.com> wrote:

>
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/771/steps/8/logs/step2d
>
> Centos 7 worker, if that matters.
>

Thanks, I think it does matter. Virgl tests are already partly disabled for
centos 7 (they are not running kmscube with the gtk frontend), and it seems
that with the sdl frontend it fails even before kmscube is executed. I
guess I should disable them altogether on that (ancient) distro.

Alex

[-- Attachment #2: Type: text/html, Size: 962 bytes --]