xwayland: add a standalone recipe
PATCH 1/16 xwayland: add a standalone recipe
Please see here for the rationale for splitting XWayland out of main xserver-xorg tree:
https://fedoraproject.org/wiki/Changes/XwaylandStandalone
Release announcement:
https://lists.x.org/archives/xorg-announce/2021-March/003076.html
--- meta/conf/distro/include/maintainers.inc | 1 + .../xwayland/xwayland_21.1.0.bb | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-graphics/xwayland/xwayland_21.1.0.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -797,6 +797,7 @@ RECIPE_MAINTAINER_pn-xset = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-xtrans = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <[email protected]>" +RECIPE_MAINTAINER_pn-xwayland = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <[email protected]>"
meta/recipes-graphics/xwayland/xwayland_21.1.0.bb new file +21 -0
@@ -0,0 +1,21 @@ +SUMMARY = "XWayland is an X Server that runs under Wayland." +DESCRIPTION = "XWayland is an X Server running as a Wayland client, \ +and thus is capable of displaying native X11 client applications in a \ +Wayland compositor environment. The goal of XWayland is to facilitate \ +the transition from X Window System to Wayland environments, providing \ +a way to run unported applications in the meantime." +HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone" + +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" + +SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" +SRC_URI[sha256sum] = "8a71c3e8b95c43bb91bc3d7a4ff9075456a0cfe297721dbc8d4a76cf241d82fb" + +inherit meson features_check +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" + +FILES_${PN} += "${libdir}/xorg/protocol.txt" +
Signature · 1 line
2.29.2
PATCH 2/16 weston: use standalone xwayland instead of outdated xserver-xorg version
--- meta/recipes-graphics/wayland/weston_9.0.0.bb | 2 +- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
meta/recipes-graphics/wayland/weston_9.0.0.bb +1 -1
@@ -124,7 +124,7 @@ SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wa FILES_${PN}-examples = "${bindir}/*" FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" -RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" +RDEPENDS_${PN}-xwayland += "xwayland" RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "weston-init liberation-fonts"
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -1
@@ -122,7 +122,6 @@ EXTRA_OECONF += "--with-fop=no \ OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \ "
Signature · 1 line
2.29.2
PATCH 3/16 vulkan: upgrade 1.2.162.0 -> 1.2.170.0
In reply to Alexander Kanavin---
...2.162.0.bb => vulkan-headers_1.2.170.0.bb} | 2 +-
...name-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch | 40 -------------------
....2.162.0.bb => vulkan-loader_1.2.170.0.bb} | 7 ++--
...1.2.162.1.bb => vulkan-tools_1.2.170.0.bb} | 4 +-
4 files changed, 6 insertions(+), 47 deletions(-)
rename meta/recipes-graphics/vulkan/{vulkan-headers_1.2.162.0.bb => vulkan-headers_1.2.170.0.bb} (93%)
delete mode 100644 meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch
rename meta/recipes-graphics/vulkan/{vulkan-loader_1.2.162.0.bb => vulkan-loader_1.2.170.0.bb} (87%)
rename meta/recipes-graphics/vulkan/{vulkan-tools_1.2.162.1.bb => vulkan-tools_1.2.170.0.bb} (89%)meta/recipes-graphics/vulkan/vulkan-headers_1.2.170.0.bb renamed from meta/recipes-graphics/vulkan/vulkan-headers_1.2.162.0.bb +1 -1
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master" -SRCREV = "87aaa16d4c8e1ac70f8f04acdcd46eed4bd77209" +SRCREV = "1d99b835ec3cd5a7fb2f2a2dd9a615ee2d1f0101" S = "${WORKDIR}/git"
meta/recipes-graphics/vulkan/vulkan-loader/0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 5ae24ece75f2caa69216da7075334711642f5588 Mon Sep 17 00:00:00 2001 -From: Michel Zou <[email protected]> -Date: Wed, 16 Dec 2020 15:03:23 +0100 -Subject: [PATCH] Rename LIB_SUFFIX to VULKAN_LIB_SUFFIX - -Closes #527 - -Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-Loader/commit/66a23ac8c566299343668f094de50798a5f4a0e4] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - loader/CMakeLists.txt | 2 +- - loader/vulkan.pc.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index 659511855..ba9f460f1 100644 ---- a/loader/CMakeLists.txt -+++ b/loader/CMakeLists.txt -@@ -327,7 +327,7 @@ if(PKG_CONFIG_FOUND) - set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") - endforeach() - if(WIN32) -- set(LIB_SUFFIX "-1") -+ set(VULKAN_LIB_SUFFIX "-1") - endif () - configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in -index fc17cb1f3..44049ee34 100644 ---- a/loader/vulkan.pc.in -+++ b/loader/vulkan.pc.in -@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - Name: @CMAKE_PROJECT_NAME@ - Description: Vulkan Loader - Version: @VK_API_VERSION@ --Libs: -L${libdir} -lvulkan@LIB_SUFFIX@ -+Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@ - Libs.private: @PRIVATE_LIBS@ - Cflags: -I${includedir} -
meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.2.162.0.bb +3 -4
@@ -9,10 +9,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \ - file://0001-Rename-LIB_SUFFIX-to-VULKAN_LIB_SUFFIX.patch \ - " -SRCREV = "7a313093b5c4af964d50a5a64e73d7df6152ea3f" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git" +SRCREV = "c5678a03db383fd0dc5bfb8e9a383043bdbcb57b" S = "${WORKDIR}/git"
@@ -27,6 +25,7 @@ EXTRA_OECMAKE = "\ -DBUILD_TESTS=OFF \ -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ -DASSEMBLER_WORKS=FALSE \ + -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ " # must choose x11 or wayland or both
meta/recipes-graphics/vulkan/vulkan-tools_1.2.170.0.bb renamed from meta/recipes-graphics/vulkan/vulkan-tools_1.2.162.1.bb +2 -2
@@ -6,8 +6,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.162" -SRCREV = "8f0c2e40d4134f53f82ce48de72c7be92baa6b3d" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git" +SRCREV = "88ea55de928a08ba5c5f65a93d1e7c8f666fc43f" S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
PATCH 4/16 bind: upgrade 9.16.11 -> 9.16.12
In reply to Alexander KanavinAdjust library packaging (see link to commit in the recipe).
---
.../0001-avoid-start-failure-with-bind-user.patch | 0
...1-named-lwresd-V-and-start-log-hide-build-options.patch | 0
...d-ensure-searching-for-json-headers-searches-sysr.patch | 0
.../bind/{bind-9.16.11 => bind-9.16.12}/bind9 | 0
.../bind/{bind-9.16.11 => bind-9.16.12}/conf.patch | 0
.../{bind-9.16.11 => bind-9.16.12}/generate-rndc-key.sh | 0
.../init.d-add-support-for-read-only-rootfs.patch | 0
.../make-etc-initd-bind-stop-work.patch | 0
.../bind/{bind-9.16.11 => bind-9.16.12}/named.service | 0
.../bind/{bind_9.16.11.bb => bind_9.16.12.bb} | 7 +++++--
10 files changed, 5 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/0001-avoid-start-failure-with-bind-user.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/bind9 (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/conf.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/generate-rndc-key.sh (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/init.d-add-support-for-read-only-rootfs.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/make-etc-initd-bind-stop-work.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/named.service (100%)
rename meta/recipes-connectivity/bind/{bind_9.16.11.bb => bind_9.16.12.bb} (93%)meta/recipes-connectivity/bind/bind-9.16.12/0001-avoid-start-failure-with-bind-user.patch renamed from meta/recipes-connectivity/bind/bind-9.16.11/0001-avoid-start-failure-with-bind-user.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.12/0001-named-lwresd-V-and-start-log-hide-build-options.patch renamed from meta/recipes-connectivity/bind/bind-9.16.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.12/bind-ensure-searching-for-json-headers-searches-sysr.patch renamed from meta/recipes-connectivity/bind/bind-9.16.11/bind-ensure-searching-for-json-headers-searches-sysr.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.12/bind9 renamed from meta/recipes-connectivity/bind/bind-9.16.11/bind9 +0 -0
meta/recipes-connectivity/bind/bind-9.16.12/conf.patch renamed from meta/recipes-connectivity/bind/bind-9.16.11/conf.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.12/generate-rndc-key.sh renamed from meta/recipes-connectivity/bind/bind-9.16.11/generate-rndc-key.sh +0 -0
meta/recipes-connectivity/bind/bind-9.16.12/init.d-add-support-for-read-only-rootfs.patch renamed from meta/recipes-connectivity/bind/bind-9.16.11/init.d-add-support-for-read-only-rootfs.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.12/make-etc-initd-bind-stop-work.patch renamed from meta/recipes-connectivity/bind/bind-9.16.11/make-etc-initd-bind-stop-work.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.12/named.service renamed from meta/recipes-connectivity/bind/bind-9.16.11/named.service +0 -0
meta/recipes-connectivity/bind/bind_9.16.12.bb renamed from meta/recipes-connectivity/bind/bind_9.16.11.bb +5 -2
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "0111f64dd7d8f515cfa129e181cce96ff82070d1b27f11a21f6856110d0699c1" +SRC_URI[sha256sum] = "9914af9311fd349cab441097898d94fb28d0bfd9bf6ed04fe1f97f042644da7f" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4
@@ -113,7 +113,10 @@ FILES_${PN}-dev += "${bindir}/isc-config.h" FILES_${PN} += "${sbindir}/generate-rndc-key.sh" PACKAGE_BEFORE_PN += "${PN}-libs" -FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.so*" +# special arrangement below due to +# https://github.com/isc-projects/bind9/commit/0e25af628cd776f98c04fc4cc59048f5448f6c88 +FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so" +FILES_${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so" FILES_${PN}-staticdev += "${libdir}/*.la" PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}"
Signature · 1 line
2.29.2
PATCH 5/16 spirv-headers: update to latest revision
In reply to Alexander KanavinThis is required by latest release of spirv-tools.
--- meta/recipes-graphics/spir/spirv-headers_1.5.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-graphics/spir/spirv-headers_1.5.4.bb +2 -1
@@ -7,10 +7,11 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" -SRCREV = "f027d53ded7e230e008d37c8b47ede7cd308e19d" +SRCREV = "bcf55210f13a4fa3c3d0963b509ff1070e434c79" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git" +PV .= "+git${SRCPV}" inherit cmake
Signature · 1 line
2.29.2
PATCH 6/16 spirv-tools: upgrade 2020.6 -> 2020.7
In reply to Alexander Kanavin---
.../spir/{spirv-tools_2020.6.bb => spirv-tools_2020.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/spir/{spirv-tools_2020.6.bb => spirv-tools_2020.7.bb} (96%)meta/recipes-graphics/spir/spirv-tools_2020.7.bb renamed from meta/recipes-graphics/spir/spirv-tools_2020.6.bb +1 -1
@@ -7,7 +7,7 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "b27b1afd12d05bf238ac7368bb49de73cd620a8e" +SRCREV = "2573fd781b5408cd7fe5755a78b60d767a748ff9" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git \ file://0001-fix-strncpy-bound-error.patch \ "
Signature · 1 line
2.29.2
PATCH 7/16 mesa: update 20.3.4 -> 21.0.0
In reply to Alexander Kanavin0001-anv-fix-a-build-race-between-generating-a-header-and.patch merged upstream.
osmesa is now a simple boolean option.
Swrast has been removed from dri drivers, so as we need at least one driver to enable dri in native/nativesdk, replace it with nouveau (which does not take long to build).
---
...race-between-generating-a-header-and.patch | 31 -------------------
...k-for-all-linux-host_os-combinations.patch | 12 +++----
...02-meson.build-make-TLS-ELF-optional.patch | 14 ++++-----
.../{mesa-gl_20.3.4.bb => mesa-gl_21.0.0.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 10 +++---
.../mesa/{mesa_20.3.4.bb => mesa_21.0.0.bb} | 0
6 files changed, 17 insertions(+), 50 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch
rename meta/recipes-graphics/mesa/{mesa-gl_20.3.4.bb => mesa-gl_21.0.0.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_20.3.4.bb => mesa_21.0.0.bb} (100%)meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From f148d4f1b5b13288b254ead07f1d008d997e2342 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 2 Nov 2020 23:23:53 +0100 -Subject: [PATCH] anv: fix a build race between generating a header and using - it - -anv_batch_chain.c includes genX_bits.h but doesn't ensure it gets -generated first. This causes build failures, as observed here: -https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1501/steps/8/logs/step2d - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7412] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - src/intel/vulkan/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build -index 36e1689314e..b713d8eade3 100644 ---- a/src/intel/vulkan/meson.build -+++ b/src/intel/vulkan/meson.build -@@ -131,6 +131,7 @@ libanv_files = files( - anv_deps = [ - dep_libdrm, - dep_valgrind, -+ idep_genxml, - idep_nir_headers, - idep_vulkan_util_headers, - ] --- -2.29.0 -
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +6 -6
@@ -1,4 +1,4 @@ -From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001 +From 38e984073e4c23b6278d1a2ff21e894fda7b93c5 Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 13:04:49 -0800 Subject: [PATCH] meson.build: check for all linux host_os combinations
@@ -20,10 +20,10 @@ Signed-off-by: Alistair Francis <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 898d025..09e3759 100644 +index 932eb13..efc6171 100644 --- a/meson.build +++ b/meson.build -@@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 +@@ -153,7 +153,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 # Only build shared_glapi if at least one OpenGL API is enabled with_shared_glapi = with_shared_glapi and with_any_opengl
@@ -32,12 +32,12 @@ index 898d025..09e3759 100644 dri_drivers = get_option('dri-drivers') if dri_drivers.contains('auto') -@@ -884,7 +884,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', +@@ -970,7 +970,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', endif # TODO: this is very incomplete --if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd'].contains(host_machine.system()) -+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux') +-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) ++if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux') pre_args += '-D_GNU_SOURCE' elif host_machine.system() == 'sunos' pre_args += '-D__EXTENSIONS__'
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +7 -7
@@ -1,4 +1,4 @@ -From ce57ce220d9c377beabf4914f33c43118f672ffe Mon Sep 17 00:00:00 2001 +From 624f430dd0a91344146a2b8d49a69f23560c2fa2 Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 13:08:31 -0800 Subject: [PATCH] meson.build: make TLS ELF optional
@@ -30,23 +30,23 @@ Signed-off-by: Alistair Francis <[email protected]> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index c5136ea..185270d 100644 +index efc6171..8450968 100644 --- a/meson.build +++ b/meson.build -@@ -424,7 +424,7 @@ endif +@@ -448,7 +448,7 @@ endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. use_elf_tls = false --if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) -+if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') +-if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) ++if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') pre_args += '-DUSE_ELF_TLS' use_elf_tls = true endif diff --git a/meson_options.txt b/meson_options.txt -index 2d39d13..72006eb 100644 +index fc73f6e..d7482c0 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -368,6 +368,12 @@ option( +@@ -420,6 +420,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', )
meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb renamed from meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb +0 -0
meta/recipes-graphics/mesa/mesa.inc +4 -6
@@ -19,10 +19,9 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0002-meson.build-make-TLS-ELF-optional.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ - file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ " -SRC_URI[sha256sum] = "dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084" +SRC_URI[sha256sum] = "e6204e98e6a8d77cf9dc5d34f99dd8e3ef7144f3601c808ca0dd26ba522e0d84" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
@@ -103,8 +102,8 @@ PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false" PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" -DRIDRIVERS_class-native = "swrast" -DRIDRIVERS_class-nativesdk = "swrast" +DRIDRIVERS_class-native = "nouveau" +DRIDRIVERS_class-nativesdk = "nouveau" DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" # "dri" requires "opengl"
@@ -168,8 +167,7 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', ' PACKAGECONFIG[panfrost] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}" -OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium', 'classic', d)}" -PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none" +PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false" PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
meta/recipes-graphics/mesa/mesa_21.0.0.bb renamed from meta/recipes-graphics/mesa/mesa_20.3.4.bb +0 -0
Signature · 1 line
2.29.2
Re: [OE-core] [PATCH 07/16] mesa: update 20.3.4 -> 21.0.0
Quoted 8 lines · Alexander Kanavin
0001-anv-fix-a-build-race-between-generating-a-header-and.patch merged upstream.
osmesa is now a simple boolean option.
Swrast has been removed from dri drivers, so as we need at least one driver to enable dri in native/nativesdk, replace it with nouveau (which does not take long to build).
so the mesa-gl needs similar change, right?
meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb:# When NOT using X11, we need to make sure we have swrast available. meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb:DRIDRIVERS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', ',swrast', d)}"
Now it's failing with:
http://errors.yoctoproject.org/Errors/Build/118645/
Quoted 182 lines
Signed-off-by Alexander Kanavin <[email protected]>--- ...race-between-generating-a-header-and.patch | 31 ------------------- ...k-for-all-linux-host_os-combinations.patch | 12 +++---- ...02-meson.build-make-TLS-ELF-optional.patch | 14 ++++----- .../{mesa-gl_20.3.4.bb => mesa-gl_21.0.0.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 10 +++--- .../mesa/{mesa_20.3.4.bb => mesa_21.0.0.bb} | 0 6 files changed, 17 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch rename meta/recipes-graphics/mesa/{mesa-gl_20.3.4.bb => mesa-gl_21.0.0.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_20.3.4.bb => mesa_21.0.0.bb} (100%)meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch deleted +0
-31@@ -1,31 +0,0 @@ -From f148d4f1b5b13288b254ead07f1d008d997e2342 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 2 Nov 2020 23:23:53 +0100 -Subject: [PATCH] anv: fix a build race between generating a header and using - it - -anv_batch_chain.c includes genX_bits.h but doesn't ensure it gets -generated first. This causes build failures, as observed here: -https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1501/steps/8/logs/step2d - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7412] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - src/intel/vulkan/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build -index 36e1689314e..b713d8eade3 100644 ---- a/src/intel/vulkan/meson.build -+++ b/src/intel/vulkan/meson.build -@@ -131,6 +131,7 @@ libanv_files = files( - anv_deps = [ - dep_libdrm, - dep_valgrind, -+ idep_genxml, - idep_nir_headers, - idep_vulkan_util_headers, - ] --- -2.29.0 -meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +6
-6@@ -1,4 +1,4 @@ -From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001 +From 38e984073e4c23b6278d1a2ff21e894fda7b93c5 Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 13:04:49 -0800 Subject: [PATCH] meson.build: check for all linux host_os combinations@@ -20,10 +20,10 @@ Signed-off-by: Alistair Francis <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 898d025..09e3759 100644 +index 932eb13..efc6171 100644 --- a/meson.build +++ b/meson.build -@@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 +@@ -153,7 +153,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 # Only build shared_glapi if at least one OpenGL API is enabled with_shared_glapi = with_shared_glapi and with_any_opengl@@ -32,12 +32,12 @@ index 898d025..09e3759 100644 dri_drivers = get_option('dri-drivers') if dri_drivers.contains('auto') -@@ -884,7 +884,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', +@@ -970,7 +970,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', endif # TODO: this is very incomplete --if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd'].contains(host_machine.system()) -+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux') +-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) ++if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux') pre_args += '-D_GNU_SOURCE' elif host_machine.system() == 'sunos' pre_args += '-D__EXTENSIONS__'meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +7
-7@@ -1,4 +1,4 @@ -From ce57ce220d9c377beabf4914f33c43118f672ffe Mon Sep 17 00:00:00 2001 +From 624f430dd0a91344146a2b8d49a69f23560c2fa2 Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 13:08:31 -0800 Subject: [PATCH] meson.build: make TLS ELF optional@@ -30,23 +30,23 @@ Signed-off-by: Alistair Francis <[email protected]> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index c5136ea..185270d 100644 +index efc6171..8450968 100644 --- a/meson.build +++ b/meson.build -@@ -424,7 +424,7 @@ endif +@@ -448,7 +448,7 @@ endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. use_elf_tls = false --if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) -+if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') +-if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) ++if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') pre_args += '-DUSE_ELF_TLS' use_elf_tls = true endif diff --git a/meson_options.txt b/meson_options.txt -index 2d39d13..72006eb 100644 +index fc73f6e..d7482c0 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -368,6 +368,12 @@ option( +@@ -420,6 +420,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', )meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb renamed from meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb +0
-0meta/recipes-graphics/mesa/mesa.inc +4
-6@@ -19,10 +19,9 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0002-meson.build-make-TLS-ELF-optional.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ - file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ " -SRC_URI[sha256sum] = "dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084" +SRC_URI[sha256sum] = "e6204e98e6a8d77cf9dc5d34f99dd8e3ef7144f3601c808ca0dd26ba522e0d84" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"@@ -103,8 +102,8 @@ PACKAGECONFIG[elf-tls] = "-Delf-tls=true, -Delf-tls=false" PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" -DRIDRIVERS_class-native = "swrast" -DRIDRIVERS_class-nativesdk = "swrast" +DRIDRIVERS_class-native = "nouveau" +DRIDRIVERS_class-nativesdk = "nouveau" DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" # "dri" requires "opengl"@@ -168,8 +167,7 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', ' PACKAGECONFIG[panfrost] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}" -OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium', 'classic', d)}" -PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none" +PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false" PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"meta/recipes-graphics/mesa/mesa_21.0.0.bb renamed from meta/recipes-graphics/mesa/mesa_20.3.4.bb +0
-0Signature · 1 line
2.29.2
Re: [OE-core] [PATCH 07/16] mesa: update 20.3.4 -> 21.0.0
I guess so, yes. I believe AB doesn't run the build?
Alex
Quoted 257 lines · Martin Jansa
Quoted 8 lines · Alexander Kanavin
0001-anv-fix-a-build-race-between-generating-a-header-and.patch merged upstream.
osmesa is now a simple boolean option.
Swrast has been removed from dri drivers, so as we need at least one driver to enable dri in native/nativesdk, replace it with nouveau (which does not take long to build).
so the mesa-gl needs similar change, right?
meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb:# When NOT using X11, we need to make sure we have swrast available. meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb:DRIDRIVERS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', ',swrast', d)}"
Now it's failing with:
http://errors.yoctoproject.org/Errors/Build/118645/Quoted 11 lines
Signed-off-by Alexander Kanavin <[email protected]>--- ...race-between-generating-a-header-and.patch | 31 ------------------- ...k-for-all-linux-host_os-combinations.patch | 12 +++---- ...02-meson.build-make-TLS-ELF-optional.patch | 14 ++++----- .../{mesa-gl_20.3.4.bb => mesa-gl_21.0.0.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 10 +++--- .../mesa/{mesa_20.3.4.bb => mesa_21.0.0.bb} | 0 6 files changed, 17 insertions(+), 50 deletions(-) delete mode 100644
meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patchQuoted 1 line
rename meta/recipes-graphics/mesa/{mesa-gl_20.3.4.bb =>mesa-gl_21.0.0.bb} (100%)
Quoted 1 line
rename meta/recipes-graphics/mesa/{mesa_20.3.4.bb => mesa_21.0.0.bb}(100%)
Quoted 2 lines
diff --git
a/meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patchb/meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patchQuoted 3 lines
deleted file mode 100644
index a61e7b2160..0000000000
---
a/meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patchmeta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch deleted +0
-4@@ -1,31 +0,0 @@ -From f148d4f1b5b13288b254ead07f1d008d997e2342 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 2 Nov 2020 23:23:53 +0100 -Subject: [PATCH] anv: fix a build race between generating a header andusing
meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch line 10
Quoted 5 lines
meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch deleted +0
-5- it - -anv_batch_chain.c includes genX_bits.h but doesn't ensure it gets -generated first. This causes build failures, as observed here: -https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/1501/steps/8/logs/step2d
Review line 11
Quoted 2 lines
(quoted diff) +0
-2- -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7412]
Quoted 20 lines
meta/recipes-graphics/mesa/files/0001-anv-fix-a-build-race-between-generating-a-header-and.patch deleted +0
-20-Signed-off-by: Alexander Kanavin <[email protected]> ---- - src/intel/vulkan/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build -index 36e1689314e..b713d8eade3 100644 ---- a/src/intel/vulkan/meson.build -+++ b/src/intel/vulkan/meson.build -@@ -131,6 +131,7 @@ libanv_files = files( - anv_deps = [ - dep_libdrm, - dep_valgrind, -+ idep_genxml, - idep_nir_headers, - idep_vulkan_util_headers, - ] --- -2.29.0 -Quoted 1 line
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patchb/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patchQuoted 2 lines
index
085254323c..b6f86743e1100644
---
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patchQuoted 1 line
+++
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patchmeta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch Signed-off-by: Alistair Francis <
Quoted 7 lines
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +1
-1@@ -1,4 +1,4 @@ -From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001 +From 38e984073e4c23b6278d1a2ff21e894fda7b93c5 Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 13:04:49 -0800 Subject: [PATCH] meson.build: check for all linux host_os combinations@@ -20,10 +20,10 @@ Signed-off-by: Alistair Francis <meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch Signed-off-by: Alistair Francis <[email protected]>
Quoted 8 lines
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +1
-21 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 898d025..09e3759 100644 +index 932eb13..efc6171 100644 --- a/meson.build +++ b/meson.build -@@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or
with_gles2Review Signed-off-by: Alistair Francis < · line 26
Quoted 1 line
(quoted diff) +1
-0+@@ -153,7 +153,7 @@ with_any_opengl = with_opengl or with_gles1 or
with_gles2meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index 898d025..09e3759 100644 · line 35
Quoted 8 lines
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +0
-1# Only build shared_glapi if at least one OpenGL API is enabled with_shared_glapi = with_shared_glapi and with_any_opengl@@ -32,12 +32,12 @@ index 898d025..09e3759 100644 dri_drivers = get_option('dri-drivers') if dri_drivers.contains('auto') -@@ -884,7 +884,7 @@ if cc.compiles('__uint128_t foo(void) { return 0;}',
Review index 898d025..09e3759 100644 · line 35
Quoted 1 line
(quoted diff) +1
-0+@@ -970,7 +970,7 @@ if cc.compiles('__uint128_t foo(void) { return 0;}',
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index 898d025..09e3759 100644
Quoted 4 lines
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +0
-1endif # TODO: this is very incomplete --if ['linux', 'cygwin', 'gnu', 'freebsd','gnu/kfreebsd'].contains(host_machine.system())
Review index 898d025..09e3759 100644 · line 40
Quoted 1 line
(quoted diff) +0
-1-+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())or host_machine.system().startswith('linux')
Review index 898d025..09e3759 100644 · line 39
Quoted 1 line
(quoted diff) +1
-0+-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd','haiku'].contains(host_machine.system())
Review index 898d025..09e3759 100644 · line 40
Quoted 1 line
(quoted diff) +1
-0++if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd','haiku'].contains(host_machine.system()) or
host_machine.system().startswith('linux')Quoted 4 lines
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +0
-0pre_args += '-D_GNU_SOURCE' elif host_machine.system() == 'sunos' pre_args += '-D__EXTENSIONS__'diff --git
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patchb/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patchQuoted 2 lines
index
89c0d150fa..df2346d336100644
---
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patchQuoted 1 line
+++
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patchmeta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch Signed-off-by: Alistair Francis <
Quoted 7 lines
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +1
-1@@ -1,4 +1,4 @@ -From ce57ce220d9c377beabf4914f33c43118f672ffe Mon Sep 17 00:00:00 2001 +From 624f430dd0a91344146a2b8d49a69f23560c2fa2 Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 13:08:31 -0800 Subject: [PATCH] meson.build: make TLS ELF optional@@ -30,23 +30,23 @@ Signed-off-by: Alistair Francis <meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch Signed-off-by: Alistair Francis <[email protected]>
Quoted 11 lines
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +2
-22 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index c5136ea..185270d 100644 +index efc6171..8450968 100644 --- a/meson.build +++ b/meson.build -@@ -424,7 +424,7 @@ endif +@@ -448,7 +448,7 @@ endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we needELF TLS.
Review Signed-off-by: Alistair Francis < · line 40
Quoted 2 lines
(quoted diff) +0
-1use_elf_tls = false --if not ['windows', 'freebsd','openbsd'].contains(host_machine.system()) and (not
with_platform_androidorget_option('platform-sdk-version')>= 29)Review Signed-off-by: Alistair Francis < · line 41
Quoted 1 line
(quoted diff) +0
-1-+if not ['windows', 'freebsd','openbsd'].contains(host_machine.system()) and (not
with_platform_androidorget_option('platform-sdk-version')>= 29) andget_option('elf-tls')Review Signed-off-by: Alistair Francis < · line 40
Quoted 1 line
(quoted diff) +1
-0+-if not ['windows', 'freebsd', 'openbsd','haiku'].contains(host_machine.system()) and (not
with_platform_androidorget_option('platform-sdk-version')>= 29)Review Signed-off-by: Alistair Francis < · line 41
Quoted 1 line
(quoted diff) +1
-0++if not ['windows', 'freebsd', 'openbsd','haiku'].contains(host_machine.system()) and (not
with_platform_androidorget_option('platform-sdk-version')>= 29) andget_option('elf-tls')Review
Quoted 14 lines
meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +2
-2pre_args += '-DUSE_ELF_TLS' use_elf_tls = true endif diff --git a/meson_options.txt b/meson_options.txt -index 2d39d13..72006eb 100644 +index fc73f6e..d7482c0 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -368,6 +368,12 @@ option( +@@ -420,6 +420,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', )(quoted diff) +0
-0b/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb
Review
Quoted 4 lines
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb rename to meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb(quoted diff) +0
-0b/meta/recipes-graphics/mesa/mesa.inc
meta/recipes-graphics/mesa/mesa.inc SRC_URI = "
Quoted 4 lines
index
9f8ec112cf..e9b72ce063100644meta/recipes-graphics/mesa/mesa.inc +0
-0@@ -19,10 +19,9 @@ SRC_URI = "meta/recipes-graphics/mesa/mesa.inc SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ · line 23
Quoted 2 lines
meta/recipes-graphics/mesa/mesa.inc +0
-0file://0002-meson.build-make-TLS-ELF-optional.patch \file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
Quoted 1 line
file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
Quoted 1 line
-
file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \
Quoted 3 lines
"-SRC_URI[sha256sum] =
"
dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084"Quoted 1 line
+SRC_URI[sha256sum] =
"
e6204e98e6a8d77cf9dc5d34f99dd8e3ef7144f3601c808ca0dd26ba522e0d84"meta/recipes-graphics/mesa/mesa.inc PACKAGECONFIG[elf-tls] = "-Delf-tls=true,
Quoted 4 lines
UPSTREAM_CHECK_GITTAGREGEX= "mesa-(?P<pver>\d+(\.\d+)+)"meta/recipes-graphics/mesa/mesa.inc +0
-0@@ -103,8 +102,8 @@ PACKAGECONFIG[elf-tls] = "-Delf-tls=true,-Delf-tls=false"
meta/recipes-graphics/mesa/mesa.inc PACKAGECONFIG[elf-tls] = "-Delf-tls=true, · line 102
Quoted 1 line
meta/recipes-graphics/mesa/mesa.inc +0
-0PACKAGECONFIG[xvmc] ="-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc"
meta/recipes-graphics/mesa/mesa.inc PACKAGECONFIG[elf-tls] = "-Delf-tls=true, · line 103
Quoted 1 line
meta/recipes-graphics/mesa/mesa.inc +0
-0PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrmwayland-protocols"
meta/recipes-graphics/mesa/mesa.inc GALLIUMDRIVERS_append
Quoted 9 lines
meta/recipes-graphics/mesa/mesa.inc +2
-2-DRIDRIVERS_class-native = "swrast" -DRIDRIVERS_class-nativesdk = "swrast" +DRIDRIVERS_class-native = "nouveau" +DRIDRIVERS_class-nativesdk = "nouveau" DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" # "dri" requires "opengl"@@ -168,8 +167,7 @@ GALLIUMDRIVERS_append="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '
meta/recipes-graphics/mesa/mesa.inc GALLIUMDRIVERS_append · line 168
Quoted 2 lines
meta/recipes-graphics/mesa/mesa.inc +0
-0PACKAGECONFIG[panfrost] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG','panfrost', ',panfrost', '', d)}"
meta/recipes-graphics/mesa/mesa.inc GALLIUMDRIVERS_append · line 170
Quoted 2 lines
meta/recipes-graphics/mesa/mesa.inc +0
-1-OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium','classic', d)}"
meta/recipes-graphics/mesa/mesa.inc GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '
Quoted 4 lines
meta/recipes-graphics/mesa/mesa.inc +1
-1-PACKAGECONFIG[osmesa] = "-Dosmesa=${OSMESA},-Dosmesa=none" +PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false" PACKAGECONFIG[unwind] ="-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta/recipes-graphics/mesa/mesa_21.0.0.bb
Quoted 10 lines
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_20.3.4.bb rename to meta/recipes-graphics/mesa/mesa_21.0.0.bb --
2.29.2
PATCH 8/16 attr: update 2.4.48 -> 2.5.1
In reply to Alexander Kanavin--- meta/recipes-support/attr/attr_2.4.48.bb | 6 ------ meta/recipes-support/attr/attr_2.5.1.bb | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-support/attr/attr_2.4.48.bb create mode 100644 meta/recipes-support/attr/attr_2.5.1.bb
meta/recipes-support/attr/attr_2.4.48.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require attr.inc - -SRC_URI[md5sum] = "bc1e5cb5c96d99b24886f1f527d3bb3d" -SRC_URI[sha256sum] = "5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7" - -BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/attr/attr_2.5.1.bb new file +5 -0
@@ -0,0 +1,5 @@ +require attr.inc + +SRC_URI[sha256sum] = "bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8" + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.29.2
PATCH 9/16 asciidoc: update 9.0.4 -> 9.1.0
In reply to Alexander KanavinDropped patch supserseded by https://github.com/asciidoc-py/asciidoc-py/pull/172
---
.../asciidoc/asciidoc/auto-catalogs.patch | 53 -------------------
.../{asciidoc_9.0.4.bb => asciidoc_9.1.0.bb} | 5 +-
2 files changed, 2 insertions(+), 56 deletions(-)
delete mode 100644 meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch
rename meta/recipes-extended/asciidoc/{asciidoc_9.0.4.bb => asciidoc_9.1.0.bb} (91%)meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch deleted +0 -53
@@ -1,53 +0,0 @@ -If SGML_CATALOG_FILES is in the environment, pass --catalogs to xmllint and -xsltproc. Also pass --nonet to xsltproc to detect future missing stylesheet -problems. - -An earlier version of this patch was filed upstream at -https://github.com/asciidoc/asciidoc-py3/issues/61 so depending on how that goes -this could get merged. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/a2x.py b/a2x.py -index 2d7699a..582d809 100755 ---- a/a2x.py -+++ b/a2x.py -@@ -57,6 +57,10 @@ LYNX_OPTS = '-dump' - W3M_OPTS = '-dump -cols 70 -T text/html -no-graph' - XSLTPROC_OPTS = '' - -+if "SGML_CATALOG_FILES" in os.environ: -+ XMLLINT += " --catalogs" -+ XSLTPROC += " --catalogs" -+ - ###################################################################### - # End of configuration file parameters. - ###################################################################### -@@ -298,7 +302,7 @@ def exec_xsltproc(xsl_file, xml_file, dst_dir, opts = ''): - cwd = os.getcwd() - shell_cd(dst_dir) - try: -- shell('"%s" %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file)) -+ shell('%s %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file)) - finally: - shell_cd(cwd) - -@@ -483,7 +487,7 @@ class A2X(AttrDict): - self.asciidoc_opts += ' --doctype %s' % self.doctype - for attr in self.attributes: - self.asciidoc_opts += ' --attribute "%s"' % attr --# self.xsltproc_opts += ' --nonet' -+ self.xsltproc_opts += ' --nonet' - if self.verbose: - self.asciidoc_opts += ' --verbose' - self.dblatex_opts += ' -V' -@@ -634,7 +638,7 @@ class A2X(AttrDict): - shell('"%s" --backend docbook -a "a2x-format=%s" %s --out-file "%s" "%s"' % - (self.asciidoc, self.format, self.asciidoc_opts, docbook_file, self.asciidoc_file)) - if not self.no_xmllint and XMLLINT: -- shell('"%s" --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) -+ shell('%s --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) - - def to_xhtml(self): - self.to_docbook()
meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb renamed from meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb +2 -3
@@ -8,9 +8,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main \ - file://auto-catalogs.patch" -SRCREV = "8de61a75572b5b8f90c1f87634aa3767472be7a7" +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=9.x" +SRCREV = "9705d428439530104ce55d0ba12e8ef9d1b57ad1" DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
Signature · 1 line
2.29.2
PATCH 10/16 libhandy: update 1.0.3 -> 1.2.0
In reply to Alexander Kanavin---
.../libhandy/libhandy/determinism.patch | 35 -------------------
.../{libhandy_1.0.3.bb => libhandy_1.2.0.bb} | 5 ++-
2 files changed, 2 insertions(+), 38 deletions(-)
delete mode 100644 meta/recipes-gnome/libhandy/libhandy/determinism.patch
rename meta/recipes-gnome/libhandy/{libhandy_1.0.3.bb => libhandy_1.2.0.bb} (89%)meta/recipes-gnome/libhandy/libhandy/determinism.patch deleted +0 -35
@@ -1,35 +0,0 @@ -hdy-enums*.c.in: Fix reproducibility issue - -When full filenames are used in generated sources it makes the resulting -debug packages non-reproducible. Best practise is to use basename in -comments instead. - -Signed-off-by: Richard Purdie [email protected] -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/734] - -Index: a/src/hdy-enums-private.c.in -=================================================================== ---- a/src/hdy-enums-private.c.in -+++ b/src/hdy-enums-private.c.in -@@ -7,7 +7,7 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN value-header ***/ -Index: a/src/hdy-enums.c.in -=================================================================== ---- a/src/hdy-enums.c.in -+++ b/src/hdy-enums.c.in -@@ -13,7 +13,7 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN value-header ***/
meta/recipes-gnome/libhandy/libhandy_1.2.0.bb renamed from meta/recipes-gnome/libhandy/libhandy_1.0.3.bb +2 -3
@@ -9,9 +9,8 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-0 \ - file://determinism.patch" -SRCREV = "7126d2e8da9dcdeb5751e60ff6a74930804f9637" +SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https" +SRCREV = "7b38a860ffcec6c2ad28153358cc3d037ddb618f" S = "${WORKDIR}/git" GIR_MESON_ENABLE_FLAG = 'enabled'
Signature · 1 line
2.29.2
PATCH 11/16 strace: update 5.10 -> 5.11
In reply to Alexander KanavinDrop disable-git-version-gen.patch as problem fixed upstream.
Add parallel builds to ptest compile.
strace-graph has been removed upstream.
Adjust ptest patch to match upstream changes.
License-Update: copyright years.
---
.../strace/strace/Makefile-ptest.patch | 19 ++++----
.../strace/disable-git-version-gen.patch | 37 ----------------
.../strace/strace/update-gawk-paths.patch | 44 +++++++++----------
.../strace/{strace_5.10.bb => strace_5.11.bb} | 18 +++-----
4 files changed, 39 insertions(+), 79 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
rename meta/recipes-devtools/strace/{strace_5.10.bb => strace_5.11.bb} (79%)meta/recipes-devtools/strace/strace/Makefile-ptest.patch +10 -9
@@ -1,4 +1,4 @@ -From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 +From 205e7661822987825c7149ada4eefdc5368828ce Mon Sep 17 00:00:00 2001 From: Gabriel Barbu <[email protected]> Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest
@@ -10,14 +10,14 @@ Signed-off-by: Chong Lu <[email protected]> Signed-off-by: Anuj Mittal <[email protected]> --- - tests/Makefile.am | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) + tests/Makefile.am | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 8cf4c36..66162eb 100644 +index b8efce8..fa9a1af 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ +@@ -16,6 +16,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ MPERS_NAME = MPERS_CC_FLAGS = ARCH_MFLAGS =
@@ -25,16 +25,17 @@ index 8cf4c36..66162eb 100644 AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h +@@ -692,3 +693,22 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h - include ../scno.am + include ../src/scno.am + +buildtest-TESTS: $(check_PROGRAMS) $(TESTS) + +install-ptest: -+ install $(BUILDDIR)/strace $(DESTDIR) -+ install $(srcdir)/../strace-log-merge $(DESTDIR) ++ install -d $(DESTDIR)/src ++ install $(BUILDDIR)/src/strace $(DESTDIR)/src ++ install $(srcdir)/../src/strace-log-merge $(DESTDIR)/src + install -d $(DESTDIR)/$(TESTDIR) + cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR) + sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile
meta/recipes-devtools/strace/strace/disable-git-version-gen.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <[email protected]> -Date: Mon, 18 Jan 2016 13:33:50 -0800 -Subject: [PATCH] strace: remove need for scripts - -git-version-gen copyright-year-gen file-date-gen are not included in -tarball releases, so we need to avoid attempts to call them. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andre McCurdy <[email protected]> -Signed-off-by: Anuj Mittal <[email protected]> - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dd4f13f..65f000b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -12,12 +12,12 @@ - - AC_PREREQ(2.57) - AC_INIT([strace], -- st_esyscmd_s([./git-version-gen .tarball-version]), -+ m4_esyscmd_s([cat .tarball-version]), - [[email protected]], - [strace], - [https://strace.io]) --m4_define([copyright_year], st_esyscmd_s([./copyright-year-gen .year])) --m4_define([manpage_date], st_esyscmd_s([./file-date-gen strace.1.in])) -+m4_define([copyright_year], m4_esyscmd_s([cat .year])) -+m4_define([manpage_date], m4_esyscmd_s([cat .strace.1.in.date])) - AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.]) - AC_CONFIG_SRCDIR([strace.c]) - AC_CONFIG_AUX_DIR([.])
meta/recipes-devtools/strace/strace/update-gawk-paths.patch +22 -22
127 lines not on this page · raw message
meta/recipes-devtools/strace/strace_5.11.bb renamed from meta/recipes-devtools/strace/strace_5.10.bb +7 -11
@@ -3,10 +3,9 @@ HOMEPAGE = "http://strace.io" DESCRIPTION = "strace is a diagnostic, debugging and instructional userspace utility for Linux. It is used to monitor and tamper with interactions between processes and the Linux kernel, which include system calls, signal deliveries, and changes of process state." SECTION = "console/utils" LICENSE = "LGPL-2.1+ & GPL-2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" +LIC_FILES_CHKSUM = "file://COPYING;md5=318cfc887fc8723f4e9d4709b55e065b" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ - file://disable-git-version-gen.patch \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \
@@ -16,7 +15,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://uintptr_t.patch \ file://0001-strace-fix-reproducibilty-issues.patch \ " -SRC_URI[sha256sum] = "fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c" +SRC_URI[sha256sum] = "ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879" inherit autotools ptest
@@ -34,19 +33,16 @@ CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" TESTDIR = "tests" PTEST_BUILD_HOST_PATTERN = "^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD|LDFLAGS_FOR_BUILD)" -do_install_append() { - # We don't ship strace-graph here because it needs perl - rm ${D}${bindir}/strace-graph -} - do_compile_ptest() { - oe_runmake -C ${TESTDIR} buildtest-TESTS + oe_runmake ${PARALLEL_MAKE} -C ${TESTDIR} buildtest-TESTS } do_install_ptest() { oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} - install -m 755 ${S}/test-driver ${D}${PTEST_PATH} - install -m 644 ${B}/config.h ${D}${PTEST_PATH} + mkdir -p ${D}${PTEST_PATH}/build-aux + mkdir -p ${D}${PTEST_PATH}/src + install -m 755 ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ + install -m 644 ${B}/src/config.h ${D}${PTEST_PATH}/src/ sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile }
Signature · 1 line
2.29.2
PATCH 12/16 automake: update 1.16.2 - > 1.16.3
In reply to Alexander KanavinDrop automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch; upstream has fixed the issue.
---
...in-shebangs-with-modern-use-warnings.patch | 60 -------------------
.../automake/automake/python-libdir.patch | 16 ++---
...{automake_1.16.2.bb => automake_1.16.3.bb} | 18 +++---
3 files changed, 16 insertions(+), 78 deletions(-)
delete mode 100644 meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
rename meta/recipes-devtools/automake/{automake_1.16.2.bb => automake_1.16.3.bb} (61%)meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch deleted +0 -60
@@ -1,60 +0,0 @@ -From 857c843d4bcf576467b505eb05a47f3e7d32caaa Mon Sep 17 00:00:00 2001 -From: Serhii Popovych <[email protected]> -Date: Wed, 10 Feb 2016 17:07:32 +0000 -Subject: [PATCH] perl: Replace -w option in shebangs with modern "use - warnings" In some builds we might provide ac_cv_path_PERL as /usr/bin/env - perl to use newer version of the perl from users PATH rather than older from - standard system path. - -However using /usr/bin/env perl -w from shebang line isn't -possible because it translates to something like -/usr/bin/env -w perl and env complains about illegal option. - -To address this we can remove -w option from perl shebang -line and add "use warnings" statement. - -Upstream-Status: Pending -Signed-off-by: Serhii Popovych <[email protected]> -Signed-off-by: Robert Yang <[email protected]> - ---- - bin/aclocal.in | 3 ++- - bin/automake.in | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/bin/aclocal.in b/bin/aclocal.in -index 9a20325..bd185d4 100644 ---- a/bin/aclocal.in -+++ b/bin/aclocal.in -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*- - # @configure_input@ - # Copyright (C) 1996-2020 Free Software Foundation, Inc. -@@ -26,6 +26,7 @@ BEGIN - } - - use strict; -+use warnings; - - use Automake::Config; - use Automake::General; -diff --git a/bin/automake.in b/bin/automake.in -index 5ed404a..d387b8e 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # automake - create Makefile.in from Makefile.am -*- perl -*- - # @configure_input@ - # Copyright (C) 1994-2020 Free Software Foundation, Inc. -@@ -23,6 +23,7 @@ - package Automake; - - use strict; -+use warnings; - - BEGIN - {
meta/recipes-devtools/automake/automake/python-libdir.patch +8 -8
@@ -1,4 +1,4 @@ -From a80dacd5124d0713cf2c986b28d736e78dc6b0ca Mon Sep 17 00:00:00 2001 +From 61bd143910001aaf610416d7ca56c52c0b081318 Mon Sep 17 00:00:00 2001 From: Kumar Gala <[email protected]> Date: Thu, 11 Aug 2011 01:26:33 -0500 Subject: [PATCH] automake: Update for python.m4 to respect libdir
@@ -17,11 +17,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/m4/python.m4 b/m4/python.m4 -index 63c0a0e..7bbd2d2 100644 +index b2302ba..dbc6954 100644 --- a/m4/python.m4 +++ b/m4/python.m4 -@@ -94,12 +94,13 @@ AC_DEFUN([AM_PATH_PYTHON], - [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) +@@ -96,12 +96,13 @@ AC_DEFUN([AM_PATH_PYTHON], + [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`]) AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - dnl Use the values of $prefix and $exec_prefix for the corresponding
@@ -36,7 +36,7 @@ index 63c0a0e..7bbd2d2 100644 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) dnl At times (like when building shared libraries) you may want -@@ -144,14 +145,7 @@ except ImportError: +@@ -146,14 +147,7 @@ except ImportError: else am_py_prefix=$prefix fi
@@ -52,7 +52,7 @@ index 63c0a0e..7bbd2d2 100644 case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` -@@ -161,7 +155,7 @@ sys.stdout.write(sitedir)"` +@@ -163,7 +157,7 @@ sys.stdout.write(sitedir)"` case $am_py_prefix in /usr|/System*) ;; *)
@@ -61,7 +61,7 @@ index 63c0a0e..7bbd2d2 100644 ;; esac ;; -@@ -186,14 +180,7 @@ sys.stdout.write(sitedir)"` +@@ -188,14 +182,7 @@ sys.stdout.write(sitedir)"` else am_py_exec_prefix=$exec_prefix fi
@@ -77,7 +77,7 @@ index 63c0a0e..7bbd2d2 100644 case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` -@@ -203,7 +190,7 @@ sys.stdout.write(sitedir)"` +@@ -205,7 +192,7 @@ sys.stdout.write(sitedir)"` case $am_py_exec_prefix in /usr|/System*) ;; *)
meta/recipes-devtools/automake/automake_1.16.3.bb renamed from meta/recipes-devtools/automake/automake_1.16.2.bb +8 -10
@@ -19,16 +19,14 @@ RDEPENDS_${PN} += "\ RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" SRC_URI += "file://python-libdir.patch \ - file://buildtest.patch \ - file://performance.patch \ - file://new_rt_path_for_test-driver.patch \ - file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ - file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ - file://0001-build-fix-race-in-parallel-builds.patch \ - " - -SRC_URI[md5sum] = "f1a14f2ab2b0fb861a011e1d94e589e0" -SRC_URI[sha256sum] = "b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1" + file://buildtest.patch \ + file://performance.patch \ + file://new_rt_path_for_test-driver.patch \ + file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ + file://0001-build-fix-race-in-parallel-builds.patch \ + " + +SRC_URI[sha256sum] = "ce010788b51f64511a1e9bb2a1ec626037c6d0e7ede32c1c103611b9d3cba65f" PERL = "${USRBINPATH}/perl" PERL_class-native = "${USRBINPATH}/env perl"
Signature · 1 line
2.29.2
Re: [OE-core] [PATCH 12/16] automake: update 1.16.2 - > 1.16.3
here is a related failure
https://errors.yoctoproject.org/Errors/Details/574252/
Quoted 178 lines · Alexander Kanavin
Drop automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch; upstream has fixed the issue.
Signed-off-by Alexander Kanavin <[email protected]>--- ...in-shebangs-with-modern-use-warnings.patch | 60 ------------------- .../automake/automake/python-libdir.patch | 16 ++--- ...{automake_1.16.2.bb => automake_1.16.3.bb} | 18 +++--- 3 files changed, 16 insertions(+), 78 deletions(-) delete mode 100644 meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch rename meta/recipes-devtools/automake/{automake_1.16.2.bb => automake_1.16.3.bb} (61%)meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch deleted +0
-60@@ -1,60 +0,0 @@ -From 857c843d4bcf576467b505eb05a47f3e7d32caaa Mon Sep 17 00:00:00 2001 -From: Serhii Popovych <[email protected]> -Date: Wed, 10 Feb 2016 17:07:32 +0000 -Subject: [PATCH] perl: Replace -w option in shebangs with modern "use - warnings" In some builds we might provide ac_cv_path_PERL as /usr/bin/env - perl to use newer version of the perl from users PATH rather than older from - standard system path. - -However using /usr/bin/env perl -w from shebang line isn't -possible because it translates to something like -/usr/bin/env -w perl and env complains about illegal option. - -To address this we can remove -w option from perl shebang -line and add "use warnings" statement. - -Upstream-Status: Pending -Signed-off-by: Serhii Popovych <[email protected]> -Signed-off-by: Robert Yang <[email protected]> - ---- - bin/aclocal.in | 3 ++- - bin/automake.in | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/bin/aclocal.in b/bin/aclocal.in -index 9a20325..bd185d4 100644 ---- a/bin/aclocal.in -+++ b/bin/aclocal.in -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*- - # @configure_input@ - # Copyright (C) 1996-2020 Free Software Foundation, Inc. -@@ -26,6 +26,7 @@ BEGIN - } - - use strict; -+use warnings; - - use Automake::Config; - use Automake::General; -diff --git a/bin/automake.in b/bin/automake.in -index 5ed404a..d387b8e 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # automake - create Makefile.in from Makefile.am -*- perl -*- - # @configure_input@ - # Copyright (C) 1994-2020 Free Software Foundation, Inc. -@@ -23,6 +23,7 @@ - package Automake; - - use strict; -+use warnings; - - BEGIN - {meta/recipes-devtools/automake/automake/python-libdir.patch +8
-8@@ -1,4 +1,4 @@ -From a80dacd5124d0713cf2c986b28d736e78dc6b0ca Mon Sep 17 00:00:00 2001 +From 61bd143910001aaf610416d7ca56c52c0b081318 Mon Sep 17 00:00:00 2001 From: Kumar Gala <[email protected]> Date: Thu, 11 Aug 2011 01:26:33 -0500 Subject: [PATCH] automake: Update for python.m4 to respect libdir@@ -17,11 +17,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/m4/python.m4 b/m4/python.m4 -index 63c0a0e..7bbd2d2 100644 +index b2302ba..dbc6954 100644 --- a/m4/python.m4 +++ b/m4/python.m4 -@@ -94,12 +94,13 @@ AC_DEFUN([AM_PATH_PYTHON], - [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) +@@ -96,12 +96,13 @@ AC_DEFUN([AM_PATH_PYTHON], + [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`]) AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - dnl Use the values of $prefix and $exec_prefix for the corresponding@@ -36,7 +36,7 @@ index 63c0a0e..7bbd2d2 100644 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) dnl At times (like when building shared libraries) you may want -@@ -144,14 +145,7 @@ except ImportError: +@@ -146,14 +147,7 @@ except ImportError: else am_py_prefix=$prefix fi@@ -52,7 +52,7 @@ index 63c0a0e..7bbd2d2 100644 case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` -@@ -161,7 +155,7 @@ sys.stdout.write(sitedir)"` +@@ -163,7 +157,7 @@ sys.stdout.write(sitedir)"` case $am_py_prefix in /usr|/System*) ;; *)@@ -61,7 +61,7 @@ index 63c0a0e..7bbd2d2 100644 ;; esac ;; -@@ -186,14 +180,7 @@ sys.stdout.write(sitedir)"` +@@ -188,14 +182,7 @@ sys.stdout.write(sitedir)"` else am_py_exec_prefix=$exec_prefix fi@@ -77,7 +77,7 @@ index 63c0a0e..7bbd2d2 100644 case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` -@@ -203,7 +190,7 @@ sys.stdout.write(sitedir)"` +@@ -205,7 +192,7 @@ sys.stdout.write(sitedir)"` case $am_py_exec_prefix in /usr|/System*) ;; *)meta/recipes-devtools/automake/automake_1.16.3.bb renamed from meta/recipes-devtools/automake/automake_1.16.2.bb +8
-11@@ -19,16 +19,14 @@ RDEPENDS_${PN} += "\ RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" SRC_URI += "file://python-libdir.patch \ - file://buildtest.patch \ - file://performance.patch \ - file://new_rt_path_for_test-driver.patch \ - file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ - file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ - file://0001-build-fix-race-in-parallel-builds.patch \ - " - -SRC_URI[md5sum] = "f1a14f2ab2b0fb861a011e1d94e589e0" -SRC_URI[sha256sum] = "b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1" + file://buildtest.patch \ + file://performance.patch \ + file://new_rt_path_for_test-driver.patch \ + file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ + file://0001-build-fix-race-in-parallel-builds.patch \ + " + +SRC_URI[sha256sum] = "ce010788b51f64511a1e9bb2a1ec626037c6d0e7ede32c1c103611b9d3cba65f" PERL = "${USRBINPATH}/perl" PERL_class-native = "${USRBINPATH}/env perl" --2.29.2
Re: [OE-core] [PATCH 12/16] automake: update 1.16.2 - > 1.16.3
Quoted 3 lines · Khem Raj
here is a related failure
https://errors.yoctoproject.org/Errors/Details/574252/
FWIW, I have posted a fix for gaudio makery for this to oe-devel, so we should be good with pulling this update in core from my POV.
Quoted 180 lines
Quoted 178 lines · Alexander Kanavin
Drop automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch; upstream has fixed the issue.
Signed-off-by Alexander Kanavin <[email protected]>--- ...in-shebangs-with-modern-use-warnings.patch | 60 ------------------- .../automake/automake/python-libdir.patch | 16 ++--- ...{automake_1.16.2.bb => automake_1.16.3.bb} | 18 +++--- 3 files changed, 16 insertions(+), 78 deletions(-)delete mode 100644
meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patchrename meta/recipes-devtools/automake/{automake_1.16.2.bb => automake_1.16.3.bb} (61%)meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch deleted +0
-60@@ -1,60 +0,0 @@ -From 857c843d4bcf576467b505eb05a47f3e7d32caaa Mon Sep 17 00:00:00 2001 -From: Serhii Popovych <[email protected]> -Date: Wed, 10 Feb 2016 17:07:32 +0000 -Subject: [PATCH] perl: Replace -w option in shebangs with modern "use - warnings" In some builds we might provide ac_cv_path_PERL as /usr/bin/env - perl to use newer version of the perl from users PATH rather than older from - standard system path. - -However using /usr/bin/env perl -w from shebang line isn't -possible because it translates to something like -/usr/bin/env -w perl and env complains about illegal option. - -To address this we can remove -w option from perl shebang -line and add "use warnings" statement. - -Upstream-Status: Pending -Signed-off-by: Serhii Popovych <[email protected]> -Signed-off-by: Robert Yang <[email protected]> - ---- - bin/aclocal.in | 3 ++- - bin/automake.in | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/bin/aclocal.in b/bin/aclocal.in -index 9a20325..bd185d4 100644 ---- a/bin/aclocal.in -+++ b/bin/aclocal.in -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*- - # @configure_input@ - # Copyright (C) 1996-2020 Free Software Foundation, Inc. -@@ -26,6 +26,7 @@ BEGIN - } - - use strict; -+use warnings; - - use Automake::Config; - use Automake::General; -diff --git a/bin/automake.in b/bin/automake.in -index 5ed404a..d387b8e 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # automake - create Makefile.in from Makefile.am -*- perl -*- - # @configure_input@ - # Copyright (C) 1994-2020 Free Software Foundation, Inc. -@@ -23,6 +23,7 @@ - package Automake; - - use strict; -+use warnings; - - BEGIN - {meta/recipes-devtools/automake/automake/python-libdir.patch +8
-8@@ -1,4 +1,4 @@ -From a80dacd5124d0713cf2c986b28d736e78dc6b0ca Mon Sep 17 00:00:00 2001 +From 61bd143910001aaf610416d7ca56c52c0b081318 Mon Sep 17 00:00:00 2001 From: Kumar Gala <[email protected]> Date: Thu, 11 Aug 2011 01:26:33 -0500 Subject: [PATCH] automake: Update for python.m4 to respect libdir@@ -17,11 +17,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/m4/python.m4 b/m4/python.m4 -index 63c0a0e..7bbd2d2 100644 +index b2302ba..dbc6954 100644 --- a/m4/python.m4 +++ b/m4/python.m4 -@@ -94,12 +94,13 @@ AC_DEFUN([AM_PATH_PYTHON], - [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) +@@ -96,12 +96,13 @@ AC_DEFUN([AM_PATH_PYTHON], + [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`]) AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - dnl Use the values of $prefix and $exec_prefix for the corresponding@@ -36,7 +36,7 @@ index 63c0a0e..7bbd2d2 100644 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) dnl At times (like when building shared libraries) you may want -@@ -144,14 +145,7 @@ except ImportError: +@@ -146,14 +147,7 @@ except ImportError: else am_py_prefix=$prefix fi@@ -52,7 +52,7 @@ index 63c0a0e..7bbd2d2 100644 case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` -@@ -161,7 +155,7 @@ sys.stdout.write(sitedir)"` +@@ -163,7 +157,7 @@ sys.stdout.write(sitedir)"` case $am_py_prefix in /usr|/System*) ;; *)@@ -61,7 +61,7 @@ index 63c0a0e..7bbd2d2 100644 ;; esac ;; -@@ -186,14 +180,7 @@ sys.stdout.write(sitedir)"` +@@ -188,14 +182,7 @@ sys.stdout.write(sitedir)"` else am_py_exec_prefix=$exec_prefix fi@@ -77,7 +77,7 @@ index 63c0a0e..7bbd2d2 100644 case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` -@@ -203,7 +190,7 @@ sys.stdout.write(sitedir)"` +@@ -205,7 +192,7 @@ sys.stdout.write(sitedir)"` case $am_py_exec_prefix in /usr|/System*) ;; *)meta/recipes-devtools/automake/automake_1.16.3.bb renamed from meta/recipes-devtools/automake/automake_1.16.2.bb +8
-11@@ -19,16 +19,14 @@ RDEPENDS_${PN} += "\ RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" SRC_URI += "file://python-libdir.patch \ - file://buildtest.patch \ - file://performance.patch \ - file://new_rt_path_for_test-driver.patch \ - file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ - file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ - file://0001-build-fix-race-in-parallel-builds.patch \ - " - -SRC_URI[md5sum] = "f1a14f2ab2b0fb861a011e1d94e589e0" -SRC_URI[sha256sum] = "b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1" + file://buildtest.patch \ + file://performance.patch \ + file://new_rt_path_for_test-driver.patch \ + file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ + file://0001-build-fix-race-in-parallel-builds.patch \ + " + +SRC_URI[sha256sum] = "ce010788b51f64511a1e9bb2a1ec626037c6d0e7ede32c1c103611b9d3cba65f" PERL = "${USRBINPATH}/perl" PERL_class-native = "${USRBINPATH}/env perl" --2.29.2
PATCH 13/16 xxhash: import from meta-oe
In reply to Alexander KanavinThis is needed for newer versions of apt.
--- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-support/xxhash/xxhash_0.8.0.bb | 23 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-support/xxhash/xxhash_0.8.0.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -799,6 +799,7 @@ RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-xwayland = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <[email protected]>" +RECIPE_MAINTAINER_pn-xxhash = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <[email protected]>"
meta/recipes-support/xxhash/xxhash_0.8.0.bb new file +23 -0
@@ -0,0 +1,23 @@ +SUMMARY = "Extremely fast non-cryptographic hash algorithm" +DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ +working at speeds close to RAM limits." +HOMEPAGE = "http://www.xxhash.com/" +LICENSE = "BSD-2-Clause & GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb" + +SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=git" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +SRCREV = "94e5f23e736f2bb67ebdf90727353e65344f9fc0" + +S = "${WORKDIR}/git" + +do_compile () { + oe_runmake all +} + +do_install () { + oe_runmake DESTDIR=${D} install +} + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.29.2
PATCH 14/16 apt: update 1.8.2.2 -> 2.2.2
In reply to Alexander KanavinDrop 0001-test-libapt-do-not-use-gtest-from-the-host.patch (replaced by WITH_TESTS option).
Drop 0001-Do-not-configure-packages-on-installation.patch (no longer necessary).
Adjust build dependencies.
---
...e-documentation-directory-altogether.patch | 8 ++--
...t-configure-packages-on-installation.patch | 48 -------------------
...-init-tables-from-dpkg-configuration.patch | 4 +-
...n-dpkg-configure-a-at-the-end-of-our.patch | 10 ++--
...ibapt-do-not-use-gtest-from-the-host.patch | 40 ----------------
.../apt/{apt_1.8.2.2.bb => apt_2.2.2.bb} | 9 ++--
6 files changed, 14 insertions(+), 105 deletions(-)
delete mode 100644 meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch
delete mode 100644 meta/recipes-devtools/apt/apt/0001-test-libapt-do-not-use-gtest-from-the-host.patch
rename meta/recipes-devtools/apt/{apt_1.8.2.2.bb => apt_2.2.2.bb} (89%)meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch +4 -4
@@ -1,4 +1,4 @@ -From cd164b353ba7958d51b2f33f4079fb9787c983e2 Mon Sep 17 00:00:00 2001 +From f629d1c3fcfb560ed24efc3e73d4e4999b1eab33 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 10 May 2019 14:16:47 +0200 Subject: [PATCH] Disable documentation directory altogether
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83334ba..2cd4f8e 100644 +index 9745c13..7cfc9ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -232,7 +232,7 @@ add_subdirectory(apt-private) - add_subdirectory(apt-inst) +@@ -239,7 +239,7 @@ add_subdirectory(apt-pkg) + add_subdirectory(apt-private) add_subdirectory(cmdline) add_subdirectory(completions) -add_subdirectory(doc)
meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch deleted +0 -48
48 lines not on this page · raw message
meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch +2 -2
@@ -1,4 +1,4 @@ -From bf45c314867e5fb12141803fba06f3e45679d628 Mon Sep 17 00:00:00 2001 +From 382f8381ef8baf754057e376a6d9bf840ca6d543 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 10 May 2019 16:47:38 +0200 Subject: [PATCH] Do not init tables from dpkg configuration
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc -index a619368..6e5a6cf 100644 +index b9d9b15..1725c59 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -281,8 +281,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +5 -5
@@ -1,4 +1,4 @@ -From 34700bebc52659e7e3eecd252f65bd36e669eee8 Mon Sep 17 00:00:00 2001 +From a603b3281f3f60a87531c8cec4843f970170d409 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 21 May 2020 20:13:25 +0000 Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our
@@ -20,10 +20,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc -index ffa880d..5875e86 100644 +index 46a6dee..8617a9e 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc -@@ -1215,12 +1215,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() +@@ -1211,12 +1211,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() } } }
@@ -35,8 +35,8 @@ index ffa880d..5875e86 100644 - ++PackagesTotal; } /*}}}*/ - bool pkgDPkgPM::Go(int StatusFd) /*{{{*/ -@@ -1716,7 +1710,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) + void pkgDPkgPM::StartPtyMagic() /*{{{*/ +@@ -1710,7 +1704,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) // support subpressing of triggers processing for special // cases like d-i that runs the triggers handling manually
meta/recipes-devtools/apt/apt/0001-test-libapt-do-not-use-gtest-from-the-host.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 28e389a0d1275e7693df84a7d4a58b28364be1a9 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Thu, 22 Oct 2020 17:33:38 +0200 -Subject: [PATCH] test/libapt: do not use gtest from the host - -This really does not work when cross-compiling. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - test/libapt/CMakeLists.txt | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/test/libapt/CMakeLists.txt b/test/libapt/CMakeLists.txt -index 035ff07..280b83c 100644 ---- a/test/libapt/CMakeLists.txt -+++ b/test/libapt/CMakeLists.txt -@@ -6,22 +6,6 @@ find_path(GTEST_ROOT src/gtest.cc - find_package(GTest) - set(GTEST_DEPENDENCIES) - --if(NOT GTEST_FOUND AND EXISTS ${GTEST_ROOT}) -- include(ExternalProject) -- ExternalProject_Add(gtest PREFIX ./gtest -- SOURCE_DIR ${GTEST_ROOT} -- INSTALL_COMMAND true) -- -- link_directories(${CMAKE_CURRENT_BINARY_DIR}/gtest/src/gtest-build) -- -- set(GTEST_LIBRARIES "-lgtest") -- set(GTEST_DEPENDENCIES "gtest") -- set(GTEST_FOUND TRUE) -- find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS ${GTEST_ROOT}/include) -- -- message(STATUS "Found GTest at ${GTEST_ROOT}, headers at ${GTEST_INCLUDE_DIRS}") --endif() -- - if(GTEST_FOUND) - # gtest produces some warnings with the set of warnings we activate, - # so disable the offending warnings while compiling tests for now
meta/recipes-devtools/apt/apt_2.2.2.bb renamed from meta/recipes-devtools/apt/apt_1.8.2.2.bb +3 -6
@@ -10,22 +10,19 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-Disable-documentation-directory-altogether.patch \ file://0001-Fix-musl-build.patch \ file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \ - file://0001-test-libapt-do-not-use-gtest-from-the-host.patch \ " SRC_URI_append_class-native = " \ file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ - file://0001-Do-not-configure-packages-on-installation.patch \ " SRC_URI_append_class-nativesdk = " \ file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ - file://0001-Do-not-configure-packages-on-installation.patch \ " -SRC_URI[sha256sum] = "f5030de22a5cc80db6fe0d42373b5df25d7dc56e94d9155f2eaa80dbd65e82fa" +SRC_URI[sha256sum] = "c5449a4c2126a12497a9949cd10209926005d329f6ce7942a3781fa2fcf50487" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale
@@ -40,12 +37,12 @@ USERADD_PARAM_${PN} = "--system --home /nonexistent --no-create-home _apt" BBCLASSEXTEND = "native nativesdk" -DEPENDS += "virtual/libiconv virtual/libintl db gnutls lz4 zlib bzip2 xz" +DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg \ -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ - -DCMAKE_DISABLE_FIND_PACKAGE_Zstd=True \ + -DWITH_TESTS=False \ " do_configure_prepend () {
Signature · 1 line
2.29.2
PATCH 15/16 apt: mark as incompatible with musl
In reply to Alexander KanavinThere are multiple failures with the new version; unless someone steps up to fix them, let's exclude for now.
--- meta/recipes-devtools/apt/apt_2.2.2.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/apt/apt_2.2.2.bb +2 -0
@@ -39,6 +39,8 @@ BBCLASSEXTEND = "native nativesdk" DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" +COMPATIBLE_HOST_libc-musl = 'null' + EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg \ -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \
Signature · 1 line
2.29.2
Re: [OE-core] [PATCH 15/16] apt: mark as incompatible with musl
Quoted 1 line · Alexander Kanavin
There are multiple failures with the new version; unless
Can you share details of failures ?
it would be better to not regress whats working
Quoted 25 lines
someone steps up to fix them, let's exclude for now.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/apt/apt_2.2.2.bb | 2 ++ 1 file changed, 2 insertions(+)meta/recipes-devtools/apt/apt_2.2.2.bb +2
-0@@ -39,6 +39,8 @@ BBCLASSEXTEND = "native nativesdk" DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" +COMPATIBLE_HOST_libc-musl = 'null' + EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg \ -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \
Re: [OE-core] [PATCH 15/16] apt: mark as incompatible with musl
Quoted 8 lines · Khem Raj
Quoted 1 line · Alexander Kanavin
There are multiple failures with the new version; unless
Can you share details of failures ?
it would be better to not regress whats working
For example, here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/3213/steps/11/logs/stdio
home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/srvrec.cc:
In function 'bool GetSrvRecords(std::string, std::vector<SrvRec>&)':/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/srvrec.cc:67:8:
error: 'res_ninit' was not declared in this scope; did you mean
'res_init'?
67 | if (res_ninit(&res) != 0)
| ^~~~~~~~~
| res_init/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/srvrec.cc:71:38:
error: 'res_nclose' was not declared in this scope
71 | std::shared_ptr<void> guard(&res, res_nclose);
| ^~~~~~~~~~/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/srvrec.cc:73:17:
error: 'res_nquery' was not declared in this scope; did you mean
'res_query'?
73 | answer_len = res_nquery(&res, name.c_str(), C_IN, T_SRV,
answer, sizeof(answer));
| ^~~~~~~~~~
| res_query/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/recipe-sysroot/usr/include/locale.h:53:7:
error: declaration of 'char* setlocale(int, const char*)' has a
different exception specifier
53 | char *setlocale (int, const char *);
| ^~~~~~~~~In file included from /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/netrc.cc:14:include/apti18n.h:25:25: note: from previous declaration 'char*setlocale(int, const char*) throw ()'
25 | extern "C" inline char* setlocale(int, const char*) throw() {
return nullptr; }
| ^~~~~~~~~
Alex
Re: [OE-core] [PATCH 15/16] apt: mark as incompatible with musl
Quoted 14 lines · Alexander Kanavin
On Fri, 19 Mar 2021 at 17:58, Khem Raj <[email protected] <mailto:[email protected]>> wrote:
On 3/19/21 1:44 AM, Alexander Kanavin wrote:
> There are multiple failures with the new version; unlessCan you share details of failures ?
it would be better to not regress whats workingFor example, here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/3213/steps/11/logs/stdio <https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/3213/steps/11/logs/stdio>
Quoted 12 lines
home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/srvrec.cc: In function 'bool
GetSrvRecords(std::string, std::vector<SrvRec>&)':/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/srvrec.cc:67:8: error: 'res_ninit' was not declared in this scope; did you mean 'res_init'? 67 | if (res_ninit(&res)!= 0)
| ^~~~~~~~~
|res_init/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/srvrec.cc:71:38: error: 'res_nclose' was not declared in this scope 71 | std::shared_ptr<void>guard(&res, res_nclose);
| ^~~~~~~~~~/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/srvrec.cc:73:17: error: 'res_nquery' was not declared in this scope; did you mean 'res_query'? 73 |answer_len=res_nquery(&res, name.c_str(), C_IN, T_SRV, answer, sizeof(answer));
| ^~~~~~~~~~
|res_query
this is because apt started to use newer APIs for resolver but then disregarded older APIs, I have sent a patch to actually user newer APIs but have fallback to older APIs also available.
Quoted 8 lines
/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/recipe-sysroot/usr/include/locale.h:53:7: error: declaration of 'char*setlocale(int, const char*)' has a different exception specifier 53 | char *setlocale (int, const char *);
| ^~~~~~~~~
In file included from/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/apt/2.2.2-r0/apt-2.2.2/apt-pkg/contrib/netrc.cc:14:include/apti18n.h:25:25: note: from previous declaration 'char*setlocale(int, const char*)throw ()'
25 | extern "C" inline char*setlocale(int, const char*)throw(){ return nullptr; }
| ^~~~~~~~~
yeah we should not disable NLS but remove PO generation. I have sent a patch for this too.
Quoted 3 lines
Alex
PATCH 16/16 libxcrypt: fix sporadic failures in nativesdk-libxcrypt-compat
In reply to Alexander Kanavin--- ...e.ac-do-not-use-compute-symver-floor.patch | 32 +++++++++++++++++++ meta/recipes-core/libxcrypt/libxcrypt.inc | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/libxcrypt/files/0001-configure.ac-do-not-use-compute-symver-floor.patch
meta/recipes-core/libxcrypt/files/0001-configure.ac-do-not-use-compute-symver-floor.patch new file +32 -0
@@ -0,0 +1,32 @@ +From b28bb856ccebe8fded51d11362bf5920699eed59 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 18 Mar 2021 10:52:13 +0000 +Subject: [PATCH] configure.ac: do not use compute-symver-floor + +This script (newly introduced in 4.4.18) sporadically fails, without +failing configure(), which has been reported at +https://github.com/besser82/libxcrypt/issues/123 + +Upstream-Status: Inappropriate +Signed-off-by: Alexander Kanavin <[email protected]> +--- + configure.ac | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 45b91b4..f3ba945 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -426,11 +426,7 @@ if test x$enable_shared != xyes; then enable_obsolete_api=0; fi + # need to be binary backward compatible with. + if test $enable_obsolete_api = 1; then + AC_MSG_CHECKING([minimum symbol version to use for compatibility symbols]) +- SYMVER_FLOOR=$( +- $PERL ${srcdir}/build-aux/compute-symver-floor \ +- ${srcdir}/lib/libcrypt.minver $host_os $host_cpu \ +- 2>&AS_MESSAGE_LOG_FD +- ) ++ SYMVER_FLOOR=GLIBC_2.0 + AC_MSG_RESULT([$SYMVER_FLOOR]) + case "$SYMVER_FLOOR" in + ERROR)
meta/recipes-core/libxcrypt/libxcrypt.inc +3 -1
@@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=bd5d9777dfe7076c4f2928f12fed226a \ inherit autotools pkgconfig -SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \ + file://0001-configure.ac-do-not-use-compute-symver-floor.patch \ + " SRCREV = "94d84f92ca123d851586016c4678eb1f21c19029" SRCBRANCH ?= "develop"
Signature · 1 line
2.29.2