Skip to contentSkip to conversation

core-image-sato-sdk-ptest: do not pull in ptest-pkgs

PATCH In review Alexander Kanavin 6 participants 46 messages Feb 16, 2020 – Feb 27, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/10 core-image-sato-sdk-ptest: do not pull in ptest-pkgs

The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW; specifying 'ptests-pkgs' also pulls in additional ptests that are specifically excluded from those lists due to causing issues with ptesting. (particularly bash-ptest is one such item)

---
 meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 --
 1 file changed, 2 deletions(-)
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +0 -2
index 85b5adbc69..58c257c49f 100644
@@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc
 
 DESCRIPTION += "Also includes ptest packages."
 
-IMAGE_FEATURES += "ptest-pkgs"
-
 PROVIDES += "core-image-sato-ptest"
 
 # Also include ptests which may not otherwise be included in a sato image
Signature · 1 line
2.25.0
#1 lore raw

PATCH 2/10 procps: upstream has switched to gitlab

---
 meta/recipes-extended/procps/procps_3.3.16.bb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
meta/recipes-extended/procps/procps_3.3.16.bb +9 -4
index 60f90976bb..2810ebd285 100644
@@ -12,14 +12,19 @@ DEPENDS = "ncurses"
 
 inherit autotools gettext pkgconfig update-alternatives
 
-SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \
+SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \
            file://sysctl.conf \
            "
+SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f"
 
-SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b"
-SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af"
+S = "${WORKDIR}/git"
 
-S = "${WORKDIR}/procps-ng-${PV}"
+# Upstream has a custom autogen.sh which invokes po/update-potfiles as they
+# don't ship a po/POTFILES.in (which is silly).  Without that file gettext
+# doesn't believe po/ is a gettext directory and won't generate po/Makefile.
+do_configure_prepend() {
+    ( cd ${S} && po/update-potfiles )
+}
 
 EXTRA_OECONF = "--enable-skill --disable-modern-top"
 
Signature · 1 line
2.25.0
#2 lore raw

Re: [PATCH 02/10] procps: upstream has switched to gitlab

Quoted 32 lines · Alexander Kanavin
---
 meta/recipes-extended/procps/procps_3.3.16.bb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
meta/recipes-extended/procps/procps_3.3.16.bb +0 -1
index 60f90976bb..2810ebd285 100644
@@ -12,14 +12,19 @@ DEPENDS = "ncurses"
 
 inherit autotools gettext pkgconfig update-alternatives
 
-SRC_URI = "

http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz
\

meta/recipes-extended/procps/procps_3.3.16.bb +2 -2
+SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \
            file://sysctl.conf \
            "
+SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f"
 
-SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b"
-SRC_URI[sha256sum] =

"925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af"

meta/recipes-extended/procps/procps_3.3.16.bb +2 -1
+S = "${WORKDIR}/git"
 
-S = "${WORKDIR}/procps-ng-${PV}"
+# Upstream has a custom autogen.sh which invokes po/update-potfiles as

they

meta/recipes-extended/procps/procps_3.3.16.bb +2 -0
+# don't ship a po/POTFILES.in (which is silly).  Without that file gettext
+# doesn't believe po/ is a gettext directory and won't generate
Quoted 1 line

po/Makefile.

Do we miss .in file from tarball ? Or is it missing in a git checkout This is expected when building in a maintainer mode Tarballs are produced by maintainers for users
Who wants to build from source

Quoted 16 lines
meta/recipes-extended/procps/procps_3.3.16.bb +3 -1
+do_configure_prepend() {
+    ( cd ${S} && po/update-potfiles )
+}
 
 EXTRA_OECONF = "--enable-skill --disable-modern-top"
 
--

2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw

Re: [PATCH 02/10] procps: upstream has switched to gitlab

Quoted 14 lines · Khem Raj

-S = "${WORKDIR}/procps-ng-${PV}"

Quoted 6 lines

+# Upstream has a custom autogen.sh which invokes po/update-potfiles as they
+# don't ship a po/POTFILES.in (which is silly). Without that file gettext
+# doesn't believe po/ is a gettext directory and won't generate po/Makefile.

Do we miss .in file from tarball ? Or is it missing in a git checkout This is expected when building in a maintainer mode Tarballs are produced by maintainers for users
Who wants to build from source

The .in is available in tarballs, but not in git repo. It's generated as explained above.

Alex

#4 lore raw

Re: [PATCH 02/10] procps: upstream has switched to gitlab

Quoted 15 lines · Alexander Kanavin
Quoted 11 lines · Khem Raj

meta/recipes-extended/procps/procps_3.3.16.bb DEPENDS = "ncurses" · line 24

Quoted 6 lines
meta/recipes-extended/procps/procps_3.3.16.bb +3 -1
-S = "${WORKDIR}/procps-ng-${PV}"
+# Upstream has a custom autogen.sh which invokes po/update-potfiles as they
+# don't ship a po/POTFILES.in (which is silly).  Without that file gettext
+# doesn't believe po/ is a gettext directory and won't generate po/Makefile.

Do we miss .in file from tarball ? Or is it missing in a git checkout This is expected when building in a maintainer mode Tarballs are produced by maintainers for users
Who wants to build from source

Quoted 1 line

The .in is available in tarballs, but not in git repo. It's generated as explained above.

right. Then revise the comment, since its expected to be absent when we are building from
git sources.

Quoted 2 lines

Alex

#5 lore raw

Re: [PATCH 02/10] procps: upstream has switched to gitlab

Quoted 14 lines · Khem Raj
Quoted 2 lines
Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-S = "${WORKDIR}/procps-ng-${PV}"
+# Upstream has a custom autogen.sh which invokes po/update-potfiles

as they

Quoted 1 line
Quoted 1 line
Quoted 1 line

+# don't ship a po/POTFILES.in (which is silly). Without that file

gettext

Quoted 1 line
Quoted 1 line
Quoted 1 line

+# doesn't believe po/ is a gettext directory and won't generate

po/Makefile.

Quoted 7 lines
Quoted 5 lines

Do we miss .in file from tarball ? Or is it missing in a git checkout This is expected when building in a maintainer mode Tarballs are produced by maintainers for users
Who wants to build from source

Quoted 7 lines
Quoted 1 line

The .in is available in tarballs, but not in git repo. It's generated as

explained above.

right. Then revise the comment, since its expected to be absent when we are building from
git sources.

The fix and the comment were copied wholesale and were originally written by Ross. How is POTFILES.in normally generated (i.e. without involving custom autogen.sh)?

Alex

#6 lore raw

Re: [PATCH 02/10] procps: upstream has switched to gitlab

Quoted 14 lines · Alexander Kanavin
Quoted 12 lines · Khem Raj
Quoted 12 lines
Quoted 10 lines

meta/recipes-extended/procps/procps_3.3.16.bb DEPENDS = "ncurses" · line 24

Quoted 5 lines
meta/recipes-extended/procps/procps_3.3.16.bb +3 -1
-S = "${WORKDIR}/procps-ng-${PV}"
+# Upstream has a custom autogen.sh which invokes po/update-potfiles as they
+# don't ship a po/POTFILES.in (which is silly).  Without that file gettext
+# doesn't believe po/ is a gettext directory and won't generate po/Makefile.

Do we miss .in file from tarball ? Or is it missing in a git checkout This is expected when building in a maintainer mode Tarballs are produced by maintainers for users
Who wants to build from source

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

The .in is available in tarballs, but not in git repo. It's generated as explained above.

right. Then revise the comment, since its expected to be absent when we are building from
git sources.

The fix and the comment were copied wholesale and were originally written by Ross. How is POTFILES.in normally generated (i.e. without involving custom autogen.sh)?

any .in file is usually generated by maintainer into source tarball since the build is not consuming source tar anymore
this comment perhaps should be deleted.

Quoted 2 lines

Alex

#7 lore raw

