(almost) the last batch of py2 dependencies removal and a few other items
cover (almost) the last batch of py2 dependencies removal and a few other items
The reason to send this as a formal pull request is that one of the patches removed a blob, and I am not sure if that can be handled via emails.
With this patchset and Bruce's kernel python2->3 work, the only two things in oe-core that still need a python2 binary at build time are u-boot and python 2.x itself. At runtime py2 dependencies are entirely eliminated.
The following changes since commit ba6a568512d46d49173998a7fb15cd8ee3302551:
ca-certificates: Fix reproducibilty and multilib issue (2019-08-29 17:12:34 +0100)
are available in the Git repository at:
git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates
Alexander Kanavin (13):
rpm: resolve a host contamination issue for mono packaging
qemu: set default RAM to 256M for all machines
qemu: switch to '-vga std' emulated hardware from vmware/cirrus for
x86/mips
mesa: disable gallium swrast driver on x86 x32
ltp: move from python 2.x to python 3.x
ca-certificates: use python 3 for builds
libpsl: use python 3 during builds
pseudo: use python 3 during builds
llvm: use python 3 during builds
virglrenderer: update 0.7.0 -> 0.8.0
eglinfo: remove the recipe
webkitgtk: use Python 3 for builds
webkitgtk: update 2.24.3 -> 2.24.4
meta/conf/machine/include/qemuboot-mips.inc | 3 +-
meta/conf/machine/include/qemuboot-x86.inc | 2 +-
meta/conf/machine/include/riscv/qemuriscv.inc | 1 -
meta/conf/machine/qemuarm.conf | 1 -
meta/conf/machine/qemuarm64.conf | 1 -
meta/conf/machine/qemux86-64.conf | 6 +-
meta/conf/machine/qemux86.conf | 1 +
meta/lib/oeqa/runtime/cases/parselogs.py | 4 +
meta/recipes-devtools/llvm/llvm_git.bb | 2 +-
...001-maketables-wrappers-use-Python-3.patch | 34 ++++
meta/recipes-devtools/pseudo/pseudo_git.bb | 1 +
...es-requires-do-not-use-monodis-from-.patch | 58 ++++++
meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 1 +
...thon3-everywhere-to-run-python-scrip.patch | 161 +++++++++++++++++
meta/recipes-extended/ltp/ltp_20190517.bb | 3 +-
.../eglinfo/eglinfo-fb_1.0.0.bb | 7 -
.../eglinfo/eglinfo-wayland_1.0.0.bb | 13 --
.../eglinfo/eglinfo-x11_1.0.0.bb | 13 --
meta/recipes-graphics/eglinfo/eglinfo.inc | 38 ----
...INCDIR-to-searchpath-for-egl-headers.patch | 33 ----
...01-Check-for-libegl-using-pkg-config.patch | 36 ----
meta/recipes-graphics/eglinfo/files/waf | 169 ------------------
meta/recipes-graphics/mesa/mesa.inc | 3 +
...efile.am-explicitly-link-with-libdrm.patch | 31 ----
.../0001-vtest-add-missing-includes.patch | 38 ----
...nderer_0.7.0.bb => virglrenderer_0.8.0.bb} | 4 +-
...tings-so-that-gtkdoc-generation-work.patch | 10 +-
...uild-failure-https-bugs.webkit.org-s.patch | 33 ----
...ebkitgtk_2.24.3.bb => webkitgtk_2.24.4.bb} | 7 +-
.../0001-certdata2pem.py-use-python3.patch | 37 ++++
.../ca-certificates_20190110.bb | 1 +
...-PYTHON-when-invoking-psl-make-dafsa.patch | 50 ++++++
meta/recipes-support/libpsl/libpsl_0.21.0.bb | 1 +
scripts/runqemu | 10 +-
34 files changed, 373 insertions(+), 440 deletions(-)
create mode 100644 meta/recipes-devtools/pseudo/files/0001-maketables-wrappers-use-Python-3.patch
create mode 100644 meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch
create mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb
delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo.inc
delete mode 100644 meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
delete mode 100644 meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch
delete mode 100755 meta/recipes-graphics/eglinfo/files/waf
delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch
delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch
rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.7.0.bb => virglrenderer_0.8.0.bb} (76%)
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.24.3.bb => webkitgtk_2.24.4.bb} (95%)
create mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch
create mode 100644 meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patchSignature · 1 line
2.17.1
PATCH 1/13 rpm: resolve a host contamination issue for mono packaging
This is perhaps not the most elegant patch but it be dropped once rpm is updated to the soon-to-be-released version 4.15 where upstream has removed mono dependency resolution altogether.
--- ...es-requires-do-not-use-monodis-from-.patch | 58 +++++++++++++++++++ meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 1 + 2 files changed, 59 insertions(+) create mode 100644 meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch
meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch new file +58 -0
@@ -0,0 +1,58 @@ +From 43fbc3f53302a395463e8450ac81c53f623eec3f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 27 Aug 2019 17:42:34 +0200 +Subject: [PATCH] mono-find-provides/requires: do not use monodis from the host + +There was a host contamination issue here: if monodis was installed +on the host, do_package would use that to resolve dependencies +of mono libraries (and often fail in that). Without monodis, +no dependencies are resolved, which is seemingly how things +are supposed to work. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + scripts/mono-find-provides | 8 ++++---- + scripts/mono-find-requires | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/scripts/mono-find-provides b/scripts/mono-find-provides +index 9348457d3..b28872ffb 100644 +--- a/scripts/mono-find-provides ++++ b/scripts/mono-find-provides +@@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) + build_bindir="$2/usr/bin" + build_libdir="$2$3" + +-if [ -x $build_bindir/monodis ]; then +- monodis="$build_bindir/monodis" ++if [ -x $build_bindir/monodis.bogus ]; then ++ monodis="$build_bindir/monodis.bogus" + export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +-elif [ -x /usr/bin/monodis ]; then +- monodis="/usr/bin/monodis" ++elif [ -x /usr/bin/monodis.bogus ]; then ++ monodis="/usr/bin/monodis.bogus" + else + exit 0; + fi +diff --git a/scripts/mono-find-requires b/scripts/mono-find-requires +index ea58cae48..d270169e1 100644 +--- a/scripts/mono-find-requires ++++ b/scripts/mono-find-requires +@@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) + build_bindir="$2/usr/bin" + build_libdir="$2$3" + +-if [ -x $build_bindir/monodis ]; then +- monodis="$build_bindir/monodis" ++if [ -x $build_bindir/monodis.bogus ]; then ++ monodis="$build_bindir/monodis.bogus" + export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +-elif [ -x /usr/bin/monodis ]; then +- monodis="/usr/bin/monodis" ++elif [ -x /usr/bin/monodis.bogus ]; then ++ monodis="/usr/bin/monodis.bogus" + else + exit 0; + fi
meta/recipes-devtools/rpm/rpm_4.14.2.1.bb +1 -0
@@ -41,6 +41,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \ file://0001-perl-disable-auto-reqs.patch \ file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ + file://0001-mono-find-provides-requires-do-not-use-monodis-from-.patch \ " PE = "1"
Signature · 1 line
2.17.1
PATCH 2/13 qemu: set default RAM to 256M for all machines
In reply to Alexander KanavinThere was a discussion about what amount of RAM is appropriate for a default; the outcome was that for now it is still 256M. Some qemu machine definitions have however set this to 512M so for the sake of treating all architectures fairly, they are reset back to 256M.
Also runqemu is adjusted to use 256M if QB_MEM is not set at all.
http://lists.openembedded.org/pipermail/openembedded-core/2019-August/285900.html
--- meta/conf/machine/include/qemuboot-mips.inc | 1 - meta/conf/machine/include/riscv/qemuriscv.inc | 1 - meta/conf/machine/qemuarm.conf | 1 - meta/conf/machine/qemuarm64.conf | 1 - scripts/runqemu | 4 ++-- 5 files changed, 2 insertions(+), 6 deletions(-)
meta/conf/machine/include/qemuboot-mips.inc +0 -1
@@ -1,6 +1,5 @@ # For runqemu IMAGE_CLASSES += "qemuboot" -QB_MEM = "-m 256" QB_MACHINE = "-machine malta" QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet"
meta/conf/machine/include/riscv/qemuriscv.inc +0 -1
@@ -24,7 +24,6 @@ UBOOT_ENTRYPOINT_riscv64 = "0x80200000" # qemuboot options QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" -QB_MEM = "-m 512" QB_MACHINE = "-machine virt" QB_DEFAULT_BIOS = "fw_jump.elf" QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
meta/conf/machine/qemuarm.conf +0 -1
@@ -11,7 +11,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" -QB_MEM = "-m 512" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a15" # Standard Serial console
meta/conf/machine/qemuarm64.conf +0 -1
@@ -11,7 +11,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-aarch64" -QB_MEM = "-m 512" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a57" QB_CPU_KVM = "-cpu host"
scripts/runqemu +2 -2
@@ -755,8 +755,8 @@ class BaseConfig(object): if s: self.set('QB_MEM', '-m %s' % s.group(1)) elif not self.get('QB_MEM'): - logger.info('QB_MEM is not set, use 512M by default') - self.set('QB_MEM', '-m 512') + logger.info('QB_MEM is not set, use 256M by default') + self.set('QB_MEM', '-m 256') # Check and remove M or m suffix qb_mem = self.get('QB_MEM')
Signature · 1 line
2.17.1
PATCH 3/13 qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
In reply to Alexander KanavinThis is the qemu default since qemu 2.2, is generally supported better, and is recommended by upstream. It also has already been in use for arm/risc and ovmf.
Additional information:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13466
https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
'-vga virtio' emulated hardware remains in use when virgl is enabled via a runqemu override.
Also, adjust the error whitelist, as there is a number of new messages coming from the drivers that are not actual errors.
--- meta/conf/machine/include/qemuboot-mips.inc | 2 +- meta/conf/machine/include/qemuboot-x86.inc | 2 +- meta/conf/machine/qemux86-64.conf | 1 + meta/conf/machine/qemux86.conf | 1 + meta/lib/oeqa/runtime/cases/parselogs.py | 4 ++++ scripts/runqemu | 6 ------ 6 files changed, 8 insertions(+), 8 deletions(-)
meta/conf/machine/include/qemuboot-mips.inc +1 -1
@@ -2,6 +2,6 @@ IMAGE_CLASSES += "qemuboot" QB_MACHINE = "-machine malta" QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" -QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" +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"
meta/conf/machine/include/qemuboot-x86.inc +1 -1
@@ -9,7 +9,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_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet" +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"
meta/conf/machine/qemux86-64.conf +1 -0
@@ -24,6 +24,7 @@ XSERVER = "xserver-xorg \ xf86-video-fbdev \ xf86-video-vmware \ xf86-video-modesetting \ + xf86-video-vesa \ xserver-xorg-module-libint10 \ "
meta/conf/machine/qemux86.conf +1 -0
@@ -24,6 +24,7 @@ XSERVER = "xserver-xorg \ xf86-video-fbdev \ xf86-video-vmware \ xf86-video-modesetting \ + xf86-video-vesa \ xserver-xorg-module-libint10 \ "
meta/lib/oeqa/runtime/cases/parselogs.py +4 -0
@@ -83,6 +83,10 @@ qemux86_common = [ '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 ignore_errors = {
scripts/runqemu +0 -6
@@ -145,8 +145,6 @@ class BaseConfig(object): # to be added with -drive if=pflash. # Found in the same places as the rootfs, with or without one of # these suffices: qcow2, bin. - # Setting one also adds "-vga std" because that is all that - # OVMF supports. self.ovmf_bios = [] # When enrolling default Secure Boot keys, the hypervisor # must provide the Platform Key and the first Key Exchange Key
@@ -1283,10 +1281,6 @@ class BaseConfig(object): for ovmf in self.ovmf_bios: format = ovmf.rsplit('.', 1)[-1] self.qemu_opt += ' -drive if=pflash,format=%s,file=%s' % (format, ovmf) - if self.ovmf_bios: - # OVMF only supports normal VGA, i.e. we need to override a -vga vmware - # that gets added for example for normal qemux86. - self.qemu_opt += ' -vga std' self.qemu_opt += ' ' + self.qemu_opt_script
Signature · 1 line
2.17.1
Re: [PATCH 03/13] qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
Hi,
After switch from -vga vmware to -vga std (use qemux86-64), start image by "runqemu nographic",
Memory used by process Xorg raised a lot, for my image, from ~%7 to ~%34 (check by ps aux --sort -rss)
also check memory by command "systemctl status xserver-nodm", raised from ~60M to ~120M.
with the high raise of memory usage of Xorg, when run oe-test on the target, OOM is happened like:
[ 1038.221438]*Out of memory*: Killed process 180 (Xorg) total-vm:335368kB, anon-rss:68824kB, file-rss:0kB, shmem-rss:140kB
Also test with poky distro, and image core-image-sato, also installed procps.
1. "ps aux --sort -rss": Xorg from ~3.6% to ~ 17.4%
2. "systemctl status xserver-nodm": from ~65M to ~131M
Any idea about how to resolve this problem? do we really need unify all boards to -vga=std? Thanks.
Quoted 111 lines · Alexander Kanavin
This is the qemu default since qemu 2.2, is generally supported better, and is recommended by upstream. It also has already been in use for arm/risc and ovmf.
Additional information:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13466
https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/'-vga virtio' emulated hardware remains in use when virgl is enabled via a runqemu override.
Also, adjust the error whitelist, as there is a number of new messages coming from the drivers that are not actual errors.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/conf/machine/include/qemuboot-mips.inc | 2 +- meta/conf/machine/include/qemuboot-x86.inc | 2 +- meta/conf/machine/qemux86-64.conf | 1 + meta/conf/machine/qemux86.conf | 1 + meta/lib/oeqa/runtime/cases/parselogs.py | 4 ++++ scripts/runqemu | 6 ------ 6 files changed, 8 insertions(+), 8 deletions(-)meta/conf/machine/include/qemuboot-mips.inc +1
-1@@ -2,6 +2,6 @@ IMAGE_CLASSES += "qemuboot" QB_MACHINE = "-machine malta" QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" -QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" +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"meta/conf/machine/include/qemuboot-x86.inc +1
-1@@ -9,7 +9,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_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet" +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"meta/conf/machine/qemux86-64.conf +1
-0@@ -24,6 +24,7 @@ XSERVER = "xserver-xorg \ xf86-video-fbdev \ xf86-video-vmware \ xf86-video-modesetting \ + xf86-video-vesa \ xserver-xorg-module-libint10 \ "meta/conf/machine/qemux86.conf +1
-0@@ -24,6 +24,7 @@ XSERVER = "xserver-xorg \ xf86-video-fbdev \ xf86-video-vmware \ xf86-video-modesetting \ + xf86-video-vesa \ xserver-xorg-module-libint10 \ "meta/lib/oeqa/runtime/cases/parselogs.py +4
-0@@ -83,6 +83,10 @@ qemux86_common = [ '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 ignore_errors = {scripts/runqemu +0
-6@@ -145,8 +145,6 @@ class BaseConfig(object): # to be added with -drive if=pflash. # Found in the same places as the rootfs, with or without one of # these suffices: qcow2, bin. - # Setting one also adds "-vga std" because that is all that - # OVMF supports. self.ovmf_bios = [] # When enrolling default Secure Boot keys, the hypervisor # must provide the Platform Key and the first Key Exchange Key@@ -1283,10 +1281,6 @@ class BaseConfig(object): for ovmf in self.ovmf_bios: format = ovmf.rsplit('.', 1)[-1] self.qemu_opt += ' -drive if=pflash,format=%s,file=%s' % (format, ovmf) - if self.ovmf_bios: - # OVMF only supports normal VGA, i.e. we need to override a -vga vmware - # that gets added for example for normal qemux86. - self.qemu_opt += ' -vga std' self.qemu_opt += ' ' + self.qemu_opt_script
Re: [PATCH 03/13] qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
Quoted 19 lines · Changqing Li
After switch from -vga vmware to -vga std (use qemux86-64), start image by "runqemu nographic",
Memory used by process Xorg raised a lot, for my image, from ~%7 to
~%34 (check by ps aux --sort -rss)also check memory by command "systemctl status xserver-nodm", raised from ~60M to ~120M.
with the high raise of memory usage of Xorg, when run oe-test on the target, OOM is happened like:
[ 1038.221438] *Out of memory*: Killed process 180 (Xorg)total-vm:335368kB, anon-rss:68824kB, file-rss:0kB, shmem-rss:140kB
Also test with poky distro, and image core-image-sato, also installed procps.
Quoted 8 lines
1. "ps aux --sort -rss": Xorg from ~3.6% to ~ 17.4%
2. "systemctl status xserver-nodm": from ~65M to ~131M
Any idea about how to resolve this problem? do we really need unify all boards to -vga=std? Thanks.
The increased memory usage is due to glamor loading the full 3D stack, mesa and friends. You can drop opengl from DISTRO_FEATURES, or otherwise disable glamor in xorg recipe via PACKAGECONFIG.
Or you can bump the available RAM for your image like is already done for core-image-sato.
Alex
Re: [PATCH 03/13] qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
Quoted 30 lines · Alexander Kanavin
On Thu, 10 Oct 2019 at 08:16, Changqing Li <[email protected] <mailto:[email protected]>> wrote:
After switch from -vga vmware to -vga std (use qemux86-64), start image by "runqemu nographic",
Memory used by process Xorg raised a lot, for my image, from ~%7 to ~%34 (check by ps aux --sort -rss)
also check memory by command "systemctl status xserver-nodm", raised from ~60M to ~120M.
with the high raise of memory usage of Xorg, when run oe-test on the target, OOM is happened like:
[ 1038.221438]*Out of memory*: Killed process 180 (Xorg) total-vm:335368kB, anon-rss:68824kB, file-rss:0kB, shmem-rss:140kB
Also test with poky distro, and image core-image-sato, also installed procps.
1. "ps aux --sort -rss": Xorg from ~3.6% to ~ 17.4%
2. "systemctl status xserver-nodm": from ~65M to ~131M
Any idea about how to resolve this problem? do we really need unify all boards to -vga=std? Thanks.
Quoted 5 lines
The increased memory usage is due to glamor loading the full 3D stack, mesa and friends. You can drop opengl from
DISTRO_FEATURES, or otherwise disable glamor in xorg recipe via PACKAGECONFIG.Or you can bump the available RAM for your image like is already done for core-image-sato.
Alex
Thanks!
Sandy
PATCH 4/13 mesa: disable gallium swrast driver on x86 x32
In reply to Alexander KanavinIt was found to crash the X server on startup under qemu.
--- meta/conf/machine/qemux86-64.conf | 5 ++++- meta/recipes-graphics/mesa/mesa.inc | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-)
meta/conf/machine/qemux86-64.conf +4 -1
@@ -18,8 +18,11 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" +# Install swrast and glx if opengl is in DISTRO_FEATURES and x32 is not in use. +# This is because gallium swrast driver was found to crash X server on startup in qemu x32. XSERVER = "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \ + bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'mesa-driver-swrast xserver-xorg-extension-glx', d), '', d)} \ xf86-video-cirrus \ xf86-video-fbdev \ xf86-video-vmware \
meta/recipes-graphics/mesa/mesa.inc +3 -0
@@ -98,6 +98,9 @@ PACKAGECONFIG[vc4] = "" PACKAGECONFIG[v3d] = "" GALLIUMDRIVERS = "swrast" +# gallium swrast was found to crash Xorg on startup in x32 qemu +GALLIUMDRIVERS_x86-x32 = "" + GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}"
Signature · 1 line
2.17.1
PATCH 5/13 ltp: move from python 2.x to python 3.x
In reply to Alexander Kanavin--- ...thon3-everywhere-to-run-python-scrip.patch | 161 ++++++++++++++++++ meta/recipes-extended/ltp/ltp_20190517.bb | 3 +- 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch new file +161 -0
@@ -0,0 +1,161 @@ +From 0463d793566772a606255957915f99d166d5740c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 28 Aug 2019 18:30:23 +0200 +Subject: [PATCH] testcases: use python3 everywhere to run python scripts + +The scripts themselves have #!/usr/bin/python3 in them, +so I trust they are already py3-compatible. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + testcases/kernel/power_management/runpwtests05.sh | 2 +- + .../power_management/runpwtests_exclusive01.sh | 2 +- + .../power_management/runpwtests_exclusive02.sh | 2 +- + .../power_management/runpwtests_exclusive03.sh | 2 +- + .../power_management/runpwtests_exclusive04.sh | 2 +- + .../power_management/runpwtests_exclusive05.sh | 2 +- + testcases/network/nfsv4/acl/runtest | 14 +++++++------- + testcases/realtime/func/pi-tests/run_auto.sh | 6 +++--- + 8 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/testcases/kernel/power_management/runpwtests05.sh b/testcases/kernel/power_management/runpwtests05.sh +index 8a7d0f6e0..43e234d01 100755 +--- a/testcases/kernel/power_management/runpwtests05.sh ++++ b/testcases/kernel/power_management/runpwtests05.sh +@@ -35,7 +35,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + if ! grep sched_debug -qw /proc/cmdline ; then + tst_brkm TCONF "Kernel cmdline parameter 'sched_debug' needed," \ +diff --git a/testcases/kernel/power_management/runpwtests_exclusive01.sh b/testcases/kernel/power_management/runpwtests_exclusive01.sh +index ec78319e2..9fefcbf6e 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive01.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive01.sh +@@ -35,7 +35,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/kernel/power_management/runpwtests_exclusive02.sh b/testcases/kernel/power_management/runpwtests_exclusive02.sh +index e107fce35..2cd0ecb05 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive02.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive02.sh +@@ -33,7 +33,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/kernel/power_management/runpwtests_exclusive03.sh b/testcases/kernel/power_management/runpwtests_exclusive03.sh +index 490344bb3..ab3a5d11d 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive03.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive03.sh +@@ -35,7 +35,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/kernel/power_management/runpwtests_exclusive04.sh b/testcases/kernel/power_management/runpwtests_exclusive04.sh +index 978ca02ae..438ef603f 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive04.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive04.sh +@@ -27,7 +27,7 @@ export TST_TOTAL=2 + # Checking test environment + check_kervel_arch + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/kernel/power_management/runpwtests_exclusive05.sh b/testcases/kernel/power_management/runpwtests_exclusive05.sh +index a0dad5834..3a9afdbf2 100755 +--- a/testcases/kernel/power_management/runpwtests_exclusive05.sh ++++ b/testcases/kernel/power_management/runpwtests_exclusive05.sh +@@ -35,7 +35,7 @@ else + max_sched_smt=1 + fi + +-tst_test_cmds python ++tst_test_cmds python3 + + hyper_threaded=$(is_hyper_threaded) + multi_socket=$(is_multi_socket) +diff --git a/testcases/network/nfsv4/acl/runtest b/testcases/network/nfsv4/acl/runtest +index d2e1b4c49..a859e85bc 100755 +--- a/testcases/network/nfsv4/acl/runtest ++++ b/testcases/network/nfsv4/acl/runtest +@@ -22,7 +22,7 @@ do + done + + # creation of users on the remote machine (removed only at the end of the tests) +-rsh -n $REMOTEHOST python $PWD/create_users.py -u 50 -g 50 ++rsh -n $REMOTEHOST python3 $PWD/create_users.py -u 50 -g 50 + + echo "Starting ACL testing" + +@@ -51,19 +51,19 @@ echo "Basic tests finished" + + echo "LONG ACL TEST" + echo "creating necessary users and groups" +-python create_users.py -u 50 -g 50 ++python3 create_users.py -u 50 -g 50 + echo "creating necessary users and groups on the remote host" + mkdir $NFSMNTDIR/lacl-testdir +-python test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir ++python3 test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir + rm -rf $NFSMNTDIR/lacl-testdir + echo "Long ACL test OK with $MAXLENGTH entries" + echo "ACL STRESSING TEST" +-python setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR ++python3 setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR + + # remove local an remote users +-python cleanusers.py +-python cleangroups.py +-rsh -n $REMOTEHOST python $PWD/cleanusers.py ++python3 cleanusers.py ++python3 cleangroups.py ++rsh -n $REMOTEHOST python3 $PWD/cleanusers.py + + echo "Test OK" + +diff --git a/testcases/realtime/func/pi-tests/run_auto.sh b/testcases/realtime/func/pi-tests/run_auto.sh +index d13026049..277988568 100755 +--- a/testcases/realtime/func/pi-tests/run_auto.sh ++++ b/testcases/realtime/func/pi-tests/run_auto.sh +@@ -15,15 +15,15 @@ $SCRIPTS_DIR/run_c_files.sh $profile testpi-0 + + export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-1.log" + $SCRIPTS_DIR/run_c_files.sh $profile testpi-1 +-PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE ++PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE + + export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-2.log" + $SCRIPTS_DIR/run_c_files.sh $profile testpi-2 +-PYTHONPATH=../../ python parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE ++PYTHONPATH=../../ python3 parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE + + export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-4.log" + $SCRIPTS_DIR/run_c_files.sh $profile testpi-4 +-PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE ++PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE + + + export LOG_FILE=""
meta/recipes-extended/ltp/ltp_20190517.bb +2 -1
@@ -45,6 +45,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0002-check-for-RES_USE_INET6-during-configure.patch \ file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \ file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \ + file://0001-testcases-use-python3-everywhere-to-run-python-scrip.patch \ " S = "${WORKDIR}/git"
@@ -96,7 +97,7 @@ RDEPENDS_${PN} = "\ libaio \ logrotate \ perl \ - python-core \ + python3-core \ procps \ quota \ unzip \
Signature · 1 line
2.17.1
PATCH 6/13 ca-certificates: use python 3 for builds
In reply to Alexander Kanavin--- .../0001-certdata2pem.py-use-python3.patch | 37 +++++++++++++++++++ .../ca-certificates_20190110.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch
meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch new file +37 -0
@@ -0,0 +1,37 @@ +From b6d18ca77f131cdcaa10d0eaa9d303399767edf6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 28 Aug 2019 19:18:14 +0200 +Subject: [PATCH] certdata2pem.py: use python3 + +Comments in that file imply it is already py3 compatible. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + mozilla/Makefile | 2 +- + mozilla/certdata2pem.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mozilla/Makefile b/mozilla/Makefile +index 6f46118..f98877c 100644 +--- a/mozilla/Makefile ++++ b/mozilla/Makefile +@@ -3,7 +3,7 @@ + # + + all: +- python certdata2pem.py ++ python3 certdata2pem.py + + clean: + -rm -f *.crt +diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py +index 0b02b2a..7d796f1 100644 +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # vim:set et sw=4: + # + # certdata2pem.py - splits certdata.txt into multiple files
meta/recipes-support/ca-certificates/ca-certificates_20190110.bb +1 -0
@@ -23,6 +23,7 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ file://default-sysroot.patch \ file://sbindir.patch \ file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ + file://0001-certdata2pem.py-use-python3.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 7/13 libpsl: use python 3 during builds
In reply to Alexander Kanavin--- ...-PYTHON-when-invoking-psl-make-dafsa.patch | 50 +++++++++++++++++++ meta/recipes-support/libpsl/libpsl_0.21.0.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch
meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch new file +50 -0
@@ -0,0 +1,50 @@ +From a0e6f0ec9dc6dd1db1c03f7f273cc16cb3af5561 Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Thu, 11 Jul 2019 17:47:11 +0100 +Subject: [PATCH] Makefile.am: use PYTHON when invoking psl-make-dafsa + +In an environment where only Python 3 is installed, configure.ac finds and sets +PYTHON=python3 correctly but src/psl-make-dafsa is called directly, so the hashbang of +`#!/usr/bin/env python` is used which doesn't exist. + +Fix this by explicitly running $(PYTHON) when using the tool. + +Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/b4fec5d0ddb70fc4f5360eb14f2f5c5e91194333] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/Makefile.am | 2 +- + tests/Makefile.am | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index f9c0a3d..a05ea05 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -19,7 +19,7 @@ libpsl_la_LDFLAGS = -no-undefined -version-info $(LIBPSL_SO_VERSION) + # Build rule for suffix_dafsa.c + # PSL_FILE can be set by ./configure --with-psl-file=[PATH] + suffixes_dafsa.h: $(PSL_FILE) $(srcdir)/psl-make-dafsa +- $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h ++ $(PYTHON) $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h + + EXTRA_DIST = psl-make-dafsa LICENSE.chromium + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8b29b61..28a9a0b 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -34,9 +34,9 @@ TESTS = $(PSL_TESTS) + # check-local target works in parallel to the tests, so the test suite will likely fail + BUILT_SOURCES = psl.dafsa psl_ascii.dafsa + psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat +- $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa ++ $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa + psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat +- $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa ++ $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa + + clean-local: + rm -f psl.dafsa psl_ascii.dafsa +-- +2.17.1 +
meta/recipes-support/libpsl/libpsl_0.21.0.bb +1 -0
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5437030d9e4fbe7267ced058ddb8a7f5 \ SRC_URI = "https://github.com/rockdaboot/${BPN}/releases/download/${BP}/${BP}.tar.gz \ file://0001-gtk-doc-do-not-include-tree_index.sgml.patch \ + file://0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch \ " SRC_URI[md5sum] = "171e96d887709e36a57f4ee627bf82d2" SRC_URI[sha256sum] = "41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12"
Signature · 1 line
2.17.1
PATCH 8/13 pseudo: use python 3 during builds
In reply to Alexander Kanavin--- ...001-maketables-wrappers-use-Python-3.patch | 34 +++++++++++++++++++ meta/recipes-devtools/pseudo/pseudo_git.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-devtools/pseudo/files/0001-maketables-wrappers-use-Python-3.patch
meta/recipes-devtools/pseudo/files/0001-maketables-wrappers-use-Python-3.patch new file +34 -0
@@ -0,0 +1,34 @@ +From dbd34b1b2af8fbf44a0d5c37abe3448405819823 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 28 Aug 2019 19:20:29 +0200 +Subject: [PATCH] maketables/wrappers: use Python 3 + +Changelog indicates they should be compatible. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + maketables | 2 +- + makewrappers | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/maketables b/maketables +index a211772..52285e2 100755 +--- a/maketables ++++ b/maketables +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Copyright (c) 2008-2010, 2013 Wind River Systems, Inc. + # +diff --git a/makewrappers b/makewrappers +index e84607d..b34f7eb 100755 +--- a/makewrappers ++++ b/makewrappers +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Copyright (c) 2008-2011,2013 Wind River Systems, Inc. + #
meta/recipes-devtools/pseudo/pseudo_git.bb +1 -0
@@ -6,6 +6,7 @@ SRC_URI = "git://git.yoctoproject.org/pseudo \ file://fallback-group \ file://moreretries.patch \ file://toomanyfiles.patch \ + file://0001-maketables-wrappers-use-Python-3.patch \ " SRCREV = "060058bb29f70b244e685b3c704eb0641b736f73"
Signature · 1 line
2.17.1
PATCH 9/13 llvm: use python 3 during builds
In reply to Alexander Kanavin--- meta/recipes-devtools/llvm/llvm_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/llvm/llvm_git.bb +1 -1
@@ -71,7 +71,7 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_OPTIMIZED_TABLEGEN=ON \ -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS}' \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ - -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python2 \ + -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ -G Ninja" EXTRA_OECMAKE_append_class-target = "\
Signature · 1 line
2.17.1
PATCH 10/13 virglrenderer: update 0.7.0 -> 0.8.0
In reply to Alexander KanavinThis also allows building virglrenderer without python 2.x
---
...efile.am-explicitly-link-with-libdrm.patch | 31 ---------------
.../0001-vtest-add-missing-includes.patch | 38 -------------------
...nderer_0.7.0.bb => virglrenderer_0.8.0.bb} | 4 +-
3 files changed, 1 insertion(+), 72 deletions(-)
delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch
delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch
rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.7.0.bb => virglrenderer_0.8.0.bb} (76%)meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From d61f7073b8ce159d21811b291c22b273b040c330 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 12 Feb 2019 12:04:52 +0100 -Subject: [PATCH] Makefile.am: explicitly link with libdrm - -Otherwise, a failure happens with gold linker: - -../src/.libs/libvirglrenderer.so: error: undefined reference to 'drmPrimeHandleToFD' - -https://errors.yoctoproject.org/Errors/Details/222046/ - -Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/153] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - src/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9a0a44e..9b668c8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,5 +1,6 @@ - SUBDIRS := gallium/auxiliary - AM_LDFLAGS = -lm \ -+ $(LIBDRM_LIBS) \ - $(GBM_LIBS) \ - $(EPOXY_LIBS) \ - $(X11_LIBS) \ --- -2.17.1 -
meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 05c5c5f43fbffb3317bd9da27d414890d2ef493c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 18 Jan 2019 13:47:23 +0100 -Subject: [PATCH] vtest: add missing includes - -This fixes build failures with musl C library - -Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/125] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - vtest/util.c | 1 + - vtest/vtest_server.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/vtest/util.c b/vtest/util.c -index 0d3c78f..c605253 100644 ---- a/vtest/util.c -+++ b/vtest/util.c -@@ -26,6 +26,7 @@ - #include <stdio.h> - #include <string.h> - #include <unistd.h> -+#include <sys/select.h> - - int vtest_wait_for_fd_read(int fd) - { -diff --git a/vtest/vtest_server.c b/vtest/vtest_server.c -index bc6c95f..010721f 100644 ---- a/vtest/vtest_server.c -+++ b/vtest/vtest_server.c -@@ -31,6 +31,7 @@ - #include <netinet/in.h> - #include <sys/un.h> - #include <fcntl.h> -+#include <string.h> - - #include "util.h" - #include "vtest.h"
meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb renamed from meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb +1 -3
@@ -5,10 +5,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm mesa libepoxy" -SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c" +SRCREV = "48cc96c9aebb9d0164830a157efc8916f08f00c0" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ - file://0001-vtest-add-missing-includes.patch \ - file://0001-Makefile.am-explicitly-link-with-libdrm.patch \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ "
Signature · 1 line
2.17.1
PATCH 11/13 eglinfo: remove the recipe
In reply to Alexander KanavinLast commit upstream was in Sep 2014; pull requests have been ignored since.
I believe eglinfo from mesa-demos is an adequate and maintained alternative.
Also this recipe was using an ugly waf blob placed directly into oe-core, which was also dependent on python 2.
--- .../eglinfo/eglinfo-fb_1.0.0.bb | 7 - .../eglinfo/eglinfo-wayland_1.0.0.bb | 13 -- .../eglinfo/eglinfo-x11_1.0.0.bb | 13 -- meta/recipes-graphics/eglinfo/eglinfo.inc | 38 ---- ...INCDIR-to-searchpath-for-egl-headers.patch | 33 ---- ...01-Check-for-libegl-using-pkg-config.patch | 36 ---- meta/recipes-graphics/eglinfo/files/waf | 169 ------------------ 7 files changed, 309 deletions(-) delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb delete mode 100644 meta/recipes-graphics/eglinfo/eglinfo.inc delete mode 100644 meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch delete mode 100644 meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch delete mode 100755 meta/recipes-graphics/eglinfo/files/waf
meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb deleted +0 -7
@@ -1,7 +0,0 @@ -EGLINFO_PLATFORM ?= "fb" -EGLINFO_BINARY_NAME ?= "eglinfo-fb" - -require eglinfo.inc - -SUMMARY += "(Framebuffer version)" -CXXFLAGS += "-DMESA_EGL_NO_X11_HEADERS=1"
meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb deleted +0 -13
@@ -1,13 +0,0 @@ -EGLINFO_PLATFORM ?= "wayland" -EGLINFO_BINARY_NAME ?= "eglinfo-wayland" - -require eglinfo.inc - -DEPENDS += "wayland" - -inherit distro_features_check - -# depends on wayland -REQUIRED_DISTRO_FEATURES += "wayland" - -SUMMARY += "(Wayland version)"
meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb deleted +0 -13
@@ -1,13 +0,0 @@ -EGLINFO_PLATFORM ?= "x11" -EGLINFO_BINARY_NAME ?= "eglinfo-x11" - -require eglinfo.inc - -DEPENDS += "virtual/libx11" - -inherit distro_features_check - -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES += "x11" - -SUMMARY += "(X11 version)"
meta/recipes-graphics/eglinfo/eglinfo.inc deleted +0 -38
@@ -1,38 +0,0 @@ -SUMMARY = "Utility for printing information EGL and its client APIs (OpenGL, OpenGL ES, OpenVG)" -SECTION = "graphics" -LICENSE = "Zlib" -HOMEPAGE = "https://github.com/dv1/eglinfo" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c" - -DEPENDS = "virtual/egl" - -SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \ - file://waf \ - file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \ - file://0001-Check-for-libegl-using-pkg-config.patch \ - " -SRCREV = "223817ee37988042db7873cfb5b2e899dfe35c10" - -CVE_PRODUCT = "eglinfo" - -S = "${WORKDIR}/git" - -inherit waf distro_features_check pkgconfig -# depends on virtual/egl -REQUIRED_DISTRO_FEATURES ?= "opengl" - -# BSP layers should add .bbappend files for the -x11 and -fb .bb recipes, which -# append the respective EGL/OpenGLES/OpenVG libraries to DEPENDS and set -# EGL_DEVICE as appropriate. -EGLINFO_DEVICE ?= "generic" - -EXTRA_OECONF = "--platform=${EGLINFO_PLATFORM} \ - --device=${EGLINFO_DEVICE} \ - --sysroot ${STAGING_DIR_TARGET}" - -do_configure_prepend() { - install -D -m 0755 ${WORKDIR}/waf ${S}/waf -} -do_install_append() { - mv ${D}/${bindir}/eglinfo ${D}/${bindir}/${EGLINFO_BINARY_NAME} -}
meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 99a5784d33ad5e0e6fa00338d2732cbccad7661c Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 13 Jan 2016 16:08:22 -0800 -Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers - -bcm_host.h is in standard includedir in sysroot -add that to header search paths. - -Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Submitted - - wscript | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index 195e247..0f6ec53 100644 ---- a/wscript -+++ b/wscript -@@ -177,9 +177,10 @@ def configure_raspberrypi_device(conf, platform): - conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') - import os - sysroot = conf.options.sysroot + conf.options.prefix -+ std_include_path = os.path.join(sysroot, 'include') - vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads') - vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux') -- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path], uselib_store = 'EGL'): -+ if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'): - conf.fatal('Check if --prefix and --sysroot are set correctly.') - conf.env['WITH_APIS'] = [] - if check_gles2(conf): --- -2.19.1
meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 17f5d2f574236f8c3459f9efadef2f0f6220a4dd Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 13 Aug 2018 15:46:53 -0700 -Subject: [PATCH] Check for libegl using pkg-config - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> -[Roman: patch has been rebased to 223817ee3798 ("Add Wayland support") - trivial merge conflicts resolved] -Signed-off-by: Roman Stratiienko <[email protected]> ---- - wscript | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/wscript b/wscript -index 0f6ec53..401f62e 100644 ---- a/wscript -+++ b/wscript -@@ -174,14 +174,9 @@ def configure_raspberrypi_device(conf, platform): - else: - conf.fatal('Unsupported Raspberry Pi platform "%s"' % platform) - return -- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') -+ conf.check_cfg(package='egl', args='--libs --cflags') - import os - sysroot = conf.options.sysroot + conf.options.prefix -- std_include_path = os.path.join(sysroot, 'include') -- vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads') -- vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux') -- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'): -- conf.fatal('Check if --prefix and --sysroot are set correctly.') - conf.env['WITH_APIS'] = [] - if check_gles2(conf): - conf.env['WITH_APIS'] += ['GLES1', 'GLES2'] --- -2.19.1
meta/recipes-graphics/eglinfo/files/waf deleted +0 -169
169 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 12/13 webkitgtk: use Python 3 for builds
In reply to Alexander Kanavin--- meta/recipes-sato/webkit/webkitgtk_2.24.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.24.3.bb +1 -1
@@ -69,7 +69,7 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ -DENABLE_MINIBROWSER=ON \ - -DPYTHON_EXECUTABLE=`which python` \ + -DPYTHON_EXECUTABLE=`which python3` \ " # Javascript JIT is not supported on ARC
Signature · 1 line
2.17.1
PATCH 13/13 webkitgtk: update 2.24.3 -> 2.24.4
In reply to Alexander KanavinIn particular this brings an important fix for builds with py3:
"Fix build issue which would cause media controls to disappear when Python 3.x was used during the build process."
https://webkitgtk.org/2019/08/28/webkitgtk2.24.4-released.html
---
...tings-so-that-gtkdoc-generation-work.patch | 10 +++---
...uild-failure-https-bugs.webkit.org-s.patch | 33 -------------------
...ebkitgtk_2.24.3.bb => webkitgtk_2.24.4.bb} | 5 ++-
3 files changed, 7 insertions(+), 41 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.24.3.bb => webkitgtk_2.24.4.bb} (96%)meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch +5 -5
@@ -1,4 +1,4 @@ -From d3796ad1a19233ee5d3492a5560d7ede882f89cf Mon Sep 17 00:00:00 2001 +From 4b5e02212a31b82fc9b3becad90542274816fc29 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 11 Aug 2016 17:13:51 +0300 Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
@@ -17,23 +17,23 @@ Signed-off-by: Alexander Kanavin <[email protected]> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake -index 2ee05550..6cb6313d 100644 +index b0fb31ca..6cb6313d 100644 --- a/Source/cmake/GtkDoc.cmake +++ b/Source/cmake/GtkDoc.cmake @@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" DEPENDS ${DocumentationDependencies} -- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} +- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} + COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args} COMMAND touch ${_stamp_name} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" VERBATIM diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py -index 81ee8cdc..3e11c2f0 100644 +index 054cafa1..416de7d1 100644 --- a/Tools/gtkdoc/gtkdoc.py +++ b/Tools/gtkdoc/gtkdoc.py -@@ -317,9 +317,9 @@ class GTKDoc(object): +@@ -320,9 +320,9 @@ class GTKDoc(object): additional_ldflags = '%s %s' % (additional_ldflags, arg) ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags current_ld_library_path = env.get('LD_LIBRARY_PATH')
meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 4bc241539246f7a17d07357257ab47cb96bc4b69 Mon Sep 17 00:00:00 2001 -From: "[email protected]" <[email protected]> -Date: Thu, 18 Apr 2019 07:30:18 +0000 -Subject: [PATCH] Unreviewed, fix build failure - https://bugs.webkit.org/show_bug.cgi?id=195938 - -Including <array>. - -* bmalloc/AvailableMemory.cpp: - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244422 268f45cc-cd09-0410-ab3c-d52691b4dbfc - -Upstream-Status: Backport [https://github.com/WebKit/webkit/commit/84c111dc0d83b5acf60706ef49bc2f5e91112471] -Signed-off-by: Khem Raj <[email protected]> ---- - Source/bmalloc/bmalloc/AvailableMemory.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/bmalloc/bmalloc/AvailableMemory.cpp b/Source/bmalloc/bmalloc/AvailableMemory.cpp -index 595889fe..b72000d5 100644 ---- a/Source/bmalloc/bmalloc/AvailableMemory.cpp -+++ b/Source/bmalloc/bmalloc/AvailableMemory.cpp -@@ -32,6 +32,7 @@ - #include "PerProcess.h" - #include "Scavenger.h" - #include "Sizes.h" -+#include <array> - #include <mutex> - #if BOS(DARWIN) - #if BPLATFORM(IOS_FAMILY) --- -2.22.0 -
meta/recipes-sato/webkit/webkitgtk_2.24.4.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.24.3.bb +2 -3
@@ -23,11 +23,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://include_array.patch \ file://narrowing.patch \ file://0001-gstreamer-add-a-missing-format-string.patch \ - file://0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch \ " -SRC_URI[md5sum] = "e2a5bbd09a217eba096a2d1562143e35" -SRC_URI[sha256sum] = "940d746d7e82c357222feb5b3f44c4b201e81df7d81ddca5ca2bf3ae0acf6c51" +SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87" +SRC_URI[sha256sum] = "8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
Signature · 1 line
2.17.1