linux-yocto: add drm-bochs support
PATCH 1/12 linux-yocto: add drm-bochs support
This allows better modesetting support for the '-vga std' emulated hardware provided by Qemu, which we want to standardize on.
See here for background:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13466
--- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-kernel/linux/linux-yocto-dev.bb +1 -1
@@ -46,7 +46,7 @@ KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1 -1
@@ -38,7 +38,7 @@ KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +1 -1
@@ -38,7 +38,7 @@ KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
meta/recipes-kernel/linux/linux-yocto_4.19.bb +1 -1
@@ -43,7 +43,7 @@ COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemum # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
meta/recipes-kernel/linux/linux-yocto_5.0.bb +1 -1
@@ -47,7 +47,7 @@ COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemum # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
Signature · 1 line
2.17.1
PATCH 2/12 qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
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.
--- 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 | 5 ++++- scripts/runqemu | 6 ------ 6 files changed, 8 insertions(+), 9 deletions(-)
meta/conf/machine/include/qemuboot-mips.inc +1 -1
@@ -3,7 +3,7 @@ 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" +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" QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}"
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 -1
@@ -55,7 +55,10 @@ common_errors = [ "Failed to read /var/lib/nfs/statd/state: Success", "error retry time-out =", "logind: cannot setup systemd-logind helper (-61), using legacy fallback", - "Error changing net interface name 'eth0' to " + "Error changing net interface name 'eth0' to ", + "modeset(0): Failed to initialize the DRI2 extension", + "uvesafb: cannot reserve video memory at", + "uvesafb: probe of uvesafb.0 failed with error" ] video_related = [
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
@@ -1280,10 +1278,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 02/12] qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
Quoted 18 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]>
Quoted 8 lines
--- 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 | 5 ++++- scripts/runqemu | 6 ------ 6 files changed, 8 insertions(+), 9 deletions(-)
The patches in master-next had some failures:
https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/636
I think but am not 100% sure it could from this patch?
Cheers,
Richard
Re: [PATCH 02/12] qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
Quoted 6 lines · Richard Purdie
The patches in master-next had some failures:
https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/636
I think but am not 100% sure it could from this patch?
Yes, at least two of those are direct X11 failures (X server crash on x32; X refusing to start if mesa is built with llvmpipe in step8 of qa-extras2). I'll try to look into them.
Alex
PATCH 3/12 images: use 512M of RAM in qemu if 'opengl" is in DISTRO_FEATURES
In reply to Alexander Kanavin256M was found to be no longer sufficient, as the X server fails to start with the modesetting driver and 3D enabled.
Only images that actually include X11 are adjusted.
--- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 ++ meta/recipes-graphics/images/core-image-clutter.bb | 2 ++ meta/recipes-graphics/images/core-image-x11.bb | 2 ++ meta/recipes-sato/images/core-image-sato.bb | 2 ++ 4 files changed, 8 insertions(+)
meta/recipes-core/images/build-appliance-image_15.0.0.bb +2 -0
@@ -11,6 +11,8 @@ IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-openssh packagegro IMAGE_FEATURES += "x11-base package-management splash" +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' + # Ensure there's enough space to do a core-image-sato build, with rm_work enabled IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
meta/recipes-graphics/images/core-image-clutter.bb +2 -0
@@ -11,3 +11,5 @@ IMAGE_INSTALL = "\ " inherit core-image + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}'
meta/recipes-graphics/images/core-image-x11.bb +2 -0
@@ -7,3 +7,5 @@ LICENSE = "MIT" inherit core-image distro_features_check REQUIRED_DISTRO_FEATURES = "x11" + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}'
meta/recipes-sato/images/core-image-sato.bb +2 -0
@@ -10,3 +10,5 @@ inherit core-image TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0" TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}'
Signature · 1 line
2.17.1
PATCH 4/12 python3-numpy: update to 1.17.0
In reply to Alexander KanavinRebase files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
License-Update: clarified license for numpy/core/src/multiarray/dragon4.c (it is MIT)
---
...-and-so-on-for-libraries-by-default-.patch | 47 ++++++++-----------
...up.py-remove-the-detection-of-x86-ta.patch | 32 +++++++++++++
.../python-numpy/python-numpy.inc | 9 ++--
...umpy_1.16.3.bb => python3-numpy_1.17.0.bb} | 0
4 files changed, 57 insertions(+), 31 deletions(-)
create mode 100644 meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch
rename meta/recipes-devtools/python-numpy/{python3-numpy_1.16.3.bb => python3-numpy_1.17.0.bb} (100%)meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +20 -27
@@ -1,4 +1,4 @@ -From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001 +From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 10 Dec 2015 13:20:30 +0200 Subject: [PATCH] Don't search /usr and so on for libraries by default to
@@ -10,14 +10,14 @@ Signed-off-by: Ross Burton <[email protected]> Signed-off-by: Alexander Kanavin <[email protected]> --- - numpy/distutils/system_info.py | 50 ++++------------------------------ - 1 file changed, 6 insertions(+), 44 deletions(-) + numpy/distutils/system_info.py | 42 ++++------------------------------ + 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index 2424943..bf56a6d 100644 +index ba2b1f4..f94dce1 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -274,51 +274,13 @@ if sys.platform == 'win32': +@@ -278,45 +278,13 @@ if sys.platform == 'win32': add_system_root(os.path.join(conda_dir, 'Library')) else:
@@ -45,31 +45,24 @@ index 2424943..bf56a6d 100644 - default_x11_include_dirs.extend(['/usr/lib/X11/include', - '/usr/include/X11']) - -- import subprocess as sp -- tmp = None -- try: -- # Explicitly open/close file to avoid ResourceWarning when -- # tests are run in debug mode Python 3. -- tmp = open(os.devnull, 'w') -- p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE, -- stderr=tmp) -- except (OSError, DistutilsError): -- # OSError if gcc is not installed, or SandboxViolation (DistutilsError -- # subclass) if an old setuptools bug is triggered (see gh-3160). -- pass -- else: -- triplet = str(p.communicate()[0].decode().strip()) -- if p.returncode == 0: -- # gcc supports the "-print-multiarch" option -- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] -- default_lib_dirs += [os.path.join("/usr/lib/", triplet)] -- finally: -- if tmp is not None: -- tmp.close() +- with open(os.devnull, 'w') as tmp: +- try: +- p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE, +- stderr=tmp) +- except (OSError, DistutilsError): +- # OSError if gcc is not installed, or SandboxViolation (DistutilsError +- # subclass) if an old setuptools bug is triggered (see gh-3160). +- pass +- else: +- triplet = str(p.communicate()[0].decode().strip()) +- if p.returncode == 0: +- # gcc supports the "-print-multiarch" option +- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] +- default_lib_dirs += [os.path.join("/usr/lib/", triplet)] + default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) + default_include_dirs = ['/deaddir/include'] + default_src_dirs = ['.', '/deaddir/src'] -+ + + default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) + default_x11_include_dirs = ['/deaddir/include']
meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch new file +32 -0
@@ -0,0 +1,32 @@ +From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 12 Aug 2019 15:37:36 +0200 +Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets + via uname() + +This was badly breaking compilation for ARM targets (and possibly +other non-x86 targets); if -msse2 is desirable for x86 builds it has +to be passed through another channel. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + numpy/random/setup.py | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/numpy/random/setup.py b/numpy/random/setup.py +index a1bf3b8..60fb534 100644 +--- a/numpy/random/setup.py ++++ b/numpy/random/setup.py +@@ -49,11 +49,6 @@ def configuration(parent_package='', top_path=None): + elif not is_msvc: + # Some bit generators require c99 + EXTRA_COMPILE_ARGS += ['-std=c99'] +- INTEL_LIKE = any([val in k.lower() for k in platform.uname() +- for val in ('x86', 'i686', 'i386', 'amd64')]) +- if INTEL_LIKE: +- # Assumes GCC or GCC-like compiler +- EXTRA_COMPILE_ARGS += ['-msse2'] + + # Use legacy integer variable sizes + LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
meta/recipes-devtools/python-numpy/python-numpy.inc +5 -4
@@ -1,7 +1,7 @@ SUMMARY = "A sophisticated Numeric Processing Package for Python" SECTION = "devel/python" -LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231" +LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1" SRCNAME = "numpy"
@@ -9,9 +9,10 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://0001-npy_cpu-Add-riscv-support.patch \ ${CONFIGFILESURI} \ + file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \ " -SRC_URI[md5sum] = "0886e5b5017f08f2b7a624c0b5931e61" -SRC_URI[sha256sum] = "adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f" +SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71" +SRC_URI[sha256sum] = "47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb +0 -0
Signature · 1 line
2.17.1
Re: [PATCH 04/12] python3-numpy: update to 1.17.0
Quoted 16 lines · Alexander Kanavin
Rebase files/0001-Don-t-search-usr-and-so-on-for-libraries-by- default-.patch
License-Update: clarified license for
numpy/core/src/multiarray/dragon4.c(it is MIT)Signed-off-by Alexander Kanavin <[email protected]>--- ...-and-so-on-for-libraries-by-default-.patch | 47 ++++++++--------- -- ...up.py-remove-the-detection-of-x86-ta.patch | 32 +++++++++++++ .../python-numpy/python-numpy.inc | 9 ++-- ...umpy_1.16.3.bb => python3-numpy_1.17.0.bb} | 0 4 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 meta/recipes-devtools/python-numpy/files/0001- numpy-random-setup.py-remove-the-detection-of-x86-ta.patch rename meta/recipes-devtools/python-numpy/{python3-numpy_1.16.3.bb
Quoted 1 line
=> python3-numpy_1.17.0.bb} (100%)
The -native version doesn't build on centos7:
https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/941
Cheers,
Richard
Re: [PATCH 04/12] python3-numpy: update to 1.17.0
Quoted 9 lines · Richard Purdie
Quoted 4 lines
create mode 100644 meta/recipes-devtools/python-numpy/files/0001- numpy-random-setup.py-remove-the-detection-of-x86-ta.patch rename meta/recipes-devtools/python-numpy/{python3-numpy_1.16.3.bb=> python3-numpy_1.17.0.bb} (100%)
The -native version doesn't build on centos7:
https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/941
Thanks, fixed version sent.
Alex
PATCH 5/12 rt-tests: exclude another development version
In reply to Alexander Kanavin--- meta/recipes-rt/rt-tests/rt-tests.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-rt/rt-tests/rt-tests.inc +2 -2
@@ -3,8 +3,8 @@ SRCREV = "dff174f994f547a5785d32454865f140daacb0f5" PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git" -# 1.2 and 1.3 and 1.4 seem to be development versions -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!1\.2)(?!1\.3)(?!1\.4)(\d+(\.\d+)+))" +# 1.2 to 1.5 seem to be development versions +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!1\.[2-5])(\d+(\.\d+)+))" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 6/12 libmodulemd: depend on target python at build time
In reply to Alexander Kanavinmeson build system is importing sysconfig, which requires having a target confiuguration available.
--- meta/recipes-devtools/libmodulemd/libmodulemd_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +1 -1
@@ -17,7 +17,7 @@ inherit meson gobject-introspection EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true" -DEPENDS += "glib-2.0 libyaml glib-2.0-native" +DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
PATCH 7/12 createrepo-c: upgrade 0.14.3 -> 0.15.0
In reply to Alexander KanavinDisable delta-rpm, which oe-core does not use.
---
.../{createrepo-c_0.14.3.bb => createrepo-c_0.15.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.14.3.bb => createrepo-c_0.15.0.bb} (91%)meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.14.3.bb +2 -2
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "de9d8337885d953baae501cce75decc11d5468dd" +SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6" S = "${WORKDIR}/git"
@@ -17,7 +17,7 @@ DEPENDS_append_class-native = " file-replacement-native" inherit cmake pkgconfig bash-completion distutils3-base -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF" +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
PATCH 8/12 gtk-doc: upgrade 1.30 -> 1.31
In reply to Alexander KanavinDrop backported patch.
---
...rectly-set-permissions-on-file-to-be.patch | 23 -------------------
.../gtk-doc/files/pkg-config-native.patch | 2 +-
.../{gtk-doc_1.30.bb => gtk-doc_1.31.bb} | 5 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch
rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.30.bb => gtk-doc_1.31.bb} (90%)meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch deleted +0 -23
@@ -1,23 +0,0 @@ -From 63bc4cd1ce2d918c6566a4e0c7d830713432fc82 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 28 Jun 2019 13:08:24 +0200 -Subject: [PATCH] highlight.py: correctly set permissions on file to be written - -Upstream-Status: Backport [https://github.com/GNOME/gtk-doc/commit/12d9a698fb58f3d1a840d3bfc0d15a3a9f57afc1] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - gtkdoc/highlight.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py -index 8f6e470..82e11e8 100644 ---- a/gtkdoc/highlight.py -+++ b/gtkdoc/highlight.py -@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'): - - - def append_style_defs(css_file_name): -- os.chmod(css_file_name, stat.S_IWRITE) -+ os.chmod(css_file_name, 0o644) - with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css: - css.write(HTML_FORMATTER.get_style_defs())
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +1 -1
@@ -1,4 +1,4 @@ -From 31254fac614bb6ee28cf6fdd514a9563a5d781a8 Mon Sep 17 00:00:00 2001 +From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Mon, 5 Sep 2016 22:25:44 +0100 Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb +2 -3
@@ -18,13 +18,12 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" -SRC_URI[archive.md5sum] = "1045ba29ca0693ced2045523407aae4c" -SRC_URI[archive.sha256sum] = "a4f6448eb838ccd30d76a33b1fd095f81aea361f03b12c7b23df181d21b7069e" +SRC_URI[archive.md5sum] = "6239713011369a4fbdc7619350403772" +SRC_URI[archive.sha256sum] = "a51687956d0377ac70904d03fdc73c9e116589b4a01453fa92162442b3657011" SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ file://conditionaltests.patch \ file://no-clobber.patch \ - file://0001-highlight.py-correctly-set-permissions-on-file-to-be.patch \ " SRC_URI_append_class-native = " file://pkg-config-native.patch"
Signature · 1 line
2.17.1
PATCH 9/12 desktop-file-utils: upgrade 0.23 -> 0.24
In reply to Alexander Kanavin---
...top-file-utils_0.23.bb => desktop-file-utils_0.24.bb} | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/desktop-file-utils/{desktop-file-utils_0.23.bb => desktop-file-utils_0.24.bb} (73%)meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.24.bb renamed from meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.23.bb +7 -2
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/validator.c;beginline=4;endline=27;md5=281e1114ee6c486a1a0a4295986b9416" SRC_URI = "http://freedesktop.org/software/${BPN}/releases/${BP}.tar.xz" -SRC_URI[md5sum] = "599133d51cc9a41bfec186414906b6f1" -SRC_URI[sha256sum] = "6c094031bdec46c9f621708f919084e1cb5294e2c5b1e4c883b3e70cb8903385" +SRC_URI[md5sum] = "9364b82e14cfcad881161aa7ea5257ae" +SRC_URI[sha256sum] = "a1de5da60cbdbe91e5c9c10ac9afee6c3deb019e0cee5fdb9a99dddc245f83d9" DEPENDS = "glib-2.0"
@@ -17,3 +17,8 @@ inherit autotools pkgconfig EXTRA_OECONF += "ac_cv_prog_EMACS=no" BBCLASSEXTEND = "native nativesdk" + +do_install_append() { + rm -rf ${D}${datadir}/emacs +} +
Signature · 1 line
2.17.1
PATCH 10/12 vala: upgrade 0.44.5 -> 0.44.7
In reply to Alexander Kanavin---
meta/recipes-devtools/vala/{vala_0.44.5.bb => vala_0.44.7.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/vala/{vala_0.44.5.bb => vala_0.44.7.bb} (57%)meta/recipes-devtools/vala/vala_0.44.7.bb renamed from meta/recipes-devtools/vala/vala_0.44.5.bb +2 -2
@@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ " -SRC_URI[md5sum] = "1e8b8595168446c529b11236cf75e328" -SRC_URI[sha256sum] = "bb8f8185b805411511786733c4b769c3ee6af8bc879609bffb6c46b8999bc27f" +SRC_URI[md5sum] = "27fd30535c51af5b87b0e7ffdbd906ef" +SRC_URI[sha256sum] = "bf1ff4f59d5de2d626e98e98ef81cb75dc1e6a27610a7de4133597c430f1bd7c"
Signature · 1 line
2.17.1
PATCH 11/12 libdazzle: upgrade 3.32.2 -> 3.32.3
In reply to Alexander Kanavin---
.../libdazzle/{libdazzle_3.32.2.bb => libdazzle_3.32.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libdazzle/{libdazzle_3.32.2.bb => libdazzle_3.32.3.bb} (73%)meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb renamed from meta/recipes-gnome/libdazzle/libdazzle_3.32.2.bb +2 -2
@@ -7,8 +7,8 @@ inherit gnomebase upstream-version-is-even vala distro_features_check gobject-in DEPENDS = "glib-2.0-native glib-2.0 gtk+3" -SRC_URI[archive.md5sum] = "b5c99a8f483a0defe7c7124a3220e412" -SRC_URI[archive.sha256sum] = "413f8dfb8706760e0c649e2994bd10524ac0736601dd03ad2036293bed3bf141" +SRC_URI[archive.md5sum] = "b6da085649dcda2795e6980a84667950" +SRC_URI[archive.sha256sum] = "6c8d9b1514b5f6422107596f4145b89b8f2a99abef6383e086dfcd28c28667e8" GIR_MESON_OPTION = 'with_introspection'
Signature · 1 line
2.17.1
PATCH 12/12 epiphany: upgrade 3.32.3 -> 3.32.4
In reply to Alexander Kanavin---
.../epiphany/{epiphany_3.32.3.bb => epiphany_3.32.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.32.3.bb => epiphany_3.32.4.bb} (84%)meta/recipes-gnome/epiphany/epiphany_3.32.4.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.32.3.bb +2 -2
@@ -13,8 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "c4976507bf3de69f27a050ad09531f5a" -SRC_URI[archive.sha256sum] = "3ccb6859a43b839b714aa425cb185056f1e8604adbaab6a1bc179d1ba641a33f" +SRC_URI[archive.md5sum] = "6a5eada8a3870ab4d0fcd5168559776f" +SRC_URI[archive.sha256sum] = "c9a828578301af77ac9f3d3ce253b02f9f3a1561840cc8d74dd5645f92d0a995" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
Signature · 1 line
2.17.1