Re: [PATCH 02/10] procps: upstream has switched to gitlab

I looked it up. Actually, potfiles.in is typically not a generated file, and should be placed under version control. The comment is valid.

Alex

Quoted 38 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
Quoted 3 lines · Khem Raj
Quoted 3 lines
Quoted 3 lines

Review

Quoted 3 lines
(quoted diff) +1 -1
-S = "${WORKDIR}/procps-ng-${PV}"
+# Upstream has a custom autogen.sh which invokes

po/update-potfiles as they

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

+# don't ship a po/POTFILES.in (which is silly). Without that file

gettext

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

+# doesn't believe po/ is a gettext directory and won't generate

po/Makefile.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 5 lines

Do we miss .in file from tarball ? Or is it missing in a git checkout This is expected when building in a maintainer mode Tarballs are produced by maintainers for users
Who wants to build from source

The .in is available in tarballs, but not in git repo. It's generated

as explained above.

Quoted 7 lines
Quoted 4 lines

right. Then revise the comment, since its expected to be absent when we are building from
git sources.

The fix and the comment were copied wholesale and were originally

written by Ross. How is POTFILES.in normally generated (i.e. without involving custom autogen.sh)?

any .in file is usually generated by maintainer into source tarball since the build is not consuming source tar anymore
this comment perhaps should be deleted.

Quoted 2 lines

Alex

#8 lore raw

Re: [PATCH 02/10] procps: upstream has switched to gitlab

Ok, thanks. for confirmation

Quoted 38 lines · Alexander Kanavin

I looked it up. Actually, potfiles.in is typically not a generated file, and should be placed under version control. The comment is valid.

Alex

Quoted 32 lines · Khem Raj
Quoted 14 lines · Alexander Kanavin
Quoted 12 lines · Khem Raj
Quoted 12 lines
Quoted 10 lines

Review

Quoted 5 lines
(quoted diff) +3 -1
-S = "${WORKDIR}/procps-ng-${PV}"
+# Upstream has a custom autogen.sh which invokes po/update-potfiles as they
+# don't ship a po/POTFILES.in (which is silly).  Without that file gettext
+# doesn't believe po/ is a gettext directory and won't generate po/Makefile.

Do we miss .in file from tarball ? Or is it missing in a git checkout This is expected when building in a maintainer mode Tarballs are produced by maintainers for users
Who wants to build from source

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

The .in is available in tarballs, but not in git repo. It's generated as explained above.

right. Then revise the comment, since its expected to be absent when we are building from
git sources.

The fix and the comment were copied wholesale and were originally written by Ross. How is POTFILES.in normally generated (i.e. without involving custom autogen.sh)?

any .in file is usually generated by maintainer into source tarball since the build is not consuming source tar anymore
this comment perhaps should be deleted.

Quoted 2 lines

Alex

#9 lore raw

PATCH 3/10 qemux86: do not add vga=0 to kernel parameters

In reply to Alexander Kanavin

This was added ages ago to enable GL passthrough with vmware driver, and is no longer relevant, as std or virgl is used instead nowadays.

Original commit:

commit 072545b1111c5efb66289a4866897429f5fcd969

Author: Richard Purdie <[email protected]>
Date:   Wed Jan 21 17:40:51 2009 +0000

scripts/poky-qemu-internal: Add support for GL passthrough in qemux86 images

---
 meta/conf/machine/include/qemuboot-x86.inc        | 2 +-
 scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/conf/machine/include/qemuboot-x86.inc +1 -1
index 495418fa04..049681b27d 100644
@@ -8,7 +8,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo"
 
 QB_AUDIO_DRV = "alsa"
 QB_AUDIO_OPT = "-soundhw ac97,es1370"
-QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
 QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
 # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
 QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
scripts/lib/wic/canned-wks/qemux86-directdisk.wks +1 -1
index c8d9f121b5..22b45217f1 100644
@@ -4,5 +4,5 @@
 
 include common.wks.inc
 
-bootloader  --timeout=0  --append="vga=0 rw oprofile.timer=1 rootfstype=ext4 "
+bootloader  --timeout=0  --append="rw oprofile.timer=1 rootfstype=ext4 "
 
Signature · 1 line
2.25.0
#10 lore raw

PATCH 4/10 qemux86: drop resolution setting via uvesafb

In reply to Alexander Kanavin

I am not sure if this has ever worked, but uvesafb is a really outdated (VBE from the 1990s), awkward (needs v86d) and limited (no support for high resolutions) way to do it.

The specific reason 640x480-32 was introduced (ages ago) was to force 32 bit mode with vmware driver, as 16bit had rendering issues.

The modern, supported option is video=... kernel parameter documented here:
https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID
https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst
which can be passed directly to runqemu and doesn't require special kernel modules.

Sato under X will continue to use 640x480 as that is hardcoded into xorg.conf under qemu.

---
 meta/conf/machine/include/qemuboot-x86.inc | 3 +--
 meta/conf/machine/qemux86-64.conf          | 4 ----
 meta/conf/machine/qemux86.conf             | 4 ----
 meta/lib/oeqa/runtime/cases/parselogs.py   | 4 ----
 4 files changed, 1 insertion(+), 14 deletions(-)
meta/conf/machine/include/qemuboot-x86.inc +1 -2
index 049681b27d..5dcc8b6f6b 100644
@@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo"
 
 QB_AUDIO_DRV = "alsa"
 QB_AUDIO_OPT = "-soundhw ac97,es1370"
-QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1"
 QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
 # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
 QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
 
-UVESA_MODE ?= "640x480-32"
meta/conf/machine/qemux86-64.conf +0 -4
index 648cf2fe8f..db9004ee32 100644
@@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
 
-KERNEL_MODULE_AUTOLOAD += "uvesafb"
-KERNEL_MODULE_PROBECONF += "uvesafb"
-module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
-
 WKS_FILE ?= "qemux86-directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 
meta/conf/machine/qemux86.conf +0 -4
index 8e0da82076..7e6723b880 100644
@@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
 
-KERNEL_MODULE_AUTOLOAD += "uvesafb"
-KERNEL_MODULE_PROBECONF += "uvesafb"
-module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
-
 WKS_FILE ?= "qemux86-directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 
meta/lib/oeqa/runtime/cases/parselogs.py +0 -4
index 9dafb89b03..3cad0709a1 100644
@@ -60,7 +60,6 @@ common_errors = [
     ]
 
 video_related = [
-    "uvesafb",
 ]
 
 x86_common = [
@@ -82,11 +81,8 @@ qemux86_common = [
     "fail to add MMCONFIG information, can't access extended PCI configuration space under this bridge.",
     "can't claim BAR ",
     'amd_nb: Cannot enumerate AMD northbridges',
-    'uvesafb: 5000 ms task timeout, infinitely waiting',
     'tsc: HPET/PMTIMER calibration failed',
     "modeset(0): Failed to initialize the DRI2 extension",
-    "uvesafb: cannot reserve video memory at",
-    "uvesafb: probe of uvesafb.0 failed with error",
     "glamor initialization failed",
 ] + common_errors
 
Signature · 1 line
2.25.0
#11 lore raw

Re: [PATCH 04/10] qemux86: drop resolution setting via uvesafb

Why you think it doesn't support higher resolution? We were using it with fullHD in VirtualBox until recently.

Quoted 117 lines · Alexander Kanavin

I am not sure if this has ever worked, but uvesafb is a really outdated (VBE from the 1990s), awkward (needs v86d) and limited (no support for high resolutions) way to do it.

The specific reason 640x480-32 was introduced (ages ago) was to force 32 bit mode with vmware driver, as 16bit had rendering issues.

The modern, supported option is video=... kernel parameter documented here:

https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID
https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst
which can be passed directly to runqemu and doesn't require special kernel modules.

Sato under X will continue to use 640x480 as that is hardcoded into xorg.conf under qemu.

---
 meta/conf/machine/include/qemuboot-x86.inc | 3 +--
 meta/conf/machine/qemux86-64.conf          | 4 ----
 meta/conf/machine/qemux86.conf             | 4 ----
 meta/lib/oeqa/runtime/cases/parselogs.py   | 4 ----
 4 files changed, 1 insertion(+), 14 deletions(-)
meta/conf/machine/include/qemuboot-x86.inc +0 -1
index 049681b27d..5dcc8b6f6b 100644
@@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo"
 
 QB_AUDIO_DRV = "alsa"
 QB_AUDIO_OPT = "-soundhw ac97,es1370"
-QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE}

oprofile.timer=1 uvesafb.task_timeout=-1" +QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1"
QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
# Add the 'virtio-rng-pci' device otherwise the guest may run out of
entropy
QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0

meta/conf/machine/include/qemuboot-x86.inc +0 -2
-device virtio-rng-pci,rng=rng0"
 
-UVESA_MODE ?= "640x480-32"
meta/conf/machine/qemux86-64.conf +0 -0
index 648cf2fe8f..db9004ee32 100644
@@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370

kernel-module-snd-rawmidi"

meta/conf/machine/qemux86-64.conf +0 -4
-KERNEL_MODULE_AUTOLOAD += "uvesafb"
-KERNEL_MODULE_PROBECONF += "uvesafb"
-module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
-
 WKS_FILE ?= "qemux86-directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot

syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

meta/conf/machine/qemux86.conf +0 -0
index 8e0da82076..7e6723b880 100644
@@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370

kernel-module-snd-rawmidi"

meta/conf/machine/qemux86.conf +0 -4
-KERNEL_MODULE_AUTOLOAD += "uvesafb"
-KERNEL_MODULE_PROBECONF += "uvesafb"
-module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
-
 WKS_FILE ?= "qemux86-directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot

syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

meta/lib/oeqa/runtime/cases/parselogs.py +0 -5
index 9dafb89b03..3cad0709a1 100644
@@ -60,7 +60,6 @@ common_errors = [
     ]
 
 video_related = [
-    "uvesafb",
 ]
 
 x86_common = [
@@ -82,11 +81,8 @@ qemux86_common = [
     "fail to add MMCONFIG information, can't access extended PCI
 configuration space under this bridge.",
     "can't claim BAR ",
     'amd_nb: Cannot enumerate AMD northbridges',
-    'uvesafb: 5000 ms task timeout, infinitely waiting',
     'tsc: HPET/PMTIMER calibration failed',
     "modeset(0): Failed to initialize the DRI2 extension",
-    "uvesafb: cannot reserve video memory at",
-    "uvesafb: probe of uvesafb.0 failed with error",
     "glamor initialization failed",
 ] + common_errors
 
--

2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#12 lore raw

Re: [PATCH 04/10] qemux86: drop resolution setting via uvesafb

What about higher than fullHD?

Alex

Quoted 125 lines · Martin Jansa

Why you think it doesn't support higher resolution? We were using it with fullHD in VirtualBox until recently.

Quoted 118 lines · Alexander Kanavin

I am not sure if this has ever worked, but uvesafb is a really outdated (VBE from the 1990s), awkward (needs v86d) and limited (no support for high resolutions) way to do it.

The specific reason 640x480-32 was introduced (ages ago) was to force 32 bit mode with vmware driver, as 16bit had rendering issues.

The modern, supported option is video=... kernel parameter documented here:

https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID
https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst
which can be passed directly to runqemu and doesn't require special kernel modules.

Sato under X will continue to use 640x480 as that is hardcoded into xorg.conf under qemu.

---
 meta/conf/machine/include/qemuboot-x86.inc | 3 +--
 meta/conf/machine/qemux86-64.conf          | 4 ----
 meta/conf/machine/qemux86.conf             | 4 ----
 meta/lib/oeqa/runtime/cases/parselogs.py   | 4 ----
 4 files changed, 1 insertion(+), 14 deletions(-)
meta/conf/machine/include/qemuboot-x86.inc +0 -1
index 049681b27d..5dcc8b6f6b 100644
@@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo"
 
 QB_AUDIO_DRV = "alsa"
 QB_AUDIO_OPT = "-soundhw ac97,es1370"
-QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE}

oprofile.timer=1 uvesafb.task_timeout=-1" +QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1"
QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
# Add the 'virtio-rng-pci' device otherwise the guest may run out of
entropy
QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0

meta/conf/machine/include/qemuboot-x86.inc +0 -2
-device virtio-rng-pci,rng=rng0"
 
-UVESA_MODE ?= "640x480-32"
meta/conf/machine/qemux86-64.conf +0 -0
index 648cf2fe8f..db9004ee32 100644
@@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370

kernel-module-snd-rawmidi"

meta/conf/machine/qemux86-64.conf +0 -4
-KERNEL_MODULE_AUTOLOAD += "uvesafb"
-KERNEL_MODULE_PROBECONF += "uvesafb"
-module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
-
 WKS_FILE ?= "qemux86-directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot

syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

meta/conf/machine/qemux86.conf +0 -0
index 8e0da82076..7e6723b880 100644
@@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370

kernel-module-snd-rawmidi"

meta/conf/machine/qemux86.conf +0 -4
-KERNEL_MODULE_AUTOLOAD += "uvesafb"
-KERNEL_MODULE_PROBECONF += "uvesafb"
-module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
-
 WKS_FILE ?= "qemux86-directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot

syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

meta/lib/oeqa/runtime/cases/parselogs.py +0 -5
index 9dafb89b03..3cad0709a1 100644
@@ -60,7 +60,6 @@ common_errors = [
     ]
 
 video_related = [
-    "uvesafb",
 ]
 
 x86_common = [
@@ -82,11 +81,8 @@ qemux86_common = [
     "fail to add MMCONFIG information, can't access extended PCI
 configuration space under this bridge.",
     "can't claim BAR ",
     'amd_nb: Cannot enumerate AMD northbridges',
-    'uvesafb: 5000 ms task timeout, infinitely waiting',
     'tsc: HPET/PMTIMER calibration failed',
     "modeset(0): Failed to initialize the DRI2 extension",
-    "uvesafb: cannot reserve video memory at",
-    "uvesafb: probe of uvesafb.0 failed with error",
     "glamor initialization failed",
 ] + common_errors
 
--

2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#13 lore raw

Re: [PATCH 04/10] qemux86: drop resolution setting via uvesafb

Specifically, this page does indicate that Linux kernel stops at 1920x1200, and even that is entirely non-standard. VBE is a 90s relic.
https://en.wikipedia.org/wiki/VESA_BIOS_Extensions#Linux_video_mode_numbers

Alex

Quoted 131 lines · Alexander Kanavin

What about higher than fullHD?

Alex

Quoted 125 lines · Martin Jansa

Why you think it doesn't support higher resolution? We were using it with fullHD in VirtualBox until recently.

Quoted 118 lines · Alexander Kanavin

I am not sure if this has ever worked, but uvesafb is a really outdated (VBE from the 1990s), awkward (needs v86d) and limited (no support for high resolutions) way to do it.

The specific reason 640x480-32 was introduced (ages ago) was to force 32 bit mode with vmware driver, as 16bit had rendering issues.

The modern, supported option is video=... kernel parameter documented here:

https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID
https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst
which can be passed directly to runqemu and doesn't require special kernel modules.

Sato under X will continue to use 640x480 as that is hardcoded into xorg.conf under qemu.

---
 meta/conf/machine/include/qemuboot-x86.inc | 3 +--
 meta/conf/machine/qemux86-64.conf          | 4 ----
 meta/conf/machine/qemux86.conf             | 4 ----
 meta/lib/oeqa/runtime/cases/parselogs.py   | 4 ----
 4 files changed, 1 insertion(+), 14 deletions(-)
meta/conf/machine/include/qemuboot-x86.inc +0 -1
index 049681b27d..5dcc8b6f6b 100644
@@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo"
 
 QB_AUDIO_DRV = "alsa"
 QB_AUDIO_OPT = "-soundhw ac97,es1370"
-QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE}

oprofile.timer=1 uvesafb.task_timeout=-1" +QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1"
QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
# Add the 'virtio-rng-pci' device otherwise the guest may run out of
entropy
QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0

meta/conf/machine/include/qemuboot-x86.inc +0 -2
-device virtio-rng-pci,rng=rng0"
 
-UVESA_MODE ?= "640x480-32"
meta/conf/machine/qemux86-64.conf +0 -0
index 648cf2fe8f..db9004ee32 100644
@@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370

kernel-module-snd-rawmidi"

meta/conf/machine/qemux86-64.conf +0 -4
-KERNEL_MODULE_AUTOLOAD += "uvesafb"
-KERNEL_MODULE_PROBECONF += "uvesafb"
-module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
-
 WKS_FILE ?= "qemux86-directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot

syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

meta/conf/machine/qemux86.conf +0 -0
index 8e0da82076..7e6723b880 100644
@@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370

kernel-module-snd-rawmidi"

meta/conf/machine/qemux86.conf +0 -4
-KERNEL_MODULE_AUTOLOAD += "uvesafb"
-KERNEL_MODULE_PROBECONF += "uvesafb"
-module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
-
 WKS_FILE ?= "qemux86-directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot

syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

meta/lib/oeqa/runtime/cases/parselogs.py +0 -5
index 9dafb89b03..3cad0709a1 100644
@@ -60,7 +60,6 @@ common_errors = [
     ]
 
 video_related = [
-    "uvesafb",
 ]
 
 x86_common = [
@@ -82,11 +81,8 @@ qemux86_common = [
     "fail to add MMCONFIG information, can't access extended PCI
 configuration space under this bridge.",
     "can't claim BAR ",
     'amd_nb: Cannot enumerate AMD northbridges',
-    'uvesafb: 5000 ms task timeout, infinitely waiting',
     'tsc: HPET/PMTIMER calibration failed',
     "modeset(0): Failed to initialize the DRI2 extension",
-    "uvesafb: cannot reserve video memory at",
-    "uvesafb: probe of uvesafb.0 failed with error",
     "glamor initialization failed",
 ] + common_errors
 
--

2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#14 lore raw

PATCH 5/10 weston-init: use the drm backend rather than fbdev one

In reply to Alexander Kanavin

The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users.

Note that 3D acceleration is not required; the backend renders fine via the software driver in mesa.

---
 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini
meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini deleted +0 -2
deleted file mode 100644
index 17ebd7fdab..0000000000
@@ -1,2 +0,0 @@
-[core]
-backend=fbdev-backend.so
Signature · 1 line
2.25.0
#15 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 9 lines · Alexander Kanavin

The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users.

Note that 3D acceleration is not required; the backend renders fine via the software driver in mesa.

Please specify what all qemu machines have been tested, since we do not test weston images
runtime, this will silently break untested qemu machines.

Quoted 22 lines
---
 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini
meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini deleted +0 -3
deleted file mode 100644
index 17ebd7fdab..0000000000
@@ -1,2 +0,0 @@
-[core]
-backend=fbdev-backend.so
--

2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#16 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 4 lines · Khem Raj

Please specify what all qemu machines have been tested, since we do not test weston images
runtime, this will silently break untested qemu machines.

Autobuilder does test core-image-weston on qemux86_64 and that's where I verified the change.

Alex

Quoted 26 lines
Quoted 5 lines
---
 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644

meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini

Quoted 2 lines

diff --git

a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini

Quoted 15 lines

deleted file mode 100644
index 17ebd7fdab..0000000000

meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini deleted +0 -3
@@ -1,2 +0,0 @@
-[core]
-backend=fbdev-backend.so
--

2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#17 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 10 lines · Alexander Kanavin
Quoted 4 lines · Khem Raj

Please specify what all qemu machines have been tested, since we do not test weston images
runtime, this will silently break untested qemu machines.

Autobuilder does test core-image-weston on qemux86_64 and that's where I verified the change.

qemuall, applies to other qemu machines for arm/aarch64/mips/ppc/riscv as well, in recent past I knew
this change was needed for qemumips and qemuarm to boot core-image-weston, I am not sure if
anything has changed since then. I think this change would need some more testing.

Quoted 25 lines

Alex

Quoted 23 lines
Quoted 23 lines
---
 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini
meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini deleted +0 -3
deleted file mode 100644
index 17ebd7fdab..0000000000
@@ -1,2 +0,0 @@
-[core]
-backend=fbdev-backend.so
--

2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#18 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 7 lines · Khem Raj

qemuall, applies to other qemu machines for arm/aarch64/mips/ppc/riscv as well, in recent past I knew
this change was needed for qemumips and qemuarm to boot core-image-weston, I am not sure if
anything has changed since then. I think this change would need some more testing.

Sure, but the testing should be done by people who need those other machines to be able to boot weston; I would want to draw the line at what is currently covered by the autobuilder (which is just qemux86_64).

We can then use the fallback in a more targeted way, although the proper fix would be to look into why the default backend isn't working.

Alex

#19 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 11 lines · Alexander Kanavin
Quoted 7 lines · Khem Raj

qemuall, applies to other qemu machines for arm/aarch64/mips/ppc/riscv as well, in recent past I knew
this change was needed for qemumips and qemuarm to boot core-image-weston, I am not sure if
anything has changed since then. I think this change would need some more testing.

Quoted 2 lines

Sure, but the testing should be done by people who need those other machines to be able to boot weston; I would want to draw the line at what is currently covered by the autobuilder (which is just qemux86_64).

perhaps then make this chage such thst it only affects the architecture you have tested.

Quoted 3 lines

We can then use the fallback in a more targeted way, although the proper fix would be to look into why the default backend isn't working.

Alex

#20 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 8 lines · Khem Raj
Quoted 2 lines

Sure, but the testing should be done by people who need those other

machines to be able to boot weston; I would want to draw the line at what is currently covered by the autobuilder (which is just qemux86_64).

Quoted 1 line

perhaps then make this chage such thst it only affects the architecture you have tested.

Fbdev backend is not documented, and there is no guarantee by upstream that it will work. You wouldn’t want to use it on actual targets either as it has no hw acceleration support. I think the change should apply to all, we should test standard drm/kms code paths everywhere and fix/report issues as needed.

Alex

#21 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 10 lines · Alexander Kanavin

\perhaps then make this chage such thst it only affects the

Quoted 1 line

architecture you have tested.

Fbdev backend is not documented, and there is no guarantee by upstream that it will work. You wouldn’t want to use it on actual targets either as it has no hw acceleration support. I think the change should apply to all, we should test standard drm/kms code paths everywhere and fix/report issues as needed.

The issue with qemumips in particular is that it is still using cirrus for the graphics card, which has been superseded by '-vga std' for a long time:
https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/

If that is switched, then fbdev backend should be no longer necessary just like in qemux86_64.

Alex

#22 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 8 lines · Alexander Kanavin
Quoted 6 lines · Alexander Kanavin
Quoted 3 lines

\perhaps then make this chage such thst it only affects the architecture you have tested.

Fbdev backend is not documented, and there is no guarantee by upstream that it will work. You wouldn’t want to use it on actual targets either as it has no hw acceleration support. I think the change should apply to all, we should test standard drm/kms code paths everywhere and fix/report issues as needed.

hw acceleration is not going to work for non-x86 qemus, while other qemus should be fixed but not
by breaking them first. As suggested limit this change to tested architectures and it would be fine.
then if interested to fix it globally make changes to fix rest of qemus and then instrument global change
after that

Quoted 7 lines

The issue with qemumips in particular is that it is still using cirrus for the graphics card, which has been superseded by '-vga std' for a long time:
https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/

If that is switched, then fbdev backend should be no longer necessary just like in qemux86_64.

this is interesting, I will try it out on mips.

Quoted 1 line

Alex

#23 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 9 lines · Khem Raj

hw acceleration is not going to work for non-x86 qemus, while other qemus should be fixed but not
by breaking them first. As suggested limit this change to tested architectures and it would be fine.
then if interested to fix it globally make changes to fix rest of qemus and then instrument global change
after that

arm64 qemu should work, as it is using the same video hardware as x86_64. My computing resources are severely limited right now, so I cannot try it out immediately unfortunately, but I'll get to it, or you are welcome to try and report.
Mips can be either fixed like suggested, or be a specific exception.

For the rest of the targets, I see that you have extended the fbdev fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone is using them to run weston (not to mention how painfully slow that would be), and so it would just be wasteful to test or fix them.

Alex

#24 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 12 lines · Alexander Kanavin
Quoted 9 lines · Khem Raj

hw acceleration is not going to work for non-x86 qemus, while other qemus should be fixed but not
by breaking them first. As suggested limit this change to tested architectures and it would be fine.
then if interested to fix it globally make changes to fix rest of qemus and then instrument global change
after that

Quoted 4 lines

arm64 qemu should work, as it is using the same video hardware as x86_64. My computing resources are severely limited right now, so I cannot try it out immediately unfortunately,

Ok then resend it later

but I'll get to it, or you are welcome to try and report.

Quoted 7 lines

Mips can be either fixed like suggested, or be a specific exception.

For the rest of the targets, I see that you have extended the fbdev fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone is using them to run weston (not to mention how painfully slow that would be), and so it would just be wasteful to test or fix them.

We should be only applying tested part debugging these breakages is very hard so when we know it will break we should be careful as with this patch

Quoted 3 lines

Alex

#25 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 4 lines · Khem Raj

but I'll get to it, or you are welcome to try and report.

Quoted 2 lines

Mips can be either fixed like suggested, or be a specific exception.

Quoted 9 lines
Quoted 5 lines

For the rest of the targets, I see that you have extended the fbdev fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone is using them to run weston (not to mention how painfully slow that would be), and so it would just be wasteful to test or fix them.

We should be only applying tested part debugging these breakages is very hard so when we know it will break we should be careful as with this patch

I have tested these things now:

1. Switching mips from cirrus to std vga works fine, as long as xorg.conf is also deleted (it's written specifically for cirrus and isn't working or needed with std vga). Both weston and sato boot and look right. I'll send a patch for it.

2. Switching weston to kms backend degrades performance to unusable level, as neither kvm nor virtio/virgl are available for non-x86 qemu, and kms backend is using software renderer in mesa. So fbdev is the only realistic option there. But for x86 qemu kms is still viable. I'm not sure how to best configure it though.

Alex

#26 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 10 lines · Alexander Kanavin
Quoted 8 lines · Khem Raj
Quoted 6 lines

but I'll get to it, or you are welcome to try and report. Mips can be either fixed like suggested, or be a specific exception.

For the rest of the targets, I see that you have extended the fbdev fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone is using them to run weston (not to mention how painfully slow that would be), and so it would just be wasteful to test or fix them.

Quoted 8 lines
Quoted 1 line

We should be only applying tested part debugging these breakages is very hard so when we know it will break we should be careful as with this patch

I have tested these things now:

1. Switching mips from cirrus to std vga works fine, as long as xorg.conf is also deleted (it's written specifically for cirrus and isn't working or needed with std vga). Both weston and sato boot and look right. I'll send a patch for it.

2. Switching weston to kms backend degrades performance to unusable level, as neither kvm nor virtio/virgl are available for non-x86 qemu, and kms backend is using software renderer in mesa. So fbdev is the only realistic option there. But for x86 qemu kms is still viable. I'm not sure how to best configure it though.

copy qemuall/weston.ini new folders qemux86 and qemux86-64 and point to backend it should be using.

Quoted 2 lines

Alex

#27 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Will that take precedence over qemuall though? Sounds brittle. Another option is to make the fbdev configuration specific to mips and arm, as using kms does not need a configuration at all.

Alex

Quoted 39 lines · Khem Raj
Quoted 8 lines · Alexander Kanavin
Quoted 6 lines · Khem Raj
Quoted 6 lines

but I'll get to it, or you are welcome to try and report. Mips can be either fixed like suggested, or be a specific exception.

For the rest of the targets, I see that you have extended the fbdev

fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone is using them to run weston (not to mention how painfully slow that would be), and so it would just be wasteful to test or fix them.

Quoted 3 lines
Quoted 3 lines

We should be only applying tested part debugging these breakages is

very hard so when we know it will break we should be careful as with this patch

Quoted 5 lines

I have tested these things now:

1. Switching mips from cirrus to std vga works fine, as long as

xorg.conf is also deleted (it's written specifically for cirrus and isn't working or needed with std vga). Both weston and sato boot and look right. I'll send a patch for it.

Quoted 2 lines

2. Switching weston to kms backend degrades performance to unusable

level, as neither kvm nor virtio/virgl are available for non-x86 qemu, and kms backend is using software renderer in mesa. So fbdev is the only realistic option there. But for x86 qemu kms is still viable. I'm not sure how to best configure it though.

copy qemuall/weston.ini new folders qemux86 and qemux86-64 and point to backend it should be using.

Quoted 2 lines

Alex

#28 lore raw

Re: [PATCH 05/10] weston-init: use the drm backend rather than fbdev one

Quoted 2 lines · Alexander Kanavin

Will that take precedence over qemuall though? Sounds brittle. Another option is to make the fbdev configuration specific to mips and arm, as using kms does not need a configuration at all.

I think it will. arch specific overrides should come before generic ones.

Quoted 46 lines

Alex

On Wed 19. Feb 2020 at 18.21, Khem Raj <[email protected] <mailto:[email protected]>> wrote:

On Wed, Feb 19, 2020 at 1:45 AM Alexander Kanavin <[email protected] <mailto:[email protected]>> wrote:
>
> On Tue, 18 Feb 2020 at 02:56, Khem Raj <[email protected]
<mailto:[email protected]>> wrote:
>>
>>
>>> but I'll get to it, or you are welcome to try and report. >>> Mips can be either fixed like suggested, or be a specific
exception.
>>>
>>> For the rest of the targets, I see that you have extended the
fbdev fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone is using them to run weston (not to mention how painfully slow that would be), and so it would just be wasteful to test or fix them.
>>
>>
>> We should be only applying tested part debugging these breakages
is very hard so when we know it will break we should be careful as with this patch
>
>
> I have tested these things now:
>
> 1. Switching mips from cirrus to std vga works fine, as long as
xorg.conf is also deleted (it's written specifically for cirrus and isn't working or needed with std vga). Both weston and sato boot and look right. I'll send a patch for it.
>
> 2. Switching weston to kms backend degrades performance to
unusable level, as neither kvm nor virtio/virgl are available for non-x86 qemu, and kms backend is using software renderer in mesa. So fbdev is the only realistic option there. But for x86 qemu kms is still viable. I'm not sure how to best configure it though.

copy qemuall/weston.ini new folders qemux86 and qemux86-64 and point to backend it should be using.

>
> Alex

#29 lore raw

PATCH 6/10 webkitgtk: x11 and wayland are not mutually exclusive

In reply to Alexander Kanavin

Also enabling wayland if x11 is not enabled is not necessarily the correct decision.

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
index c7f0d5e983..4aa8533b42 100644
@@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
 	   gettext-native glib-2.0 glib-2.0-native libtasn1 \
           "
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \
                    enchant \
                    libsecret \
Signature · 1 line
2.25.0
#30 lore raw

PATCH 7/10 weston: add a basic runtime test

In reply to Alexander Kanavin

The test is checking that weston is able to start.

---
 meta/classes/testimage.bbclass        |  2 +-
 meta/lib/oeqa/runtime/cases/weston.py | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 meta/lib/oeqa/runtime/cases/weston.py
meta/classes/testimage.bbclass +1 -1
index 75f0f2c3e3..9588f2c4f8 100644
@@ -57,7 +57,7 @@ BASICTESTSUITE = "\
     ping date df ssh scp python perl gi ptest parselogs \
     logrotate connman systemd oe_syslog pam stap ldd xorg \
     kernelmodule gcc buildcpio buildlzip buildgalculator \
-    dnf rpm opkg apt"
+    dnf rpm opkg apt weston"
 
 DEFAULT_TEST_SUITES = "${BASICTESTSUITE}"
 
meta/lib/oeqa/runtime/cases/weston.py new file +19 -0
new file mode 100644
index 0000000000..f32599afc3
@@ -0,0 +1,19 @@
+#
+# SPDX-License-Identifier: MIT
+#
+
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
+from oeqa.core.decorator.data import skipIfNotFeature
+from oeqa.runtime.decorator.package import OEHasPackage
+
+class WestonTest(OERuntimeTestCase):
+
+    @OETestDepends(['ssh.SSHTest.test_ssh'])
+    @OEHasPackage(['weston'])
+    def test_weston_running(self):
+        cmd ='%s | grep [w]eston-desktop-shell' % self.tc.target_cmds['ps']
+        status, output = self.target.run(cmd)
+        msg = ('Weston does not appear to be running %s' %
+              self.target.run(self.tc.target_cmds['ps'])[1])
+        self.assertEqual(status, 0, msg=msg)
Signature · 1 line
2.25.0
#31 lore raw

PATCH 8/10 webkitgtk: unbreak wayland build

In reply to Alexander Kanavin

webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble).

---
 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb    | 19 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb  |  2 +-
 .../webkit/wpebackend-fdo_1.4.1.bb            | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
 create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +19 -0
new file mode 100644
index 0000000000..b9c71f9dc5
@@ -0,0 +1,19 @@
+SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit."
+HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe"
+BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
+DEPENDS = "virtual/egl libxkbcommon"
+
+# Workaround build issue with RPi userland EGL libraries.
+CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f"
+SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"
+SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060"
+SRC_URI[sha384sum] = "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0"
+SRC_URI[sha512sum] = "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670"
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
index 4aa8533b42..8d87ad49a3 100644
@@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
                    libsecret \
                   "
 
-PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland"
+PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
 PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
 PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
 PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +19 -0
new file mode 100644
index 0000000000..84df0c2535
@@ -0,0 +1,19 @@
+SUMMARY = "WPE's backend based on a freedesktop.org stack."
+HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo"
+BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
+DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe"
+
+DEPENDS_append_class-target = " wayland-native"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2"
+SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"
+SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c"
+SRC_URI[sha384sum] = "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d"
+SRC_URI[sha512sum] = "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4"
+
Signature · 1 line
2.25.0
#32 lore raw

Re: [PATCH 08/10] webkitgtk: unbreak wayland build

Do we need sha384sum, sha512sum, sha1sum checksums for these 2 for whatever reason?

Quoted 103 lines · Alexander Kanavin

webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble).

---
 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb    | 19 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb  |  2 +-
 .../webkit/wpebackend-fdo_1.4.1.bb            | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
 create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +1 -0
new file mode 100644
index 0000000000..b9c71f9dc5
@@ -0,0 +1,19 @@
+SUMMARY = "General-purpose library specifically developed for the

WPE-flavored port of WebKit."

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +9 -0
+HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe"
+BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
+DEPENDS = "virtual/egl libxkbcommon"
+
+# Workaround build issue with RPi userland EGL libraries.
+CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES',

'vc4graphics', '', '-D_GNU_SOURCE', d)}"

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +6 -0
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f"
+SRC_URI[sha256sum] =

"09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +2 -0
+SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060"
+SRC_URI[sha384sum] =

"30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0" +SRC_URI[sha512sum] = "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670"

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -1
index 4aa8533b42..8d87ad49a3 100644
@@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
 'wayland x11', d)} \
                    libsecret \
                   "
 
-PACKAGECONFIG[wayland] =

"-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
PACKAGECONFIG[x11] =
"-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
PACKAGECONFIG[geoclue] =
"-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
PACKAGECONFIG[enchant] =
"-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"

meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +15 -0
new file mode 100644
index 0000000000..84df0c2535
@@ -0,0 +1,19 @@
+SUMMARY = "WPE's backend based on a freedesktop.org stack."
+HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo"
+BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
+DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe"
+
+DEPENDS_append_class-target = " wayland-native"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2"
+SRC_URI[sha256sum] =

"6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"

meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +2 -0
+SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c"
+SRC_URI[sha384sum] =

"79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d" +SRC_URI[sha512sum] = "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4" +
--
2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#33 lore raw

Re: [PATCH 08/10] webkitgtk: unbreak wayland build

bitbake told me to add them (when the existing md5/sha256 checksums were deemed incorrect), and so I did.

Alex

Quoted 110 lines · Martin Jansa

Do we need sha384sum, sha512sum, sha1sum checksums for these 2 for whatever reason?

Quoted 103 lines · Alexander Kanavin

webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble).

---
 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb    | 19 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb  |  2 +-
 .../webkit/wpebackend-fdo_1.4.1.bb            | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
 create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +1 -0
new file mode 100644
index 0000000000..b9c71f9dc5
@@ -0,0 +1,19 @@
+SUMMARY = "General-purpose library specifically developed for the

WPE-flavored port of WebKit."

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +9 -0
+HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe"
+BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
+DEPENDS = "virtual/egl libxkbcommon"
+
+# Workaround build issue with RPi userland EGL libraries.
+CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES',

'vc4graphics', '', '-D_GNU_SOURCE', d)}"

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +6 -0
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f"
+SRC_URI[sha256sum] =

"09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +2 -0
+SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060"
+SRC_URI[sha384sum] =

"30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0" +SRC_URI[sha512sum] = "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670"

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -1
index 4aa8533b42..8d87ad49a3 100644
@@ -44,7 +44,7 @@ PACKAGECONFIG ??=
 "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
                    libsecret \
                   "
 
-PACKAGECONFIG[wayland] =

"-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
PACKAGECONFIG[x11] =
"-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
PACKAGECONFIG[geoclue] =
"-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
PACKAGECONFIG[enchant] =
"-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"

meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +15 -0
new file mode 100644
index 0000000000..84df0c2535
@@ -0,0 +1,19 @@
+SUMMARY = "WPE's backend based on a freedesktop.org stack."
+HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo"
+BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
+DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe"
+
+DEPENDS_append_class-target = " wayland-native"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2"
+SRC_URI[sha256sum] =

"6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"

meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +2 -0
+SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c"
+SRC_URI[sha384sum] =

"79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d" +SRC_URI[sha512sum] = "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4" +
--
2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#34 lore raw

Re: [PATCH 08/10] webkitgtk: unbreak wayland build

Quoted 2 lines · Alexander Kanavin

bitbake told me to add them (when the existing md5/sha256 checksums were deemed incorrect), and so I did.

I think that is an unintended side effect of some new changes to bitbake to support the other forms.

I think at this point we should fix it to print the sha256 and not anything else? We can then slowly drop the md5sums.

Cheers,

Richard

#35 lore raw

Re: [PATCH 08/10] webkitgtk: unbreak wayland build

In reply to Alexander Kanavin
Quoted 4 lines · Alexander Kanavin

webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble).

its not meta-browser, I guess you should credit meta-wpe here [1] and perhaps Cc the meta-wpe maintainer as a courtesy.

[1] https://github.com/WebPlatformForEmbedded/meta-wpe/tree/master/recipes-wpe/libwpe

Quoted 81 lines
---
 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb    | 19 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb  |  2 +-
 .../webkit/wpebackend-fdo_1.4.1.bb            | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
 create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +19 -0
new file mode 100644
index 0000000000..b9c71f9dc5
@@ -0,0 +1,19 @@
+SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit."
+HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe"
+BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
+DEPENDS = "virtual/egl libxkbcommon"
+
+# Workaround build issue with RPi userland EGL libraries.
+CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f"
+SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"
+SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060"
+SRC_URI[sha384sum] = "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0"
+SRC_URI[sha512sum] = "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670"
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
index 4aa8533b42..8d87ad49a3 100644
@@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
                    libsecret \
                   "
 
-PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland"
+PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
 PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
 PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
 PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +19 -1
new file mode 100644
index 0000000000..84df0c2535
@@ -0,0 +1,19 @@
+SUMMARY = "WPE's backend based on a freedesktop.org stack."
+HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo"
+BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
+DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe"
+
+DEPENDS_append_class-target = " wayland-native"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2"
+SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"
+SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c"
+SRC_URI[sha384sum] = "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d"
+SRC_URI[sha512sum] = "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4"
+
--

2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#36 lore raw

Re: [PATCH 08/10] webkitgtk: unbreak wayland build

Quoted 10 lines · Khem Raj
Quoted 4 lines · Alexander Kanavin

webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble).

its not meta-browser, I guess you should credit meta-wpe here [1] and perhaps Cc the meta-wpe maintainer as a courtesy.

Actually, it's copied from meta-webkit
https://github.com/Igalia/meta-webkit/
which does not say in the readme who the maintainer is, so I am not sure whom to CC.
I can adjust the commit msg though.

Alex

Quoted 103 lines

[1]
https://github.com/WebPlatformForEmbedded/meta-wpe/tree/master/recipes-wpe/libwpe

Review

Quoted 11 lines
---
 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb    | 19 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb  |  2 +-
 .../webkit/wpebackend-fdo_1.4.1.bb            | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
 create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
(quoted diff) +0 -0

b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb line 1

Quoted 6 lines

new file mode 100644
index 0000000000..b9c71f9dc5

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +1 -0
@@ -0,0 +1,19 @@
+SUMMARY = "General-purpose library specifically developed for the

WPE-flavored port of WebKit."

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb

Quoted 9 lines
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +9 -0
+HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe"
+BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
+DEPENDS = "virtual/egl libxkbcommon"
+
+# Workaround build issue with RPi userland EGL libraries.
+CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES',

'vc4graphics', '', '-D_GNU_SOURCE', d)}"

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb

Quoted 6 lines
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +6 -0
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f"
+SRC_URI[sha256sum] =

"09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb line 18

Quoted 2 lines
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +2 -0
+SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060"
+SRC_URI[sha384sum] =

"30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0"

meta/recipes-sato/webkit/libwpe_1.4.0.1.bb line 19

Quoted 1 line
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +1 -0
+SRC_URI[sha512sum] =

"cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670"

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb PACKAGECONFIG ??=

Quoted 4 lines

index 4aa8533b42..8d87ad49a3 100644

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -0
@@ -44,7 +44,7 @@ PACKAGECONFIG ??=

"${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \

Quoted 4 lines
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -1
                    libsecret \
                   "
 
-PACKAGECONFIG[wayland] =

"-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland"

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb PACKAGECONFIG ??= · line 47

Quoted 1 line
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -0
+PACKAGECONFIG[wayland] =

"-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb PACKAGECONFIG ??= · line 48

Quoted 1 line
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -0
 PACKAGECONFIG[x11] =

"-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb PACKAGECONFIG ??= · line 49

Quoted 1 line
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -0
 PACKAGECONFIG[geoclue] =

"-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb PACKAGECONFIG ??= · line 50

Quoted 1 line
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -0
 PACKAGECONFIG[enchant] =

"-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb

Quoted 10 lines

new file mode 100644
index 0000000000..84df0c2535

meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +5 -0
@@ -0,0 +1,19 @@
+SUMMARY = "WPE's backend based on a freedesktop.org stack."
+HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo"
+BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues"
+
+LICENSE = "BSD"

meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb line 15

Quoted 10 lines
meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +10 -0
+LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
+DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe"
+
+DEPENDS_append_class-target = " wayland-native"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2"
+SRC_URI[sha256sum] =

"6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"

meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb line 17

Quoted 2 lines
meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +2 -0
+SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c"
+SRC_URI[sha384sum] =

"79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d"

meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb line 18

Quoted 1 line
meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +1 -0
+SRC_URI[sha512sum] =

"8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4"

Quoted 9 lines
meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +1 -1
+
--

2.25.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#37 lore raw

Re: [PATCH 08/10] webkitgtk: unbreak wayland build

Quoted 10 lines · Alexander Kanavin
Quoted 8 lines · Khem Raj
Quoted 4 lines · Alexander Kanavin

webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble).

Quoted 8 lines
Quoted 2 lines

its not meta-browser, I guess you should credit meta-wpe here [1] and perhaps Cc the meta-wpe maintainer as a courtesy.

Actually, it's copied from meta-webkit
https://github.com/Igalia/meta-webkit/
which does not say in the readme who the maintainer is, so I am not sure whom to CC. I can adjust the commit msg though.

I've CC'd the WPE mailing list.

OE-core now has libwpe and wpebackend-fdo recipes. They should possibly be removed from meta-webkit to prevent duplication.

Quoted 94 lines

Alex

Quoted 79 lines

[1] https://github.com/WebPlatformForEmbedded/meta-wpe/tree/master/recipes-wpe/libwpe

Quoted 76 lines
---
 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb    | 19 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb  |  2 +-
 .../webkit/wpebackend-fdo_1.4.1.bb            | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
 create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file +19 -0
new file mode 100644
index 0000000000..b9c71f9dc5
@@ -0,0 +1,19 @@
+SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit."
+HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe"
+BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
+DEPENDS = "virtual/egl libxkbcommon"
+
+# Workaround build issue with RPi userland EGL libraries.
+CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f"
+SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"
+SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060"
+SRC_URI[sha384sum] = "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0"
+SRC_URI[sha512sum] = "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670"
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
index 4aa8533b42..8d87ad49a3 100644
@@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
                    libsecret \
                   "
 
-PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland"
+PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
 PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
 PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
 PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file +19 -1
new file mode 100644
index 0000000000..84df0c2535
@@ -0,0 +1,19 @@
+SUMMARY = "WPE's backend based on a freedesktop.org stack."
+HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo"
+BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
+DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe"
+
+DEPENDS_append_class-target = " wayland-native"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2"
+SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"
+SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c"
+SRC_URI[sha384sum] = "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d"
+SRC_URI[sha512sum] = "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4"
+
--

2.25.0

Quoted 5 lines
Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#38 lore raw

Re: [wpe-webkit] [PATCH 08/10] webkitgtk: unbreak wayland build

Quoted 21 lines · Joshua Watt
Quoted 10 lines · Alexander Kanavin
Quoted 8 lines · Khem Raj
Quoted 4 lines · Alexander Kanavin

webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble).

Quoted 8 lines
Quoted 2 lines

its not meta-browser, I guess you should credit meta-wpe here [1] and perhaps Cc the meta-wpe maintainer as a courtesy.

Actually, it's copied from meta-webkit
https://github.com/Igalia/meta-webkit/
which does not say in the readme who the maintainer is, so I am not sure whom to CC. I can adjust the commit msg though.

Quoted 5 lines

I've CC'd the WPE mailing list.

OE-core now has libwpe and wpebackend-fdo recipes. They should possibly be removed from meta-webkit to prevent duplication.

Thanks for the notification. Its great that those recipes are shipped now on the oe-core layer.

But I don't want to remove those recipes from meta-webkit, even if they are shipped now there.

That recipes are an essential part of meta-webkit, so I want to be able to raise the version or change them without depending on oe-core. For example: sometimes we need to use older versions of yocto, but we still want to use the last stable version of wpe/libwpe/wpebackend-fdo. So I find pretty useful to have all the core WPE related recipes on the meta-webkit layer and not depend on whatever oe-core ships.

There should be no conflict between the recipes as long as the name used for them its the same, bitbake should simply pick the last version by default.

Regards.

#39 lore raw

Re: [wpe-webkit] [PATCH 08/10] webkitgtk: unbreak wayland build

Quoted 43 lines · Carlos Alberto Lopez Perez
Quoted 12 lines · Joshua Watt
Quoted 10 lines · Alexander Kanavin
Quoted 8 lines · Khem Raj
Quoted 4 lines · Alexander Kanavin

webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble).

Quoted 7 lines
Quoted 7 lines
Quoted 2 lines

its not meta-browser, I guess you should credit meta-wpe here [1] and perhaps Cc the meta-wpe maintainer as a courtesy.

Actually, it's copied from meta-webkit
https://github.com/Igalia/meta-webkit/
which does not say in the readme who the maintainer is, so I am not

sure whom to CC.

Quoted 7 lines
Quoted 1 line

I can adjust the commit msg though.

I've CC'd the WPE mailing list.

OE-core now has libwpe and wpebackend-fdo recipes. They should possibly be removed from meta-webkit to prevent duplication.

Thanks for the notification. Its great that those recipes are shipped now on the oe-core layer.

But I don't want to remove those recipes from meta-webkit, even if they are shipped now there.

That recipes are an essential part of meta-webkit, so I want to be able to raise the version or change them without depending on oe-core. For example: sometimes we need to use older versions of yocto, but we still want to use the last stable version of wpe/libwpe/wpebackend-fdo. So I find pretty useful to have all the core WPE related recipes on the meta-webkit layer and not depend on whatever oe-core ships.

Quoted 4 lines

There should be no conflict between the recipes as long as the name used for them its the same, bitbake should simply pick the last version by default.

The version compare actually only matters for recipes in the same layer; if multiple layers provide the same recipe, the priority of the layers is what determines which one gets chosen (even if that means an older version in a higher priority layer would be chosen over a newer version in a lower priority layer).

Anyway, you should be fine because meta-webkit has a priority of 7 and oe-core is priority 5, so it will always choose the meta-webkit version, if that layer is present.

Quoted 4 lines

Regards.

#40 lore raw

PATCH 9/10 wayland: convert to meson build

In reply to Alexander Kanavin
---
 ...-the-native-wayland-scanner-directly.patch | 27 +++++++++++++++++++
 .../wayland/wayland_1.18.0.bb                 |  9 ++++---
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch new file +27 -0
new file mode 100644
index 0000000000..f98037a850
@@ -0,0 +1,27 @@
+From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Sun, 16 Feb 2020 16:29:53 +0100
+Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH
+
+Otherwise, meson attempts to use the target pkg-config and fails.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ src/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 3e8c9bf..294aee0 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -55,8 +55,7 @@ pkgconfig.generate(
+ )
+ 
+ if meson.is_cross_build()
+-	scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0')
+-	wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
++	wayland_scanner_for_build = find_program('wayland-scanner')
+ else
+ 	wayland_scanner_for_build = wayland_scanner
+ endif
meta/recipes-graphics/wayland/wayland_1.18.0.bb +5 -4
index 7a3f075552..21a848ff5a 100644
@@ -14,19 +14,20 @@ DEPENDS = "expat libffi wayland-native"
 
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://fixpathinpcfiles.patch \
+           file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \
            "
 SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"
 SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
 
-inherit autotools pkgconfig
+inherit meson pkgconfig
 
 PACKAGECONFIG ??= "dtd-validation"
-PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,,"
+PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,,"
 
-EXTRA_OECONF = "--disable-documentation --with-host-scanner"
-EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
+EXTRA_OEMESON = "-Ddocumentation=false"
+EXTRA_OECONF_class-native = "-Ddocumentation=false -Dlibraries=false"
 
 # Wayland installs a M4 macro for other projects to use, which uses the target
 # pkg-config to find files.  Replace pkg-config with pkg-config-native.
Signature · 1 line
2.25.0
#41 lore raw

Re: [PATCH 09/10] wayland: convert to meson build

Quoted 8 lines · Alexander Kanavin
---
 ...-the-native-wayland-scanner-directly.patch | 27
+++++++++++++++++++
 .../wayland/wayland_1.18.0.bb                 |  9 ++++---
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/wayland/0002-

meson.build-find-the-native-wayland-scanner-directly.patch

I pulled some of your patches into -next:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/718

I think the failures are related to this patch?

Cheers,

Richard

#42 lore raw

Re: [PATCH 09/10] wayland: convert to meson build

Quoted 10 lines · Richard Purdie
Quoted 8 lines · Alexander Kanavin
---
 ...-the-native-wayland-scanner-directly.patch | 27
+++++++++++++++++++
 .../wayland/wayland_1.18.0.bb                 |  9 ++++---
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/wayland/0002-

meson.build-find-the-native-wayland-scanner-directly.patch

Quoted 6 lines

I pulled some of your patches into -next:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/718

I think the failures are related to this patch?

Going slightly mad here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/1581/steps/8/logs/step1b
<https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/1581/steps/8/logs/step1b>libxkbcommon
and mesa have failed in do_configure, but I am not seeing the tasks being run?

Alex

#43 lore raw

Re: [PATCH 09/10] wayland: convert to meson build

Quoted 14 lines · Alexander Kanavin
Quoted 12 lines · Richard Purdie
Quoted 8 lines · Alexander Kanavin
---
 ...-the-native-wayland-scanner-directly.patch | 27
+++++++++++++++++++
 .../wayland/wayland_1.18.0.bb                 |  9 ++++---
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/wayland/0002-

meson.build-find-the-native-wayland-scanner-directly.patch

I pulled some of your patches into -next:

Quoted 8 lines
Quoted 3 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/718

I think the failures are related to this patch?

Going slightly mad here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/1581/steps/8/logs/step1b
libxkbcommon and mesa have failed in do_configure, but I am not seeing the tasks being run?

If I click the "download log" button there and download them I do see the failing tasks in the log?

Cheers,

Richard

#44 lore raw

Re: [PATCH 09/10] wayland: convert to meson build

In reply to Alexander Kanavin

Nevermind, found it. Forgot to click on the magnifying glass, before starting a search.

Alex

Quoted 30 lines · Alexander Kanavin
Quoted 10 lines · Richard Purdie
Quoted 8 lines · Alexander Kanavin
---
 ...-the-native-wayland-scanner-directly.patch | 27
+++++++++++++++++++
 .../wayland/wayland_1.18.0.bb                 |  9 ++++---
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/wayland/0002-

meson.build-find-the-native-wayland-scanner-directly.patch

Quoted 6 lines

I pulled some of your patches into -next:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/718

I think the failures are related to this patch?

Going slightly mad here:

https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/1581/steps/8/logs/step1b

<https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/1581/steps/8/logs/step1b>libxkbcommon
and mesa have failed in do_configure, but I am not seeing the tasks being run?

Alex

#45 lore raw

PATCH 10/10 ptest-packagelists: mention ifupdown ptest in a comment

In reply to Alexander Kanavin
---
 meta/conf/distro/include/ptest-packagelists.inc | 1 +
 1 file changed, 1 insertion(+)
meta/conf/distro/include/ptest-packagelists.inc +1 -0
index 0a13bf0a6c..23865ac3e1 100644
@@ -57,6 +57,7 @@ PTESTS_FAST = "\
 #    lz4-ptest \ # Needs a rewrite
 #    rt-tests-ptest \ # Needs to be checked whether it runs at all
 #    bash-ptest \ # Test outcomes are non-deterministic by design
+#    ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py
 #"
 
 PTESTS_SLOW = "\
Signature · 1 line
2.25.0