systemd-boot: upgrade 246.2 -> 246.6
PATCH 1/33 systemd-boot: upgrade 246.2 -> 246.6
As systemd-boot shares SRCREV with the main systemd recipe, the version should be kept in sync with it.
---
.../systemd/{systemd-boot_246.2.bb => systemd-boot_246.6.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-core/systemd/{systemd-boot_246.2.bb => systemd-boot_246.6.bb} (100%)meta/recipes-core/systemd/systemd-boot_246.6.bb renamed from meta/recipes-core/systemd/systemd-boot_246.2.bb +0 -0
Signature · 1 line
2.29.0
PATCH 2/33 glib-2.0: upgrade 2.64.5 -> 2.66.1
---
...-correctly-when-building-with-mingw3.patch | 20 +++++++++----------
.../glib-2.0/glib-2.0/relocate-modules.patch | 2 +-
...{glib-2.0_2.64.5.bb => glib-2.0_2.66.1.bb} | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.64.5.bb => glib-2.0_2.66.1.bb} (95%)meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +10 -10
@@ -1,4 +1,4 @@ -From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001 +From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index dab65d2..e8bb2ee 100644 +index 3a19c82..b762835 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -12,7 +12,7 @@ test_c_args = [
@@ -26,7 +26,7 @@ index dab65d2..e8bb2ee 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -132,7 +132,7 @@ else +@@ -133,7 +133,7 @@ else endif # Test programs buildable on UNIX only
@@ -35,7 +35,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += { 'file' : {}, 'gdbus-peer' : { -@@ -384,7 +384,7 @@ if host_machine.system() != 'windows' +@@ -385,7 +385,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += {'win32-streams' : {}} endif -@@ -454,7 +454,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif
@@ -54,10 +54,10 @@ index dab65d2..e8bb2ee 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 3dedafc..94605e6 100644 +index 6eb23e8..36eb919 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -134,7 +134,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif
@@ -67,7 +67,7 @@ index 3dedafc..94605e6 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index e1b4b79..afb6eaa 100644 +index 47f3a5c..7ea7ad1 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,9 @@ else
@@ -78,8 +78,8 @@ index e1b4b79..afb6eaa 100644 + host_system = 'windows' +endif - glib_version = meson.project_version() - glib_api_version = '2.0' + if host_system == 'darwin' + ios_test_code = '''#include <TargetConditionals.h> diff --git a/tests/meson.build b/tests/meson.build index 6741f8f..12fdc90 100644 --- a/tests/meson.build
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +1 -1
@@ -1,4 +1,4 @@ -From 2a715765c6ceb2e8b4cc42e060aee75016111d1a Mon Sep 17 00:00:00 2001 +From 75c0423e1dc34fa20de70bc9932625fd0de4a912 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.64.5.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "9cbd5bd2715ead1c28d53c46f7b7b6ff6166f5887b772c1a9e3bf2910cfecc11" +SRC_URI[sha256sum] = "a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON.
Signature · 1 line
2.29.0
PATCH 3/33 cmake: update 3.18.2 -> 3.18.4
In reply to Alexander Kanavin---
.../cmake/{cmake-native_3.18.2.bb => cmake-native_3.18.4.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 2 +-
.../recipes-devtools/cmake/{cmake_3.18.2.bb => cmake_3.18.4.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.18.2.bb => cmake-native_3.18.4.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.18.2.bb => cmake_3.18.4.bb} (100%)meta/recipes-devtools/cmake/cmake-native_3.18.4.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.18.2.bb +0 -0
meta/recipes-devtools/cmake/cmake.inc +1 -1
@@ -22,7 +22,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e" +SRC_URI[sha256sum] = "597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/cmake/cmake_3.18.4.bb renamed from meta/recipes-devtools/cmake/cmake_3.18.2.bb +0 -0
Signature · 1 line
2.29.0
PATCH 4/33 python3-pygobject: upgrade 3.36.1 -> 3.38.0
In reply to Alexander Kanavin---
...thon3-pygobject_3.36.1.bb => python3-pygobject_3.38.0.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python3-pygobject_3.36.1.bb => python3-pygobject_3.38.0.bb} (78%)meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +2 -3
@@ -14,8 +14,7 @@ SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ file://0001-Do-not-build-tests.patch \ " -SRC_URI[md5sum] = "ebfebc4533856572281add29f08412bf" -SRC_URI[sha256sum] = "d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f" +SRC_URI[sha256sum] = "0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5" UNKNOWN_CONFIGURE_WHITELIST = "introspection"
@@ -27,7 +26,7 @@ RDEPENDS_${PN} += "python3-pkgutil" # python3-pycairo is checked on configuration -> DEPENDS # we don't link against python3-pycairo -> RDEPENDS -PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python3-pycairo, python3-pycairo" +PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairo python3-pycairo, python3-pycairo" BBCLASSEXTEND = "native" PACKAGECONFIG_class-native = ""
Signature · 1 line
2.29.0
PATCH 5/33 libdazzle: upgrade 3.36.0 -> 3.38.0
In reply to Alexander Kanavin---
.../libdazzle/{libdazzle_3.36.0.bb => libdazzle_3.38.0.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-gnome/libdazzle/{libdazzle_3.36.0.bb => libdazzle_3.38.0.bb} (82%)meta/recipes-gnome/libdazzle/libdazzle_3.38.0.bb renamed from meta/recipes-gnome/libdazzle/libdazzle_3.36.0.bb +1 -2
@@ -12,8 +12,7 @@ inherit gnomebase upstream-version-is-even vala features_check gobject-introspec DEPENDS = "glib-2.0-native glib-2.0 gtk+3" -SRC_URI[archive.md5sum] = "154be45a6aac020e7d59f477bd7cafcf" -SRC_URI[archive.sha256sum] = "82b31bbf550fc62970c78bf7f9d55e5fae5b8ea13b24fe2d13c8c6039409d958" +SRC_URI[archive.sha256sum] = "e18af28217943bcec106585298a91ec3da48aa3ad62fd0992f23f0c70cd1678f" GIR_MESON_OPTION = 'with_introspection'
Signature · 1 line
2.29.0
PATCH 6/33 gobject-introspection: upgrade 1.64.1 -> 1.66.1
In reply to Alexander KanavinAdd a patch to avoid build errors if building g-i data is disabled.
---
...pository-directory-for-native-builds.patch | 8 ++---
...ency-for-g-ir-compiler-for-building-.patch | 33 -------------------
...ude-girepo_dep-if-introspection-data.patch | 25 ++++++++++++++
...4.1.bb => gobject-introspection_1.66.1.bb} | 7 ++--
4 files changed, 32 insertions(+), 41 deletions(-)
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch
create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.64.1.bb => gobject-introspection_1.66.1.bb} (97%)meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +4 -4
@@ -1,4 +1,4 @@ -From 8dfb44450ca9fffc15977e95eadcb7054ab60a9a Mon Sep 17 00:00:00 2001 +From 41c3ee549787333a073a3ce6303efef625c74dce Mon Sep 17 00:00:00 2001 From: Sascha Silbe <[email protected]> Date: Fri, 8 Jun 2018 13:55:10 +0200 Subject: [PATCH] Relocate the repository directory for native builds
@@ -21,7 +21,7 @@ Signed-off-by: Sascha Silbe <[email protected]> 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/girepository/girepository.c b/girepository/girepository.c -index b7948d6..39a2586 100644 +index 7d03485..20f4813 100644 --- a/girepository/girepository.c +++ b/girepository/girepository.c @@ -21,6 +21,8 @@
@@ -62,10 +62,10 @@ index b7948d6..39a2586 100644 typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); diff --git a/girepository/meson.build b/girepository/meson.build -index 204659f..3e61d31 100644 +index c8ef6aa..b85ff7f 100644 --- a/girepository/meson.build +++ b/girepository/meson.build -@@ -44,7 +44,7 @@ girepo_internals_lib = static_library('girepository-internals', +@@ -45,7 +45,7 @@ girepo_internals_lib = static_library('girepository-internals', ], c_args: gi_hidden_visibility_cflags + custom_c_args, include_directories : configinc,
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 17 Jun 2020 11:43:16 +0200 -Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs - -meson inserts the dependency if the compiler is used directly, but -fails to do so if the compiler is run through a wrapper. This leads -to build race errors between building the compiler and using it. - -Fix provided by Quentin Schulz <[email protected]> - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - gir/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gir/meson.build b/gir/meson.build -index b37fdb81..557e5517 100644 ---- a/gir/meson.build -+++ b/gir/meson.build -@@ -448,7 +448,7 @@ foreach gir : gir_files - typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), - input: gir, - output: '@[email protected]', -- depends: [gobject_gir, ], -+ depends: [gobject_gir, gircompiler, ], - command: gircompiler_command, - install: true, - install_dir: typelibdir, --- -2.27.0 -
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch new file +25 -0
@@ -0,0 +1,25 @@ +From ef5446af0ddad6a341b47957097ac40c6cb5e6d3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 20 Oct 2020 22:40:14 +0200 +Subject: [PATCH] meson.build: exclude girepo_dep if introspection data is + disabled + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/248] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 14af2b1..a3c27c3 100644 +--- a/meson.build ++++ b/meson.build +@@ -283,7 +283,7 @@ pkg.generate( + # FIXME: meson.override_dependency() and declare_dependency()'s variable arguments + # are new in Meson 0.54.0, older versions of Meson won't be able to use g-i as + # subproject anyway +-if meson.version().version_compare('>=0.54.0') ++if meson.version().version_compare('>=0.54.0') and get_option('build_introspection_data') == true + girepo_dep = declare_dependency( + sources: typelibs, + dependencies: girepo_dep,
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb +3 -4
@@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ - file://0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch \ + file://0001-meson.build-exclude-girepo_dep-if-introspection-data.patch \ " -SRC_URI[md5sum] = "3419dfd086efcf83768e0579ab6abd2b" -SRC_URI[sha256sum] = "80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7" +SRC_URI[sha256sum] = "dd44a55ee5f426ea22b6b89624708f9e8d53f5cc94e5485c15c87cb30e06161d" SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
@@ -48,7 +47,7 @@ PACKAGECONFIG[doctool] = "-Ddoctool=enabled,-Ddoctool=disabled,python3-mako," # Configure target build to use native tools of itself and to use a qemu wrapper # and optionally to generate introspection data EXTRA_OEMESON_class-target = " \ - -Dgi_cross_use_host_gi=true \ + -Dgi_cross_use_prebuilt_gi=true \ -Dgi_cross_binary_wrapper=${B}/g-ir-scanner-qemuwrapper \ -Dgi_cross_ldd_wrapper=${B}/g-ir-scanner-lddwrapper \ -Dgi_cross_pkgconfig_sysroot_path=${PKG_CONFIG_SYSROOT_DIR} \
Signature · 1 line
2.29.0
PATCH 7/33 json-glib: upgrade 1.4.4 -> 1.6.0
In reply to Alexander Kanavin---
...o-instead-of-cast-to-convert-pointer.patch | 33 -------------------
...{json-glib_1.4.4.bb => json-glib_1.6.0.bb} | 14 ++++----
2 files changed, 8 insertions(+), 39 deletions(-)
delete mode 100644 meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch
rename meta/recipes-gnome/json-glib/{json-glib_1.4.4.bb => json-glib_1.6.0.bb} (78%)meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From d60fcd5bd5c2675e4342775b910a2ea48ec0eccb Mon Sep 17 00:00:00 2001 -From: Dimitry Andric <[email protected]> -Date: Wed, 19 Aug 2020 03:35:16 +0000 -Subject: [PATCH] scanner: use macro instead of cast to convert pointer to integer - -Clang 11 build failed due to a new warning (part of -Werror=pointer-to-int-cast): -../json-glib/json-scanner.c:928:13: error: cast to smaller integer type 'GTokenType' from 'gpointer' (aka 'void *') [-Werror,-Wvoid-pointer-to-enum-cast] - *token_p = (GTokenType) value_p->v_symbol; - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/json-glib/-/commit/8c5fabe962b7337066dac7a697d23fce257a5d64] -Signed-off-by: Jan Beich <[email protected]> -Signed-off-by: Khem Raj <[email protected]> ---- - json-glib/json-scanner.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c -index 0c9919f..59dd29c 100644 ---- a/json-glib/json-scanner.c -+++ b/json-glib/json-scanner.c -@@ -925,7 +925,7 @@ json_scanner_get_token_i (JsonScanner *scanner, - - case G_TOKEN_SYMBOL: - if (scanner->config->symbol_2_token) -- *token_p = (GTokenType) value_p->v_symbol; -+ *token_p = GPOINTER_TO_INT (value_p->v_symbol); - break; - - case G_TOKEN_BINARY: --- -2.28.0 -
meta/recipes-gnome/json-glib/json-glib_1.6.0.bb renamed from meta/recipes-gnome/json-glib/json-glib_1.4.4.bb +8 -6
@@ -13,12 +13,14 @@ DEPENDS = "glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages upstream-version-is-even - -SRC_URI += "file://run-ptest \ - file://0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch \ -" -SRC_URI[archive.md5sum] = "4d4bb9837f6d31e32d0ce658ae135f68" -SRC_URI[archive.sha256sum] = "720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "gtk_doc" +GTKDOC_MESON_ENABLE_FLAG = 'enabled' +GTKDOC_MESON_DISABLE_FLAG = 'disabled' + +SRC_URI += " file://run-ptest" +SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native"
Signature · 1 line
2.29.0
PATCH 8/33 ovmf: update edk2-stable202005 -> edk2-stable202008
In reply to Alexander Kanavin---
...ovmf-update-path-to-native-BaseTools.patch | 6 ++--
...ile-adjust-to-build-in-under-bitbake.patch | 32 ++++++++++++++-----
.../0003-ovmf-enable-long-path-file.patch | 6 ++--
...patch => 0004-ovmf-Update-to-latest.patch} | 16 +++++-----
meta/recipes-core/ovmf/ovmf_git.bb | 6 ++--
5 files changed, 41 insertions(+), 25 deletions(-)
rename meta/recipes-core/ovmf/ovmf/{0001-ovmf-Update-to-latest.patch => 0004-ovmf-Update-to-latest.patch} (77%)meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch +3 -3
@@ -1,7 +1,7 @@ -From 0a8362cfb9f00870d70687475665b131dd82c947 Mon Sep 17 00:00:00 2001 +From 200ff35c6545b4ab85f5ea7a6096fbaec3d82f6d Mon Sep 17 00:00:00 2001 From: Ricardo Neri <[email protected]> Date: Thu, 9 Jun 2016 02:23:01 -0700 -Subject: [PATCH 1/5] ovmf: update path to native BaseTools +Subject: [PATCH 1/4] ovmf: update path to native BaseTools BaseTools is a set of utilities to build EDK-based firmware. These utilities are used during the build process. Thus, they need to be built natively.
@@ -30,5 +30,5 @@ index 91b1442ade..1858dae31a 100755 source edksetup.sh BaseTools else -- -2.17.1 +2.28.0
meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +24 -8
@@ -1,7 +1,7 @@ -From a8bceaec1b16fffbf6810df05503d8ae9092b735 Mon Sep 17 00:00:00 2001 +From 667c0cf97dadc4f5994d26ec3984f559a05ec406 Mon Sep 17 00:00:00 2001 From: Ricardo Neri <[email protected]> Date: Fri, 26 Jul 2019 17:34:26 -0400 -Subject: [PATCH 2/5] BaseTools: makefile: adjust to build in under bitbake +Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake Prepend the build flags with those of bitbake. This is to build using the bitbake native sysroot include and library directories.
@@ -10,14 +10,14 @@ Signed-off-by: Ricardo Neri <[email protected]> Upstream-Status: Pending --- - BaseTools/Source/C/Makefiles/header.makefile | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 4e9b36d98b..eb03ee33fa 100644 +index 1c105ee7d4..d5eea3864e 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -62,23 +62,23 @@ $(error Bad HOST_ARCH) +@@ -69,35 +69,36 @@ $(error Bad HOST_ARCH) endif INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
@@ -33,19 +33,35 @@ index 4e9b36d98b..eb03ee33fa 100644 +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g else + ifeq ($(CXX), llvm) +-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ ++BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ + -fno-delete-null-pointer-checks -Wall -Werror \ + -Wno-deprecated-declarations -Wno-self-assign \ + -Wno-unused-result -nostdlib -g + else -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ -fno-delete-null-pointer-checks -Wall -Werror \ -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ -Wno-unused-result -nostdlib -g endif + endif + ifeq ($(CXX), llvm) +-BUILD_LFLAGS = +-BUILD_CXXFLAGS = -Wno-deprecated-register -Wno-unused-result ++BUILD_LFLAGS = $(LDFLAGS) ++BUILD_CXXFLAGS += -Wno-deprecated-register -Wno-unused-result + else -BUILD_LFLAGS = -BUILD_CXXFLAGS = -Wno-unused-result +BUILD_LFLAGS = $(LDFLAGS) +BUILD_CXXFLAGS += -Wno-unused-result - + endif ++ ifeq ($(HOST_ARCH), IA32) # + # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults -- -2.17.1 +2.28.0
meta/recipes-core/ovmf/ovmf/0003-ovmf-enable-long-path-file.patch +3 -3
@@ -1,7 +1,7 @@ -From 60a5f953f747e1e9e05a40157b651cba8ea57b91 Mon Sep 17 00:00:00 2001 +From e19481e5a64f8915ac118899b10c40d12c0f9daa Mon Sep 17 00:00:00 2001 From: Dengke Du <[email protected]> Date: Mon, 11 Sep 2017 02:21:55 -0400 -Subject: [PATCH 3/5] ovmf: enable long path file +Subject: [PATCH 3/4] ovmf: enable long path file Upstream-Status: Pending Signed-off-by: Dengke Du <[email protected]>
@@ -24,5 +24,5 @@ index e1cce985f7..d67d03c70c 100644 #define MAX_UINT64 ((UINT64)0xFFFFFFFFFFFFFFFFULL) #define MAX_UINT32 ((UINT32)0xFFFFFFFF) -- -2.17.1 +2.28.0
meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch renamed from meta/recipes-core/ovmf/ovmf/0001-ovmf-Update-to-latest.patch +8 -8
@@ -1,7 +1,7 @@ -From 640a634936ba8eca4778470fb14c6eb9cfd19953 Mon Sep 17 00:00:00 2001 +From ad06fcf1e08736e79221cd6863ff2e3c9254f261 Mon Sep 17 00:00:00 2001 From: Steve Langasek <[email protected]> Date: Sat, 10 Jun 2017 01:39:36 -0700 -Subject: [PATCH 1/2] ovmf: Update to latest +Subject: [PATCH 4/4] ovmf: Update to latest Description: pass -fno-stack-protector to all GCC toolchains The upstream build rules inexplicably pass -fno-stack-protector only
@@ -15,15 +15,15 @@ Upstream-Status: Pending 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 2b17d3b297..4cd2567c2a 100755 +index 933b3160fd..c2fbbf0c38 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -1950,10 +1950,10 @@ DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 +@@ -1952,10 +1952,10 @@ DEFINE GCC_RISCV64_RC_FLAGS = -I binary -O elf64-littleriscv -B riscv # GCC Build Flag for included header file list generation DEFINE GCC_DEPS_FLAGS = -MMD -MF [email protected] --DEFINE GCC48_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -+DEFINE GCC48_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-stack-protector -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings +-DEFINE GCC48_ALL_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -ffunction-sections -fdata-sections -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings ++DEFINE GCC48_ALL_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -ffunction-sections -fdata-sections -fno-stack-protector -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings DEFINE GCC48_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20 -DEFINE GCC48_IA32_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables -Wno-address -DEFINE GCC48_X64_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables -Wno-address
@@ -32,7 +32,7 @@ index 2b17d3b297..4cd2567c2a 100755 DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive DEFINE GCC48_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON) -@@ -1962,7 +1962,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF +@@ -1964,7 +1964,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF DEFINE GCC48_ASM_FLAGS = DEF(GCC_ASM_FLAGS) DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
@@ -42,5 +42,5 @@ index 2b17d3b297..4cd2567c2a 100755 DEFINE GCC48_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS) DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS) -- -2.24.0 +2.28.0
meta/recipes-core/ovmf/ovmf_git.bb +3 -3
@@ -16,11 +16,11 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0001-ovmf-update-path-to-native-BaseTools.patch \ file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://0003-ovmf-enable-long-path-file.patch \ - file://0001-ovmf-Update-to-latest.patch \ + file://0004-ovmf-Update-to-latest.patch \ " -PV = "edk2-stable202005" -SRCREV = "ca407c7246bf405da6d9b1b9d93e5e7f17b4b1f9" +PV = "edk2-stable202008" +SRCREV = "06dc822d045c2bb42e497487935485302486e151" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" inherit deploy
Signature · 1 line
2.29.0
PATCH 9/33 gnu-config: update to latest revision
In reply to Alexander Kanavin--- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config_git.bb +2 -2
@@ -8,8 +8,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "0b5188819ba6091770064adf26360b204113317e" -PV = "20200831+git${SRCPV}" +SRCREV = "664b772118739dac69ef8c39abea7e02973ff316" +PV = "20201018+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in"
Signature · 1 line
2.29.0
PATCH 10/33 file: enable all built-in compression checkers
In reply to Alexander KanavinThis allows re-enabling parallel file classification in rpm in particular, as otherwise libmagic calls out to external executables, which isn't implemented in a thread-safe way.
--- meta/recipes-devtools/file/file_5.39.bb | 5 ++-- ....c-correct-header-define-for-xz-lzma.patch | 27 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch
meta/recipes-devtools/file/file_5.39.bb +3 -2
@@ -11,14 +11,15 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd DEPENDS = "file-replacement-native" DEPENDS_class-native = "bzip2-replacement-native" -SRC_URI = "git://github.com/file/file.git" +SRC_URI = "git://github.com/file/file.git \ + file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch" SRCREV = "87731415de945660b00f02207d8e9d986ef9b82e" S = "${WORKDIR}/git" inherit autotools update-alternatives -PACKAGECONFIG ??= "zlib" +PACKAGECONFIG ??= "bz2 lzma zlib" PACKAGECONFIG[bz2] = "--enable-bzlib, --disable-bzlib, bzip2" PACKAGECONFIG[lzma] = "--enable-xzlib, --disable-xzlib, xz" PACKAGECONFIG[zlib] = "--enable-zlib, --disable-zlib, zlib"
meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch new file +27 -0
@@ -0,0 +1,27 @@ +From ffb6ebdb42590cb9f7d3f5177b7b820a9edc4c81 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Sun, 18 Oct 2020 23:40:42 +0200 +Subject: [PATCH] src/compress.c: correct header define for xz/lzma + +Upstream-Status: Submitted [https://github.com/file/file/pull/98] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/compress.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/compress.c b/src/compress.c +index 67f21583..9670b72c 100644 +--- a/src/compress.c ++++ b/src/compress.c +@@ -71,7 +71,7 @@ typedef void (*sig_t)(int); + #include <bzlib.h> + #endif + +-#if defined(HAVE_XZLIB_H) && defined(XZLIBSUPPORT) ++#if defined(HAVE_LZMA_H) && defined(XZLIBSUPPORT) + #define BUILTIN_XZLIB + #include <lzma.h> + #endif +-- +2.28.0 +
Signature · 1 line
2.29.0
PATCH 11/33 rpm: update 4.15.1 -> 4.16.0
In reply to Alexander KanavinDrop backports.
Drop 0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch as enabling compression support in libmagic finally allows us to use parallel file classification.
Add a backported patch that fixes musl builds.
License-Update: formatting
---
...he-limit-of-signature-header-to-64MB.patch | 62 ------------------
...lib-rpm-as-the-installation-path-for.patch | 14 ++--
.../0001-rpmdb.c-add-a-missing-include.patch | 25 +++++++
...-run-file-classification-in-parallel.patch | 65 -------------------
...lugins.c-call-dlerror-prior-to-dlsym.patch | 29 ---------
.../rpm/{rpm_4.15.1.bb => rpm_4.16.0.bb} | 16 +++--
6 files changed, 42 insertions(+), 169 deletions(-)
delete mode 100644 meta/recipes-devtools/rpm/files/0001-Bump-up-the-limit-of-signature-header-to-64MB.patch
create mode 100644 meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch
rename meta/recipes-devtools/rpm/{rpm_4.15.1.bb => rpm_4.16.0.bb} (94%)meta/recipes-devtools/rpm/files/0001-Bump-up-the-limit-of-signature-header-to-64MB.patch deleted +0 -62
@@ -1,62 +0,0 @@ -From e8bf0eba7143abb6e69db82ee747a0c6790dd00a Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Wed, 3 Jun 2020 10:25:24 +0800 -Subject: [PATCH] Bump up the limit of signature header to 64MB - -Since commits [Place file signatures into the signature header where they -belong][1] applied, run `rpm -Kv **.rpm' failed if signature header -is larger than 64KB. Here are steps: - -1) A unsigned rpm package, the size is 227560 bytes -$ ls -al xz-src-5.2.5-r0.corei7_64.rpm --rw-------. 1 mockbuild 1000 227560 Jun 3 09:59 - -2) Sign the rpm package -$ rpmsign --addsign ... xz-src-5.2.5-r0.corei7_64.rpm - -3) The size of signed rpm is 312208 bytes -$ ls -al xz-src-5.2.5-r0.corei7_64.rpm --rw-------. 1 mockbuild 1000 312208 Jun 3 09:48 - -4) Run `rpm -Kv' failed with signature hdr data out of range -$ rpm -Kv xz-src-5.2.5-r0.corei7_64.rpm -xz-src-5.2.5-r0.corei7_64.rpm: -error: xz-src-5.2.5-r0.corei7_64.rpm: signature hdr data: BAD, no. of -bytes(88864) out of range - -From 1) and 3), the size of signed rpm package increased -312208 - 227560 = 84648, so the check of dl_max (64KB,65536) -is not enough. - -As [1] said: - - This also means the signature header can be MUCH bigger than ever - before,so bump up the limit (to 64MB, arbitrary something for now) - -So [1] missed to multiply by 1024. - -[1] https://github.com/rpm-software-management/rpm/commit/f558e886050c4e98f6cdde391df679a411b3f62c - -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/486579912381ede82172dc6d0ff3941a6d0536b5] - -Signed-off-by: Hongxu Jia <[email protected]> ---- - lib/header.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/header.c b/lib/header.c -index 9ec7ed0..cbf6890 100644 ---- a/lib/header.c -+++ b/lib/header.c -@@ -1906,7 +1906,7 @@ rpmRC hdrblobRead(FD_t fd, int magic, int exact_size, rpmTagVal regionTag, hdrbl - - if (regionTag == RPMTAG_HEADERSIGNATURES) { - il_max = 32; -- dl_max = 64 * 1024; -+ dl_max = 64 * 1024 * 1024; - } - - memset(block, 0, sizeof(block)); --- -2.25.4 -
meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +7 -7
@@ -1,4 +1,4 @@ -From 2f3d1619b6510bc131c4375827caf912559f0fa2 Mon Sep 17 00:00:00 2001 +From 4fd37bc9d8d0777aa038777dd81a76b64f536efd Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 27 Feb 2017 09:43:30 +0200 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index d3aeab86e..1a1f3f91f 100644 +index 186e4aeec..5df252085 100644 --- a/configure.ac +++ b/configure.ac -@@ -1086,7 +1086,7 @@ else +@@ -944,7 +944,7 @@ else usrprefix=$prefix fi
@@ -27,10 +27,10 @@ index d3aeab86e..1a1f3f91f 100644 AC_SUBST(OBJDUMP) diff --git a/macros.in b/macros.in -index fe9803aad..d128675bf 100644 +index 35c8cf9df..9d8b2825c 100644 --- a/macros.in +++ b/macros.in -@@ -985,7 +985,7 @@ package or when debugging this package.\ +@@ -996,7 +996,7 @@ package or when debugging this package.\ %_sharedstatedir %{_prefix}/com %_localstatedir %{_prefix}/var %_lib lib
@@ -40,7 +40,7 @@ index fe9803aad..d128675bf 100644 %_infodir %{_datadir}/info %_mandir %{_datadir}/man diff --git a/rpm.am b/rpm.am -index 40b4ec55f..3139ce8f6 100644 +index b46c6b7da..02d5c7a0a 100644 --- a/rpm.am +++ b/rpm.am @@ -1,10 +1,10 @@
@@ -55,4 +55,4 @@ index 40b4ec55f..3139ce8f6 100644 +rpmconfigdir = $(libdir)/rpm # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 9:1:0 + rpm_version_info = 10:0:1
meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 9de15c7e1f4ca23a10edb9a3b657f06b2b13e841 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 20 Oct 2020 22:16:39 +0200 +Subject: [PATCH] rpmdb.c: add a missing include + +This addressed build failures on non-glibc systems. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + lib/rpmdb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/rpmdb.c b/lib/rpmdb.c +index 4c101569f..73187630b 100644 +--- a/lib/rpmdb.c ++++ b/lib/rpmdb.c +@@ -8,6 +8,7 @@ + #include <utime.h> + #include <errno.h> + #include <dirent.h> ++#include <fcntl.h> + + #ifndef DYING /* XXX already in "system.h" */ + #include <fnmatch.h>
meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch deleted +0 -65
65 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 6878a83f9bac015c64d83cee42530a20a264cc5a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 7 Jan 2020 12:02:06 +0100 -Subject: [PATCH] rpmplugins.c: call dlerror() prior to dlsym() - -This is the recommended way in the manpage; if there is -a lingering error from an unrelated dl*() call that was -never obtained via dlerror(), it needs to be cleared -prior to calling dlsym(). - -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/998] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - lib/rpmplugins.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/rpmplugins.c b/lib/rpmplugins.c -index 65e684e84..b950f85cf 100644 ---- a/lib/rpmplugins.c -+++ b/lib/rpmplugins.c -@@ -68,6 +68,8 @@ static rpmPlugin rpmPluginNew(const char *name, const char *path, - - /* make sure the plugin has the supported hooks flag */ - hooks_name = rstrscat(NULL, name, "_hooks", NULL); -+ /* clear out any old errors that weren't fetched */ -+ dlerror(); - hooks = dlsym(handle, hooks_name); - if ((error = dlerror()) != NULL) { - rpmlog(RPMLOG_ERR, _("Failed to resolve symbol %s: %s\n"),
meta/recipes-devtools/rpm/rpm_4.16.0.bb renamed from meta/recipes-devtools/rpm/rpm_4.15.1.bb +10 -6
@@ -22,9 +22,9 @@ HOMEPAGE = "http://www.rpm.org" # libraries are also LGPL - how to express this? LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a" +LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.15.x \ +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ file://environment.d-rpm.sh \ file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ file://0001-Do-not-read-config-files-from-HOME.patch \
@@ -38,14 +38,12 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.15.x \ file://0001-perl-disable-auto-reqs.patch \ file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ - file://0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch \ - file://0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch \ file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ - file://0001-Bump-up-the-limit-of-signature-header-to-64MB.patch \ + file://0001-rpmdb.c-add-a-missing-include.patch \ " PE = "1" -SRCREV = "ab2179452c5be276a6b96c591afded485c7e58c3" +SRCREV = "cd7f9303ef1070f027493cad7d00bc66935af2a0" S = "${WORKDIR}/git"
@@ -55,6 +53,8 @@ DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native inherit autotools gettext pkgconfig python3native export PYTHON_ABI +AUTOTOOLS_AUXDIR = "${S}/build-aux" + # OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe EXTRA_AUTORECONF_append = " --exclude=gnu-configize"
@@ -97,6 +97,10 @@ WRAPPER_TOOLS = " \ ${libdir}/rpm/rpmdeps \ " +do_configure_prepend() { + mkdir -p ${S}/build-aux +} + do_install_append_class-native() { for tool in ${WRAPPER_TOOLS}; do test -x ${D}$tool && create_wrapper ${D}$tool \
Signature · 1 line
2.29.0
PATCH 12/33 elfutils: update 0.180 -> 0.181
In reply to Alexander KanavinAdd a config option for client debuginfod library.
---
.../elfutils/{elfutils_0.180.bb => elfutils_0.181.bb} | 10 +++++++++-
.../elfutils/files/0001-musl-obstack-fts.patch | 4 ++--
...kefile.am-compile-test_nlist-with-standard-C.patch | 11 ++++++-----
.../elfutils/files/0002-musl-libs.patch | 2 +-
.../elfutils/files/0003-musl-utils.patch | 6 +++---
.../elfutils/files/0004-Fix-error-on-musl.patch | 2 +-
.../files/0015-config-eu.am-do-not-use-Werror.patch | 3 ++-
7 files changed, 24 insertions(+), 14 deletions(-)
rename meta/recipes-devtools/elfutils/{elfutils_0.180.bb => elfutils_0.181.bb} (90%)meta/recipes-devtools/elfutils/elfutils_0.181.bb renamed from meta/recipes-devtools/elfutils/elfutils_0.180.bb +9 -1
@@ -28,7 +28,7 @@ SRC_URI_append_libc-musl = " \ file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " -SRC_URI[sha256sum] = "b827b6e35c59d188ba97d7cf148fa8dc6f5c68eb6c5981888dfdbb758c0b569d" +SRC_URI[sha256sum] = "29a6ad7421ec2acfee489bb4a699908281ead2cb63a20a027ce8804a165f0eb3" inherit autotools gettext ptest pkgconfig
@@ -40,6 +40,7 @@ DEPENDS_BZIP2_class-target = "bzip2" PACKAGECONFIG ??= "" PACKAGECONFIG[bzip2] = "--with-bzlib,--without-bzlib,${DEPENDS_BZIP2}" PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz" +PACKAGECONFIG[libdebuginfod] = "--enable-libdebuginfod,--disable-libdebuginfod,curl" RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils"
@@ -59,6 +60,8 @@ do_install_ptest() { install -d -m 755 ${D}${PTEST_PATH}/src install -d -m 755 ${D}${PTEST_PATH}/libelf install -d -m 755 ${D}${PTEST_PATH}/libdw + install -d -m 755 ${D}${PTEST_PATH}/libdwfl + install -d -m 755 ${D}${PTEST_PATH}/libdwelf install -d -m 755 ${D}${PTEST_PATH}/libasm for test_file in ${TEST_FILES}; do if [ -f ${B}/src/${test_file} ]; then
@@ -68,6 +71,11 @@ do_install_ptest() { cp ${D}${libdir}/libelf-${PV}.so ${D}${PTEST_PATH}/libelf/libelf.so cp ${D}${libdir}/libdw-${PV}.so ${D}${PTEST_PATH}/libdw/libdw.so cp ${D}${libdir}/libasm-${PV}.so ${D}${PTEST_PATH}/libasm/libasm.so + cp ${S}/libelf/*.h ${D}${PTEST_PATH}/libelf/ + cp ${S}/libdw/*.h ${D}${PTEST_PATH}/libdw/ + cp ${S}/libdwfl/*.h ${D}${PTEST_PATH}/libdwfl/ + cp ${S}/libdwelf/*.h ${D}${PTEST_PATH}/libdwelf/ + cp ${S}/libasm/*.h ${D}${PTEST_PATH}/libasm/ cp -r ${S}/tests/ ${D}${PTEST_PATH} cp -r ${B}/tests/* ${D}${PTEST_PATH}/tests cp -r ${B}/config.h ${D}${PTEST_PATH}
meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch +2 -2
@@ -1,4 +1,4 @@ -From 1ec7b2208803e0fbdcbe6c07b849e7dc4d9fa8a2 Mon Sep 17 00:00:00 2001 +From 1a62bb8e8f2cb0f180c749946a48114e8f391b55 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:17:25 +0800 Subject: [PATCH] musl-obstack-fts
@@ -20,7 +20,7 @@ Signed-off-by: Hongxu Jia <[email protected]> 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index e9649c2..03643c8 100644 +index ab9c751..b057d86 100644 --- a/configure.ac +++ b/configure.ac @@ -538,6 +538,60 @@ else
meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch +6 -5
@@ -1,4 +1,4 @@ -From 1ca86294ee5454592c9ad855e13080509d8a92d3 Mon Sep 17 00:00:00 2001 +From fa265ff686cb60e19aa607bda3752b6b2ee87a14 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 23 Jun 2020 07:49:35 +0000 Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS
@@ -8,20 +8,21 @@ be reproducible. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 8048b69..d2b28a4 100644 +index 05fc9b4..11de0fc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -86,7 +86,7 @@ backtrace-child-biarch$(EXEEXT): backtrace-child.c +@@ -92,7 +92,7 @@ endif test-nlist$(EXEEXT): test-nlist.c $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(test_nlist_CFLAGS) $(test_nlist_LDADD) -o $@ $< -+ $(CFLAGS) $(test_nlist_LDADD) -o $@ $< +- $(test_nlist_CFLAGS) $(GCOV_FLAGS) -o $@ $< $(test_nlist_LDADD) ++ $(CFLAGS) $(GCOV_FLAGS) -o $@ $< $(test_nlist_LDADD) TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile test-nlist \ update1 update2 update3 update4 \
meta/recipes-devtools/elfutils/files/0002-musl-libs.patch +1 -1
@@ -1,4 +1,4 @@ -From 9a57efb0f826a70ae360aa55504ee2de656b92b6 Mon Sep 17 00:00:00 2001 +From 2e1f8ca0b67c1d1991c14d509938c347e09bae94 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:18:47 +0800 Subject: [PATCH] musl-libs
meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +3 -3
@@ -1,4 +1,4 @@ -From 6923400b777d4ba6f040c4006413bf997326460f Mon Sep 17 00:00:00 2001 +From 9b237f19f82d5ab1e0702637fece1866b1ef6681 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:19:48 +0800 Subject: [PATCH] musl-utils
@@ -58,7 +58,7 @@ index 6ba6af4..0c7674b 100644 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; diff --git a/src/readelf.c b/src/readelf.c -index 5994615..f3cc071 100644 +index 685d0b1..a842b10 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p)
@@ -124,7 +124,7 @@ index 5994615..f3cc071 100644 static bool diff --git a/src/strip.c b/src/strip.c -index 4054c2a..d2d2176 100644 +index 48792a7..198a2e4 100644 --- a/src/strip.c +++ b/src/strip.c @@ -46,6 +46,13 @@
meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +1 -1
@@ -1,4 +1,4 @@ -From 48b769ab692c8f02c1ae467229fe3404f662098a Mon Sep 17 00:00:00 2001 +From d3dc5f98f653342af97ebfbdf3479ee1f0d0cf38 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 1 May 2019 22:15:03 +0100 Subject: [PATCH] Fix error on musl:
meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +2 -1
@@ -1,4 +1,4 @@ -From dce2187dd8f592316357b200ebbe8dbed9ee65cb Mon Sep 17 00:00:00 2001 +From 9b7554a3e21ccb455b3661a6b4e767636c2c5cf3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 22 Jun 2020 21:35:16 +0000 Subject: [PATCH] config/eu.am: do not use -Werror
@@ -10,6 +10,7 @@ Werror. Upstream-Status: Inappropriate [oe core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- config/eu.am | 2 -- 1 file changed, 2 deletions(-)
Signature · 1 line
2.29.0
PATCH 13/33 ghostscript: update 9.52 -> 9.53.3
In reply to Alexander Kanavinghostscript-9.15-parallel-make.patch rebased; one of the chunks removed upstream.
Remove bundled jpeg source, as that seems to be the only way to get ghostscript to fall back to system jpeg library.
---
.../ghostscript/CVE-2020-15900.patch | 54 -------------------
.../ghostscript-9.15-parallel-make.patch | 24 +++------
...stscript_9.52.bb => ghostscript_9.53.3.bb} | 8 +--
3 files changed, 12 insertions(+), 74 deletions(-)
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch
rename meta/recipes-extended/ghostscript/{ghostscript_9.52.bb => ghostscript_9.53.3.bb} (96%)meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch deleted +0 -54
@@ -1,54 +0,0 @@ -From 5d499272b95a6b890a1397e11d20937de000d31b Mon Sep 17 00:00:00 2001 -From: Ray Johnston <[email protected]> -Date: Wed, 22 Jul 2020 09:57:54 -0700 -Subject: [PATCH] Bug 702582, CVE 2020-15900 Memory Corruption in Ghostscript - 9.52 - -Fix the 'rsearch' calculation for the 'post' size to give the correct -size. Previous calculation would result in a size that was too large, -and could underflow to max uint32_t. Also fix 'rsearch' to return the -correct 'pre' string with empty string match. - -A future change may 'undefine' this undocumented, non-standard operator -during initialization as we do with the many other non-standard internal -PostScript operators and procedures. - -Upstream-Status: Backport [https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5d499272b95a6b890a1397e11d20937de000d31b] -CVE: CVE-2020-15900 -Signed-off-by: Chee Yang Lee <[email protected]> ---- - psi/zstring.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/psi/zstring.c b/psi/zstring.c -index 33662dafa..58e1af2b3 100644 ---- a/psi/zstring.c -+++ b/psi/zstring.c -@@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward) - return 0; - found: - op->tas.type_attrs = op1->tas.type_attrs; -- op->value.bytes = ptr; -- r_set_size(op, size); -+ op->value.bytes = ptr; /* match */ -+ op->tas.rsize = size; /* match */ - push(2); -- op[-1] = *op1; -- r_set_size(op - 1, ptr - op[-1].value.bytes); -- op1->value.bytes = ptr + size; -- r_set_size(op1, count + (!forward ? (size - 1) : 0)); -+ op[-1] = *op1; /* pre */ -+ op[-3].value.bytes = ptr + size; /* post */ -+ if (forward) { -+ op[-1].tas.rsize = ptr - op[-1].value.bytes; /* pre */ -+ op[-3].tas.rsize = count; /* post */ -+ } else { -+ op[-1].tas.rsize = count; /* pre */ -+ op[-3].tas.rsize -= count + size; /* post */ -+ } - make_true(op); - return 0; - } --- -2.17.1 -
meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch +7 -17
@@ -1,7 +1,7 @@ -From 84bb692d6b047c09266de154f404af9817fa04aa Mon Sep 17 00:00:00 2001 +From 04a86a613e0f9bfbbad99874f72217f75e8c53a3 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Thu, 29 Mar 2018 15:59:05 +0800 -Subject: [PATCH 01/10] contrib.mak: fix for parallel build +Subject: [PATCH] contrib.mak: fix for parallel build Upstream-Status: Pending
@@ -9,23 +9,16 @@ Signed-off-by: Robert Yang <[email protected]> Rebase to 9.23 Signed-off-by: Hongxu Jia <[email protected]> + --- - contrib/contrib.mak | 2 ++ - 1 file changed, 2 insertions(+) + contrib/contrib.mak | 1 + + 1 file changed, 1 insertion(+) diff --git a/contrib/contrib.mak b/contrib/contrib.mak -index f5a2fa4..4999752 100644 +index 2edee7a..c9100e8 100644 --- a/contrib/contrib.mak +++ b/contrib/contrib.mak -@@ -1067,6 +1067,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \ - $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c - - extra-dmprt-install: install-libdata -+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib - $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 - $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 - $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 -@@ -1235,6 +1236,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ +@@ -1241,6 +1241,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ ### ----------------- Additional .upp files ---------------- ### extra-upp-install: install-libdata
@@ -33,6 +26,3 @@ index f5a2fa4..4999752 100644 for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \ $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ done --- -1.8.3.1 -
meta/recipes-extended/ghostscript/ghostscript_9.53.3.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.52.bb +5 -3
@@ -34,7 +34,6 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d SRC_URI = "${SRC_URI_BASE} \ file://ghostscript-9.21-prevent_recompiling.patch \ file://cups-no-gcrypt.patch \ - file://CVE-2020-15900.patch \ " SRC_URI_class-native = "${SRC_URI_BASE} \
@@ -42,8 +41,7 @@ SRC_URI_class-native = "${SRC_URI_BASE} \ file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ " -SRC_URI[md5sum] = "0f6964ab9b83a63b7e373f136243f901" -SRC_URI[sha256sum] = "c2501d8e8e0814c4a5aa7e443e230e73d7af7f70287546f7b697e5ef49e32176" +SRC_URI[sha256sum] = "6eaf422f26a81854a230b80fd18aaef7e8d94d661485bd2e97e695b9dce7bf7f" # Put something like #
@@ -84,6 +82,10 @@ BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" inherit autotools-brokensep +do_configure_prepend_class-target () { + rm -rf ${S}/jpeg/ +} + do_configure_append () { # copy tools from the native ghostscript build if [ "${PN}" != "ghostscript-native" ]; then
Signature · 1 line
2.29.0
PATCH 14/33 ltp: update 20200515 -> 20200930
In reply to Alexander KanavinDrop backports.
Remove 0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch as upstream has removed the code being patched.
---
...001-Remove-OOM-tests-from-runtest-mm.patch | 17 ++---
...1-ptrace01-Fix-missing-format-string.patch | 33 ---------
...not-run-invalid-undefined-test-cases.patch | 69 -------------------
...le_range02-Expect-EFBIG-in-subcase-m.patch | 57 ---------------
.../0004-guard-mallocopt-with-__GLIBC__.patch | 34 ---------
.../ltp/{ltp_20200515.bb => ltp_20200930.bb} | 6 +-
6 files changed, 8 insertions(+), 208 deletions(-)
delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch
rename meta/recipes-extended/ltp/{ltp_20200515.bb => ltp_20200930.bb} (93%)meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch +7 -10
@@ -1,4 +1,4 @@ -From 13ef88cdccfe3f58c53d57806866b91e310eb272 Mon Sep 17 00:00:00 2001 +From 93772c511d954d755cc9128c58ed8968a5af541b Mon Sep 17 00:00:00 2001 From: "Mingde (Matthew) Zeng" <[email protected]> Date: Wed, 29 Jul 2020 08:47:09 -0400 Subject: [PATCH] Remove OOM tests from runtest/mm
@@ -13,13 +13,13 @@ Signed-off-by: Mingde (Matthew) Zeng <[email protected]> 1 file changed, 6 deletions(-) diff --git a/runtest/mm b/runtest/mm -index a09f39c1e..76fa82754 100644 +index 481d39691..cf207d10e 100644 --- a/runtest/mm +++ b/runtest/mm -@@ -73,12 +73,6 @@ ksm06 ksm06 - ksm06_1 ksm06 -n 10 - ksm06_2 ksm06 -n 10000 - +@@ -74,12 +74,6 @@ ksm06_2 ksm06 -n 10000 + + cpuset01 cpuset01 + -oom01 oom01 -oom02 oom02 -oom03 oom03
@@ -27,8 +27,5 @@ index a09f39c1e..76fa82754 100644 -oom05 oom05 - swapping01 swapping01 -i 5 - + thp01 thp01 -I 120 --- -2.27.0 -
meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From adb9587466a493fdd9d4410f1b8b130ebca06daa Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 19 May 2020 22:21:23 -0700 -Subject: [PATCH] ptrace01: Fix missing format string - -Fixes -| ptrace01.c:89:2: error: format string is not a string literal -(potentially insecure) [-Werror,-Wformat-security] -| tst_res(TINFO, tc->message); -| ^ ~~~~~~~~~~~ - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Backport [58424835952641f4fd60c0ae3ab6c64decca3f8a] ---- - testcases/kernel/syscalls/ptrace/ptrace01.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/ptrace/ptrace01.c b/testcases/kernel/syscalls/ptrace/ptrace01.c -index 87a99e4150..9071bbabaf 100644 ---- a/testcases/kernel/syscalls/ptrace/ptrace01.c -+++ b/testcases/kernel/syscalls/ptrace/ptrace01.c -@@ -86,7 +86,7 @@ static void run(unsigned int i) - - got_signal = 0; - -- tst_res(TINFO, tc->message); -+ tst_res(TINFO, "%s", tc->message); - - if (tc->handler == 1) { - parent_act.sa_handler = parent_handler; --- -2.26.2 -
meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch deleted +0 -69
69 lines not on this page · raw message
meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch deleted +0 -57
57 lines not on this page · raw message
meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From d0fc9ca5d3366f9b8907e463222403cd2327be10 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 Jan 2016 06:51:20 +0000 -Subject: [PATCH] guard mallocopt() with __GLIBC__ - -mallocopt is not available on non glibc implementations - -Signed-off-by: Khem Raj <[email protected]> -Reviewed-by: Petr Vorel <[email protected]> -Upstream-Status: Accepted [967612c454aea66770b64f69287671037fe895b3] ---- - utils/benchmark/ebizzy-0.3/ebizzy.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/benchmark/ebizzy-0.3/ebizzy.c b/utils/benchmark/ebizzy-0.3/ebizzy.c -index 5bb8eff..934d951 100644 ---- a/utils/benchmark/ebizzy-0.3/ebizzy.c -+++ b/utils/benchmark/ebizzy-0.3/ebizzy.c -@@ -215,10 +215,10 @@ static void read_options(int argc, char *argv[]) - "\"never mmap\" option specified\n"); - usage(); - } -- -+#ifdef __GLIBC__ - if (never_mmap) - mallopt(M_MMAP_MAX, 0); -- -+#endif - if (chunk_size < record_size) { - fprintf(stderr, "Chunk size %u smaller than record size %u\n", - chunk_size, record_size); --- -2.7.4 -
meta/recipes-extended/ltp/ltp_20200930.bb renamed from meta/recipes-extended/ltp/ltp_20200515.bb +1 -5
@@ -27,16 +27,12 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "0d79a93e6ca44d9bc95973faea6bcd7b0c6d1f43" +SRCREV = "da2f34028f046a208aa2fed5e287df2538e69f91" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-ptrace01-Fix-missing-format-string.patch \ - file://0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch \ - file://0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ "
Signature · 1 line
2.29.0
PATCH 15/33 gsettings-desktop-schemas: update 3.36.1 -> 3.38.0
In reply to Alexander KanavinDrop 0001-Do-not-skip-gir-installation-for-cross-compiling.patch as upstream has done the same change.
---
...gir-installation-for-cross-compiling.patch | 33 -------------------
...bb => gsettings-desktop-schemas_3.38.0.bb} | 4 +--
2 files changed, 1 insertion(+), 36 deletions(-)
delete mode 100644 meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch
rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.36.1.bb => gsettings-desktop-schemas_3.38.0.bb} (70%)meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 42e58c4c3e95a4a78ee8294f9b3901726bbbabe4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -Date: Sat, 11 May 2019 00:21:11 +0200 -Subject: [PATCH] Do not skip gir installation for cross compiling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We are cool and can handle cross gobject-introspection. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <[email protected]> ---- - headers/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/headers/meson.build b/headers/meson.build -index 3ce8b61..1132695 100644 ---- a/headers/meson.build -+++ b/headers/meson.build -@@ -19,7 +19,7 @@ enums_xml = custom_target( - install: true, - install_dir: schemasdir) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - noinst_lib = shared_library('noinst', - headers, - install: false) --- -2.20.1 -
meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb renamed from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.36.1.bb +1 -3
@@ -13,6 +13,4 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even -SRC_URI[archive.md5sum] = "708ddd8dec388ebda5539667604197c3" -SRC_URI[archive.sha256sum] = "004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9" -SRC_URI += "file://0001-Do-not-skip-gir-installation-for-cross-compiling.patch" +SRC_URI[archive.sha256sum] = "5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67"
Signature · 1 line
2.29.0
PATCH 16/33 libsecret: update 0.20.3 -> 0.20.4
In reply to Alexander KanavinDrop the patch as it is merged upstream.
---
.../0001-meson-add-option-introspection.patch | 137 ------------------
...ibsecret_0.20.3.bb => libsecret_0.20.4.bb} | 5 +-
2 files changed, 1 insertion(+), 141 deletions(-)
delete mode 100644 meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch
rename meta/recipes-gnome/libsecret/{libsecret_0.20.3.bb => libsecret_0.20.4.bb} (81%)meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch deleted +0 -137
@@ -1,137 +0,0 @@ -meson: add option introspection - -Add an option 'introspection' for meson which could control whether -build GIR files or not. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/53] - -Signed-off-by: Kai Kang <[email protected]> ---- - libsecret/meson.build | 86 ++++++++++++++++++++++--------------------- - meson.build | 1 + - meson_options.txt | 1 + - 3 files changed, 46 insertions(+), 42 deletions(-) - -diff --git a/libsecret/meson.build b/libsecret/meson.build -index 759b5ef..2ee8850 100644 ---- a/libsecret/meson.build -+++ b/libsecret/meson.build -@@ -104,50 +104,52 @@ libsecret_dep = declare_dependency( - ) - - # GObject Introspection --libsecret_gir_sources = [ -- 'secret-attributes.c', -- 'secret-attributes.h', -- 'secret-backend.c', -- 'secret-backend.h', -- 'secret-collection.c', -- 'secret-collection.h', -- 'secret-item.c', -- 'secret-item.h', -- 'secret-methods.c', -- 'secret-password.c', -- 'secret-password.h', -- 'secret-paths.c', -- 'secret-paths.h', -- 'secret-prompt.c', -- 'secret-prompt.h', -- 'secret-retrievable.c', -- 'secret-retrievable.h', -- 'secret-schema.c', -- 'secret-schema.h', -- 'secret-schemas.c', -- 'secret-schemas.h', -- 'secret-service.c', -- 'secret-service.h', -- 'secret-types.h', -- 'secret-value.c', -- 'secret-value.h', --] --libsecret_gir_sources += version_h --libsecret_gir_sources += _enums_generated -- --libsecret_gir = gnome.generate_gir(libsecret, -- sources: libsecret_gir_sources, -- namespace: 'Secret', -- nsversion: api_version_major, -- export_packages: 'libsecret-@0@'.format(api_version_major), -- includes: [ 'GObject-2.0', 'Gio-2.0' ], -- header: 'libsecret/secret.h', -- extra_args: [ '-D SECRET_COMPILATION'], -- install: true, --) -+if with_gir -+ libsecret_gir_sources = [ -+ 'secret-attributes.c', -+ 'secret-attributes.h', -+ 'secret-backend.c', -+ 'secret-backend.h', -+ 'secret-collection.c', -+ 'secret-collection.h', -+ 'secret-item.c', -+ 'secret-item.h', -+ 'secret-methods.c', -+ 'secret-password.c', -+ 'secret-password.h', -+ 'secret-paths.c', -+ 'secret-paths.h', -+ 'secret-prompt.c', -+ 'secret-prompt.h', -+ 'secret-retrievable.c', -+ 'secret-retrievable.h', -+ 'secret-schema.c', -+ 'secret-schema.h', -+ 'secret-schemas.c', -+ 'secret-schemas.h', -+ 'secret-service.c', -+ 'secret-service.h', -+ 'secret-types.h', -+ 'secret-value.c', -+ 'secret-value.h', -+ ] -+ libsecret_gir_sources += version_h -+ libsecret_gir_sources += _enums_generated -+ -+ libsecret_gir = gnome.generate_gir(libsecret, -+ sources: libsecret_gir_sources, -+ namespace: 'Secret', -+ nsversion: api_version_major, -+ export_packages: 'libsecret-@0@'.format(api_version_major), -+ includes: [ 'GObject-2.0', 'Gio-2.0' ], -+ header: 'libsecret/secret.h', -+ extra_args: [ '-D SECRET_COMPILATION'], -+ install: true, -+ ) -+endif - - # Vapi --if with_vapi -+if with_vapi and with_gir - libsecret_vapi = gnome.generate_vapi('libsecret-@0@'.format(api_version_major), - sources: libsecret_gir[0], - metadata_dirs: meson.source_root() / 'libsecret', -diff --git a/meson.build b/meson.build -index a26d046..d22e008 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,6 +22,7 @@ with_gcrypt = get_option('gcrypt') - enable_debug = get_option('debugging') - with_vapi = get_option('vapi') - with_gtkdoc = get_option('gtk_doc') -+with_gir = get_option('introspection') - - # Some variables - config_h_dir = include_directories('.') -diff --git a/meson_options.txt b/meson_options.txt -index c1fda5d..445aeb0 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -3,3 +3,4 @@ option('gcrypt', type: 'boolean', value: true, description: 'With gcrypt and tra - option('debugging', type: 'boolean', value: false, description: 'Turn debugging on/off') - option('vapi', type: 'boolean', value: true, description: 'Create VAPI file.') - option('gtk_doc', type: 'boolean', value: true, description: 'Build reference documentation using gtk-doc') -+option('introspection', type: 'boolean', value: true, description: 'Create GIR file.') --- -2.17.1 -
meta/recipes-gnome/libsecret/libsecret_0.20.4.bb renamed from meta/recipes-gnome/libsecret/libsecret_0.20.3.bb +1 -4
@@ -13,10 +13,7 @@ inherit gnomebase gtk-doc vala gobject-introspection manpages DEPENDS += "glib-2.0 libgcrypt gettext-native" -SRC_URI += "file://0001-meson-add-option-introspection.patch" - -SRC_URI[archive.md5sum] = "47c3fdfeb111a87b509ad271e4a6f496" -SRC_URI[archive.sha256sum] = "4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4" +SRC_URI[archive.sha256sum] = "325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28" GTKDOC_MESON_OPTION = 'gtk_doc'
Signature · 1 line
2.29.0
PATCH 17/33 mesa: update 20.1.8 -> 20.2.1
In reply to Alexander KanavinBuild tweaks:
- drop separate dri option and the patch that adds it; just setting -Ddri-drivers='' is enough
- strip leading/trailing commas from drivers' lists, as upstream no longer allows blank entries if the list is not empty (e.g. -Ddri-drivers=,driver1,driver2 is now producing an error).
- drop the long-obsolete llvm 3.3/3.2 logic
License-Update: reformatted into rst
---
...02-meson.build-make-TLS-ELF-optional.patch | 18 ++++----
...Allow-enable-DRI-without-DRI-drivers.patch | 46 -------------------
...le-asm-unconditionally-now-that-gen_.patch | 16 +++----
.../{mesa-gl_20.1.8.bb => mesa-gl_20.2.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 23 +++++-----
.../mesa/{mesa_20.1.8.bb => mesa_20.2.1.bb} | 0
6 files changed, 29 insertions(+), 74 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
rename meta/recipes-graphics/mesa/{mesa-gl_20.1.8.bb => mesa-gl_20.2.1.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_20.1.8.bb => mesa_20.2.1.bb} (100%)meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +9 -9
@@ -1,4 +1,4 @@ -From 65857eaee12a21a631750ffcd9e64e0afbbc3af0 Mon Sep 17 00:00:00 2001 +From ce57ce220d9c377beabf4914f33c43118f672ffe 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
@@ -15,23 +15,23 @@ Signed-off-by: Alistair Francis <[email protected]> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index c51dde9..c16f78f 100644 +index c5136ea..185270d 100644 --- a/meson.build +++ b/meson.build -@@ -392,7 +392,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat - endif +@@ -424,7 +424,7 @@ endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. --if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) -+if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('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') pre_args += '-DUSE_ELF_TLS' + use_elf_tls = true endif - diff --git a/meson_options.txt b/meson_options.txt -index ab43150..d7b1555 100644 +index 2d39d13..72006eb 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -355,6 +355,12 @@ option( +@@ -368,6 +368,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', )
meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch deleted +0 -46
46 lines not on this page · raw message
meta/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch +8 -8
@@ -1,4 +1,4 @@ -From 41cd8836d785c79381764e7de59319f87959a5cf Mon Sep 17 00:00:00 2001 +From 43d9e40db7357f27e91002b2bb7688b6775ebb43 Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 09:06:02 -0800 Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now that
@@ -15,18 +15,18 @@ Signed-off-by: Alistair Francis <[email protected]> 2 files changed, 67 insertions(+), 33 deletions(-) diff --git a/meson.build b/meson.build -index 62864c6..b53be8d 100644 +index e7dc599..e2fc934 100644 --- a/meson.build +++ b/meson.build -@@ -49,6 +49,7 @@ with_vulkan_icd_dir = get_option('vulkan-icd-dir') +@@ -52,6 +52,7 @@ pre_args = [ + with_vulkan_icd_dir = get_option('vulkan-icd-dir') with_tests = get_option('build-tests') - with_valgrind = get_option('valgrind') - with_libunwind = get_option('libunwind') + with_aco_tests = get_option('build-aco-tests') +with_asm = get_option('asm') with_glx_read_only_text = get_option('glx-read-only-text') with_glx_direct = get_option('glx-direct') with_osmesa = get_option('osmesa') -@@ -1093,41 +1094,68 @@ dep_ws2_32 = cc.find_library('ws2_32', required : with_platform_windows) +@@ -1154,41 +1155,68 @@ dep_ws2_32 = cc.find_library('ws2_32', required : with_platform_windows) # TODO: shared/static? Is this even worth doing?
@@ -129,10 +129,10 @@ index 62864c6..b53be8d 100644 endif diff --git a/meson_options.txt b/meson_options.txt -index 700c34c..62e8472 100644 +index 147cccb..562b059 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -241,6 +241,12 @@ option( +@@ -254,6 +254,12 @@ option( value : false, description : 'Enable GLVND support.' )
meta/recipes-graphics/mesa/mesa-gl_20.2.1.bb renamed from meta/recipes-graphics/mesa/mesa-gl_20.1.8.bb +0 -0
meta/recipes-graphics/mesa/mesa.inc +12 -11
@@ -10,21 +10,20 @@ HOMEPAGE = "http://mesa3d.org" BUGTRACKER = "https://bugs.freedesktop.org" SECTION = "x11" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=c1843d93c460bbf778d6037ce324f9f7" +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496" PE = "2" SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ file://0002-meson.build-make-TLS-ELF-optional.patch \ - file://0003-Allow-enable-DRI-without-DRI-drivers.patch \ file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \ file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ " -SRC_URI[sha256sum] = "df21351494f7caaec5a3ccc16f14f15512e98d2ecde178bba1d134edc899b961" +SRC_URI[sha256sum] = "d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
@@ -88,6 +87,9 @@ EXTRA_OEMESON = " \ -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ " +def strip_comma(s): + return s.strip(',') + PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium virgl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \
@@ -114,16 +116,16 @@ DRIDRIVERS_class-nativesdk = "swrast" DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" # "dri" requires "opengl" -PACKAGECONFIG[dri] = "-Ddri=true -Ddri-drivers=${DRIDRIVERS}, -Ddri=false -Ddri-drivers='', xorgproto libdrm" +PACKAGECONFIG[dri] = "-Ddri-drivers=${@strip_comma('${DRIDRIVERS}')}, -Ddri-drivers='', xorgproto libdrm" PACKAGECONFIG[dri3] = "-Ddri3=true, -Ddri3=false, xorgproto libxshmfence" # Vulkan drivers need dri3 enabled -# radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9 +# amd could be enabled as well but requires gallium-llvm with llvm >= 3.9 VULKAN_DRIVERS = "" VULKAN_DRIVERS_append_x86_class-target = ",intel" VULKAN_DRIVERS_append_x86-64_class-target = ",intel" VULKAN_DRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" -PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${VULKAN_DRIVERS}, -Dvulkan-drivers=''," +PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers=''," PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
@@ -150,9 +152,8 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '', d)}" # radeonsi requires LLVM -GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" -GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" -GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" +GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" +GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${GALLIUMDRIVERS_RADEONSI}" PACKAGECONFIG[r600] = "" PACKAGECONFIG[virgl] = ""
@@ -161,9 +162,9 @@ GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ' GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}" GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" -PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS}, -Dgallium-drivers=''" +PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers=''" PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \ - ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" + elfutils" PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial"
meta/recipes-graphics/mesa/mesa_20.2.1.bb renamed from meta/recipes-graphics/mesa/mesa_20.1.8.bb +0 -0
Signature · 1 line
2.29.0
PATCH 18/33 xf86-video-vesa: update 2.4.0 -> 2.5.0
In reply to Alexander Kanavin---
.../0001-Refuse-to-run-on-UEFI-machines.patch | 52 -------------------
...vesa_2.4.0.bb => xf86-video-vesa_2.5.0.bb} | 6 +--
2 files changed, 1 insertion(+), 57 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch
rename meta/recipes-graphics/xorg-driver/{xf86-video-vesa_2.4.0.bb => xf86-video-vesa_2.5.0.bb} (72%)meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch deleted +0 -52
@@ -1,52 +0,0 @@ -From 2645e0aa9c17c2c966a0533e52ad00510311483e Mon Sep 17 00:00:00 2001 -From: Adam Jackson <[email protected]> -Date: Wed, 29 Aug 2018 11:04:23 -0400 -Subject: [PATCH] Refuse to run on UEFI machines - -No possible good can come of this. - -v2: Check for .../efi-framebuffer.0 ("is there an EFI framebuffer") -instead of /sys/firmware/efi ("is this an EFI machine"). Suggested by -Peter Jones. - -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa] - -Reviewed-by: Peter Jones <[email protected]> -Signed-off-by: Adam Jackson <[email protected]> -Signed-off-by: Ovidiu Panait <[email protected]> ---- - src/vesa.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/vesa.c b/src/vesa.c -index 9b65b9b..af750e2 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -43,7 +43,7 @@ - #endif - - #include <string.h> -- -+#include <unistd.h> - #include "vesa.h" - - /* All drivers initialising the SW cursor need this */ -@@ -450,7 +450,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, - intptr_t match_data) - { - ScrnInfoPtr pScrn; -- -+ -+#ifdef __linux__ -+ if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0) { -+ ErrorF("vesa: Refusing to run on UEFI\n"); -+ return FALSE; -+ } -+#endif -+ - pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, - NULL, NULL, NULL, NULL, NULL); - if (pScrn != NULL) { --- -2.20.1 -
meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb renamed from meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb +1 -5
@@ -15,9 +15,5 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" -SRC_URI[md5sum] = "8134201beaf6f77150c7809c3cc802e6" -SRC_URI[sha256sum] = "bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c" +SRC_URI[sha256sum] = "1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659" -SRC_URI += " \ - file://0001-Refuse-to-run-on-UEFI-machines.patch \ - "
Signature · 1 line
2.29.0
PATCH 20/33 webkitgtk: update 2.28.4 -> 2.30.1
In reply to Alexander KanavinDrop 0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch and cross-compile.patch as upstream has removed the code.
Rebase 0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch.
Add a systemd config option, subject to systemd in DISTRO_FEATURES.
---
...1-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 25 ++++---
...-drop-the-hardcoded-introspection-gt.patch | 35 ----------
...build-errors-due-to-WWc-11-narrowing.patch | 66 -------------------
.../webkit/webkitgtk/cross-compile.patch | 23 -------
...ebkitgtk_2.28.4.bb => webkitgtk_2.30.1.bb} | 8 +--
5 files changed, 14 insertions(+), 143 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.28.4.bb => webkitgtk_2.30.1.bb} (93%)meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch +11 -14
@@ -1,4 +1,4 @@ -From 8ee7806ad2d5606967f7a1529a113fb9d1a386de Mon Sep 17 00:00:00 2001 +From b145ab4273c59f4f908cdaff9e267241bd970e93 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 3 Feb 2020 17:06:27 -0800 Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
@@ -13,26 +13,26 @@ missing atomic primitives. Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] Signed-off-by: Khem Raj <[email protected]> + --- - Source/cmake/OptionsGTK.cmake | 2 ++ + Source/cmake/OptionsGTK.cmake | 1 + Source/cmake/OptionsJSCOnly.cmake | 1 + - 2 files changed, 3 insertions(+) + 2 files changed, 2 insertions(+) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index d3beef19..6a92856f 100644 +index 8732e935..9b4fbae7 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake -@@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT - set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") - set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0") - +@@ -32,6 +32,7 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") + if (USER_AGENT_BRANDING) + add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}") + endif () +set(THREADS_PREFER_PTHREAD_FLAG ON) -+ + find_package(Cairo 1.14.0 REQUIRED) find_package(Fontconfig 2.8.0 REQUIRED) - find_package(Freetype 2.4.2 REQUIRED) diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake -index b2e87418..326ade23 100644 +index 316c6240..2f712602 100644 --- a/Source/cmake/OptionsJSCOnly.cmake +++ b/Source/cmake/OptionsJSCOnly.cmake @@ -1,3 +1,4 @@
@@ -40,6 +40,3 @@ index b2e87418..326ade23 100644 find_package(Threads REQUIRED) if (MSVC) --- -2.25.0 -
meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From bed4cf4aaa6aad4172ec9942e9039fb8e1ef68a4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 29 Feb 2016 18:13:39 +0200 -Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc - disabling when cross-compiling - -This was not possible to override from the command line and in OpenEmbedded -(one of the most prominent cross-compilation frameworks) introspection does work fine, -through the use of qemu target emulation. - -Signed-off-by: Alexander Kanavin <[email protected]> - -Upstream-Status: Pending - ---- - Source/cmake/OptionsGTK.cmake | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 661b40e..404441b 100644 ---- a/Source/cmake/OptionsGTK.cmake -+++ b/Source/cmake/OptionsGTK.cmake -@@ -352,12 +352,6 @@ if (ENABLED_COMPILER_SANITIZERS) - set(ENABLE_INTROSPECTION OFF) - endif () - --# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building. --if (CMAKE_CROSSCOMPILING) -- set(ENABLE_GTKDOC OFF) -- set(ENABLE_INTROSPECTION OFF) --endif () -- - # Override the cached variable, gtk-doc does not really work when building on Mac. - if (APPLE) - set(ENABLE_GTKDOC OFF)
meta/recipes-sato/webkit/webkitgtk/0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch deleted +0 -66
66 lines not on this page · raw message
meta/recipes-sato/webkit/webkitgtk/cross-compile.patch deleted +0 -23
@@ -1,23 +0,0 @@ -Disable the tests meant to run when compiling natively - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> - -Index: webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake -=================================================================== ---- webkitgtk-2.14.5.orig/Source/cmake/OptionsCommon.cmake -+++ webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake -@@ -67,8 +67,11 @@ endif () - # Detect Cortex-A53 core if CPU is ARM64 and OS is Linux. - # Query /proc/cpuinfo for each available core and check reported CPU part number: 0xd03 signals Cortex-A53. - # (see Main ID Register in ARM Cortex-A53 MPCore Processor Technical Reference Manual) --set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) --if (WTF_CPU_ARM64 AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) -+if( NOT WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) -+ set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF) -+endif(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE) -+ -+if (WTF_CPU_ARM64 AND NOT CMAKE_CROSSCOMPILING AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) - execute_process(COMMAND nproc OUTPUT_VARIABLE PROC_COUNT) - math(EXPR PROC_MAX ${PROC_COUNT}-1) - foreach (PROC_ID RANGE ${PROC_MAX})
meta/recipes-sato/webkit/webkitgtk_2.30.1.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.28.4.bb +3 -5
@@ -12,16 +12,13 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ - file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ - file://cross-compile.patch \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ - file://0001-clang-11-fix-build-errors-due-to-WWc-11-narrowing.patch \ " -SRC_URI[sha256sum] = "821952e8c9303ed752f1fb1d4283f612c25249d00d705d2b79c2db1bc49c9464" +SRC_URI[sha256sum] = "17c59dfdadb7377192e9b59bc56c8a029c9fad4f38ed732b652bf33d0bd5d6b1" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
@@ -38,7 +35,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ enchant \
@@ -56,6 +53,7 @@ PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" # webkitgtk is full of /usr/bin/env python, particular for generating docs do_configure[postfuncs] += "setup_python_link"
Signature · 1 line
2.29.0
PATCH 19/33 lttng-modules: update 2.12.2 -> 2.12.3
In reply to Alexander KanavinDrop a pile of backports.
---
...ndency-issue-when-building-in-tree-w.patch | 54 --
...ce.h-into-the-mmu-sub-directory-v5.9.patch | 41 -
...Make-kvm_mmu_page-definition-and-acc.patch | 39 -
...he-length-of-per-inode-prealloc-list.patch | 84 --
...e-via-a-block-bitmap-read-is-prefetc.patch | 63 --
...al-of-smp_-read_barrier_depends-v5.9.patch | 391 --------
...teback-Drop-I_DIRTY_TIME_EXPIRE-v5.9.patch | 59 --
...x-sync-livelock-due-to-b_dirty_time-.patch | 117 ---
...es-for-ext4_discard_preallocations-a.patch | 52 -
.../0010-Fix-system-call-filter-table.patch | 918 ------------------
...ules_2.12.2.bb => lttng-modules_2.12.3.bb} | 12 +-
11 files changed, 1 insertion(+), 1829 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Kconfig-fix-dependency-issue-when-building-in-tree-w.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-fix-Move-mmutrace.h-into-the-mmu-sub-directory-v5.9.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-KVM-x86-mmu-Make-kvm_mmu_page-definition-and-acc.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-fix-ext4-limit-the-length-of-per-inode-prealloc-list.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0005-fix-ext4-indicate-via-a-block-bitmap-read-is-prefetc.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0006-fix-removal-of-smp_-read_barrier_depends-v5.9.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0007-fix-writeback-Drop-I_DIRTY_TIME_EXPIRE-v5.9.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0008-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0009-fix-version-ranges-for-ext4_discard_preallocations-a.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0010-Fix-system-call-filter-table.patch
rename meta/recipes-kernel/lttng/{lttng-modules_2.12.2.bb => lttng-modules_2.12.3.bb} (64%)meta/recipes-kernel/lttng/lttng-modules/0001-Kconfig-fix-dependency-issue-when-building-in-tree-w.patch deleted +0 -54
@@ -1,54 +0,0 @@ -From ff4d1d7e85be94ef43709cd698f0ec9a12f247d1 Mon Sep 17 00:00:00 2001 -From: Beniamin Sandu <[email protected]> -Date: Thu, 13 Aug 2020 16:24:39 +0300 -Subject: [PATCH 01/10] Kconfig: fix dependency issue when building in-tree - without CONFIG_FTRACE - -When building in-tree, one could disable CONFIG_FTRACE from kernel -config which will leave CONFIG_TRACEPOINTS selected by LTTNG modules, -but generate a lot of linker errors like below because it leaves out -other stuff, e.g.: - -trace.c:(.text+0xd86b): undefined reference to `trace_event_buffer_reserve' -ld: trace.c:(.text+0xd8de): undefined reference to `trace_event_buffer_commit' -ld: trace.c:(.text+0xd926): undefined reference to `event_triggers_call' -ld: trace.c:(.text+0xd942): undefined reference to `trace_event_ignore_this_pid' -ld: net/mac80211/trace.o: in function `trace_event_raw_event_drv_tdls_cancel_channel_switch': - -It appears to be caused by the fact that TRACE_EVENT macros in the Linux -kernel depend on the Ftrace ring buffer as soon as CONFIG_TRACEPOINTS is -enabled. - -Steps to reproduce: - -- Get a clone of an upstream stable kernel and use scripts/built-in.sh on it - -- Configure a standard x86-64 build, enable built-in LTTNG but disable - CONFIG_FTRACE from Kernel Hacking-->Tracers using menuconfig - -- Build will fail at linking stage - -Upstream-Status: Backport - -Signed-off-by: Beniamin Sandu <[email protected]> -Signed-off-by: Mathieu Desnoyers <[email protected]> ---- - Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Kconfig b/Kconfig -index acdab73..10eccff 100644 ---- a/Kconfig -+++ b/Kconfig -@@ -2,7 +2,7 @@ - - config LTTNG - tristate "LTTng support" -- select TRACEPOINTS -+ select TRACING - help - LTTng is an open source tracing framework for Linux. - --- -2.19.1 -
meta/recipes-kernel/lttng/lttng-modules/0002-fix-Move-mmutrace.h-into-the-mmu-sub-directory-v5.9.patch deleted +0 -41
41 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0003-fix-KVM-x86-mmu-Make-kvm_mmu_page-definition-and-acc.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From f16315cc45c4c6b880de541bb092ca18a13952b7 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <[email protected]> -Date: Mon, 10 Aug 2020 11:36:03 -0400 -Subject: [PATCH 03/10] fix: KVM: x86/mmu: Make kvm_mmu_page definition and - accessor internal-only (v5.9) - - commit 985ab2780164698ec6e7d73fad523d50449261dd - Author: Sean Christopherson <[email protected]> - Date: Mon Jun 22 13:20:32 2020 -0700 - - KVM: x86/mmu: Make kvm_mmu_page definition and accessor internal-only - - Make 'struct kvm_mmu_page' MMU-only, nothing outside of the MMU should - be poking into the gory details of shadow pages. - -Upstream-Status: Backport - -Change-Id: Ia5c1b9c49c2b00dad1d5b17c50c3dc730dafda20 -Signed-off-by: Michael Jeanson <[email protected]> -Signed-off-by: Mathieu Desnoyers <[email protected]> ---- - probes/lttng-probe-kvm-x86-mmu.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/probes/lttng-probe-kvm-x86-mmu.c b/probes/lttng-probe-kvm-x86-mmu.c -index 5a7ef1e..8f98186 100644 ---- a/probes/lttng-probe-kvm-x86-mmu.c -+++ b/probes/lttng-probe-kvm-x86-mmu.c -@@ -25,6 +25,7 @@ - #include <wrapper/tracepoint.h> - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) -+#include <../../arch/x86/kvm/mmu/mmu_internal.h> - #include <../../arch/x86/kvm/mmu/mmutrace.h> - #else - #include <../../arch/x86/kvm/mmutrace.h> --- -2.19.1 -
meta/recipes-kernel/lttng/lttng-modules/0004-fix-ext4-limit-the-length-of-per-inode-prealloc-list.patch deleted +0 -84
84 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0005-fix-ext4-indicate-via-a-block-bitmap-read-is-prefetc.patch deleted +0 -63
63 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0006-fix-removal-of-smp_-read_barrier_depends-v5.9.patch deleted +0 -391
391 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0007-fix-writeback-Drop-I_DIRTY_TIME_EXPIRE-v5.9.patch deleted +0 -59
59 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0008-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch deleted +0 -117
117 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0009-fix-version-ranges-for-ext4_discard_preallocations-a.patch deleted +0 -52
52 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0010-Fix-system-call-filter-table.patch deleted +0 -918
918 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules_2.12.3.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.12.2.bb +1 -11
@@ -11,19 +11,9 @@ include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ - file://0001-Kconfig-fix-dependency-issue-when-building-in-tree-w.patch \ - file://0002-fix-Move-mmutrace.h-into-the-mmu-sub-directory-v5.9.patch \ - file://0003-fix-KVM-x86-mmu-Make-kvm_mmu_page-definition-and-acc.patch \ - file://0004-fix-ext4-limit-the-length-of-per-inode-prealloc-list.patch \ - file://0005-fix-ext4-indicate-via-a-block-bitmap-read-is-prefetc.patch \ - file://0006-fix-removal-of-smp_-read_barrier_depends-v5.9.patch \ - file://0007-fix-writeback-Drop-I_DIRTY_TIME_EXPIRE-v5.9.patch \ - file://0008-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch \ - file://0009-fix-version-ranges-for-ext4_discard_preallocations-a.patch \ - file://0010-Fix-system-call-filter-table.patch \ " -SRC_URI[sha256sum] = "df50bc3bd58679705714f17721acf619a8b0cedc694f8a97052aa5099626feca" +SRC_URI[sha256sum] = "673ef85c9f03e9b8fed10795e09d4e68add39404b70068d08b10f7b85754d7f0" export INSTALL_MOD_DIR="kernel/lttng-modules"
Signature · 1 line
2.29.0
PATCH 21/33 dos2unix: update 7.4.1 -> 7.4.2
In reply to Alexander KanavinLicense-Update: copyright years
---
.../dos2unix/{dos2unix_7.4.1.bb => dos2unix_7.4.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/dos2unix/{dos2unix_7.4.1.bb => dos2unix_7.4.2.bb} (88%)meta/recipes-support/dos2unix/dos2unix_7.4.2.bb renamed from meta/recipes-support/dos2unix/dos2unix_7.4.1.bb +2 -2
@@ -6,12 +6,12 @@ HOMEPAGE = "http://waterlan.home.xs4all.nl/dos2unix.html" SECTION = "support" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=0c977b18f0a384d03597a517d7d03e32" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=8a7c3499a1142df819e727253cd53a12" SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix" UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P<pver>(\d+(\.\d+)+))" -SRCREV = "0490f0723b1a0851b17343f6164915f3474b5197" +SRCREV = "72596f0ae21faa25a07a872d4843bc885475115d" S = "${WORKDIR}/git/dos2unix"
Signature · 1 line
2.29.0
PATCH 22/33 gnutls: update 3.16.4 -> 3.16.5
In reply to Alexander Kanavin---
...se-to-GPLv2.1-to-keep-with-LICENSE-f.patch | 90 --------------
.../gnutls/gnutls/CVE-2020-24659.patch | 117 ------------------
.../{gnutls_3.6.14.bb => gnutls_3.6.15.bb} | 6 +-
3 files changed, 2 insertions(+), 211 deletions(-)
delete mode 100644 meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch
delete mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2020-24659.patch
rename meta/recipes-support/gnutls/{gnutls_3.6.14.bb => gnutls_3.6.15.bb} (91%)meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch deleted +0 -90
@@ -1,90 +0,0 @@ -From c0ae3f659c6c130d151378ba4d7d861e3b7b970f Mon Sep 17 00:00:00 2001 -From: Lei Maohui <[email protected]> -Date: Wed, 8 Jul 2020 14:50:27 +0900 -Subject: [PATCH] Modied the license to GPLv2.1+ to keep with LICENSE file. - -Signed-off-by: Lei Maohui <[email protected]> -Please reference to https://gitlab.com/gnutls/gnutls/-/issues/1018. -Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/merge_requests/1285]. ---- - lib/x509/krb5.c | 20 +++++++++++--------- - lib/x509/krb5.h | 20 +++++++++++--------- - 2 files changed, 22 insertions(+), 18 deletions(-) - -diff --git a/lib/x509/krb5.c b/lib/x509/krb5.c -index 7fe84e6..d68c737 100644 ---- a/lib/x509/krb5.c -+++ b/lib/x509/krb5.c -@@ -1,21 +1,23 @@ - /* - * Copyright (C) 2015 Red Hat, Inc. - * -+ * Author: Nikos Mavrogiannopoulos -+ * - * This file is part of GnuTLS. - * -- * GnuTLS is free software: you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by -- * the Free Software Foundation, either version 3 of the License, or -- * (at your option) any later version. -+ * The GnuTLS is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License -+ * as published by the Free Software Foundation; either version 2.1 of -+ * the License, or (at your option) any later version. - * -- * GnuTLS is distributed in the hope that it will be useful, but -+ * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with this program. If not, see <https://www.gnu.org/licenses/> - * -- * You should have received a copy of the GNU General Public License -- * along with this program. If not, see -- * <https://www.gnu.org/licenses/>. - */ - - #include <config.h> -diff --git a/lib/x509/krb5.h b/lib/x509/krb5.h -index d8926af..815bb28 100644 ---- a/lib/x509/krb5.h -+++ b/lib/x509/krb5.h -@@ -1,21 +1,23 @@ - /* - * Copyright (C) 2015 Red Hat, Inc. - * -+ * Author: Nikos Mavrogiannopoulos -+ * - * This file is part of GnuTLS. - * -- * GnuTLS is free software: you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by -- * the Free Software Foundation, either version 3 of the License, or -- * (at your option) any later version. -+ * The GnuTLS is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License -+ * as published by the Free Software Foundation; either version 2.1 of -+ * the License, or (at your option) any later version. - * -- * GnuTLS is distributed in the hope that it will be useful, but -+ * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with this program. If not, see <https://www.gnu.org/licenses/> - * -- * You should have received a copy of the GNU General Public License -- * along with this program. If not, see -- * <https://www.gnu.org/licenses/>. - */ - - #ifndef GNUTLS_LIB_X509_KRB5_H --- -2.17.1 -
meta/recipes-support/gnutls/gnutls/CVE-2020-24659.patch deleted +0 -117
117 lines not on this page · raw message
meta/recipes-support/gnutls/gnutls_3.6.15.bb renamed from meta/recipes-support/gnutls/gnutls_3.6.14.bb +2 -4
@@ -19,11 +19,9 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ file://arm_eabi.patch \ - file://0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch \ - file://CVE-2020-24659.patch \ -" + " -SRC_URI[sha256sum] = "5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63" +SRC_URI[sha256sum] = "0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
Signature · 1 line
2.29.0
PATCH 23/33 libcap: update 2.43 -> 2.44
In reply to Alexander KanavinRebase the patches.
---
...-tests-do-not-statically-link-a-test.patch | 38 +++++++------------
...-tests-do-not-run-target-executables.patch | 14 +++----
.../libcap/{libcap_2.43.bb => libcap_2.44.bb} | 2 +-
3 files changed, 22 insertions(+), 32 deletions(-)
rename meta/recipes-support/libcap/{libcap_2.43.bb => libcap_2.44.bb} (96%)meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch +14 -24
@@ -1,4 +1,4 @@ -From e4fe6890e07821d60f01f000a95f7944f3d68139 Mon Sep 17 00:00:00 2001 +From 03e925f0d68bc51e1acf1ac2014a9c2452c664bf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 15 Jan 2020 17:16:28 +0100 Subject: [PATCH] tests: do not statically link a test
@@ -9,35 +9,25 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> --- - tests/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + tests/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile -index 876a8b9..93a0e3a 100644 +index d569650..f5ca377 100644 --- a/tests/Makefile +++ b/tests/Makefile -@@ -26,23 +26,23 @@ psx_test: psx_test.c $(DEPS) - run_libcap_psx_test: libcap_psx_test +@@ -11,7 +11,7 @@ ifeq ($(DYNAMIC),yes) + LDPATH = LD_LIBRARY_PATH=../libcap + DEPSBUILD = all + else +-LDFLAGS += --static ++LDFLAGS += + DEPSBUILD = libcap.a libpsx.a + endif - libcap_psx_test: libcap_psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static -+ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create - - run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop - sudo ./libcap_launch_test - sudo ./libcap_psx_launch_test - - libcap_launch_test: libcap_launch_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) --static -+ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) - - # this varies only slightly from the above insofar as it currently - # only links in the pthreads fork support. TODO() we need to change - # the source to do something interesting with pthreads. - libcap_psx_launch_test: libcap_launch_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) -DWITH_PTHREADS $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static -+ $(CC) $(CFLAGS) $(IPATH) -DWITH_PTHREADS $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create +@@ -51,7 +51,7 @@ libcap_psx_launch_test: libcap_launch_test.c $(DEPS) + # This one runs in a chroot with no shared library files. noop: noop.c - $(CC) $(CFLAGS) $< -o $@ --static + $(CC) $(CFLAGS) $< -o $@
meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch +7 -7
@@ -1,4 +1,4 @@ -From 5583b48c04d5bf50b56473d88d990c3f0bc45c14 Mon Sep 17 00:00:00 2001 +From 7744c1f678f5226a151bc6b2a254a56835229d91 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 20 Dec 2019 16:54:05 +0100 Subject: [PATCH] tests: do not run target executables
@@ -11,20 +11,20 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile -index bfedbc2..876a8b9 100644 +index 8956d5d..d569650 100644 --- a/tests/Makefile +++ b/tests/Makefile -@@ -19,13 +19,11 @@ sudotest: test run_libcap_launch_test run_libcap_launch_test +@@ -27,13 +27,11 @@ sudotest: test run_libcap_launch_test run_libcap_launch_test install: all run_psx_test: psx_test -- ./psx_test +- $(LDPATH) ./psx_test psx_test: psx_test.c $(DEPS) - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) run_libcap_psx_test: libcap_psx_test -- ./libcap_psx_test +- $(LDPATH) ./libcap_psx_test libcap_psx_test: libcap_psx_test.c $(DEPS) - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
meta/recipes-support/libcap/libcap_2.44.bb renamed from meta/recipes-support/libcap/libcap_2.43.bb +1 -1
@@ -12,7 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[sha256sum] = "512a0e5fc4c1e06d472a20da26aa96a9b9bf2a26b23f094f77f1b8da56cc427f" +SRC_URI[sha256sum] = "92188359cd5be86e8e5bd3f6483ac6ce582264f912398937ef763def2205c8e1" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
Signature · 1 line
2.29.0
PATCH 24/33 vte: update 0.60.3 -> 0.62.1
In reply to Alexander Kanavin---
...EXITCODE-macro-for-non-glibc-systems.patch | 46 ++++++-------------
.../vte/{vte_0.60.3.bb => vte_0.62.1.bb} | 3 +-
2 files changed, 16 insertions(+), 33 deletions(-)
rename meta/recipes-support/vte/{vte_0.60.3.bb => vte_0.62.1.bb} (92%)meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +15 -31
@@ -1,7 +1,10 @@ -From f78988d3bb5929c857e788a86c7919d6a4ffacc9 Mon Sep 17 00:00:00 2001 +From de9639baac792327c701e509258b8a13f6959e82 Mon Sep 17 00:00:00 2001 From: Danilo Spinella <[email protected]> Date: Thu, 21 Mar 2019 14:19:26 +0100 Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Upstream-Status: Submitted [1]
@@ -10,40 +13,24 @@ Signed-off-by: Andreas Müller <[email protected]> [1] https://gitlab.gnome.org/GNOME/vte/issues/72 --- - src/missing.hh | 21 +++++++++++++++++++++ - src/widget.cc | 1 + - 2 files changed, 22 insertions(+) - create mode 100644 src/missing.hh + src/missing.hh | 4 ++++ + src/widget.cc | 1 + + 2 files changed, 5 insertions(+) diff --git a/src/missing.hh b/src/missing.hh -new file mode 100644 -index 00000000..1baa993d ---- /dev/null +index 0742270..30ede62 100644 +--- a/src/missing.hh +++ b/src/missing.hh -@@ -0,0 +1,21 @@ -+/* Copyright 2019 Danilo Spinella -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 3 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ +@@ -33,3 +33,7 @@ int fdwalk(int (*cb)(void* data, int fd), + char* strchrnul(char const* s, + int c); + #endif + +#ifndef W_EXITCODE +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) +#endif -+ diff --git a/src/widget.cc b/src/widget.cc -index 331ddba9..555a4adf 100644 +index 44a2271..0668735 100644 --- a/src/widget.cc +++ b/src/widget.cc @@ -21,6 +21,7 @@
@@ -52,8 +39,5 @@ index 331ddba9..555a4adf 100644 #include <sys/wait.h> // for W_EXITCODE +#include "missing.hh" // for W_EXITCODE on non-glibc systems + #include <exception> #include <new> - #include <string> --- -2.21.0 -
meta/recipes-support/vte/vte_0.62.1.bb renamed from meta/recipes-support/vte/vte_0.60.3.bb +1 -2
@@ -18,8 +18,7 @@ inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-intros # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" -SRC_URI[archive.md5sum] = "4214712ecab2d50e2a3a07897c3ada49" -SRC_URI[archive.sha256sum] = "feb76e1181a357d86112d447a08d127e2081438df76ece83243b18609dd9822a" +SRC_URI[archive.sha256sum] = "c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
Signature · 1 line
2.29.0
PATCH 25/33 libhandy: upgrade 0.0.13 -> 1.0.0
In reply to Alexander Kanavin--- meta/recipes-gnome/libhandy/libhandy_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-gnome/libhandy/libhandy_git.bb +2 -2
@@ -3,9 +3,9 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://gitlab.gnome.org/GNOME/${BPN}.git;protocol=https" -SRCREV = "7a193d7692c9c76a1a94f17c4d30b585f77d177c" +SRCREV = "94313c206258860b2428712e7ece1d02c5177857" S = "${WORKDIR}/git" -PV = "0.0.13" +PV = "1.0.0" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled'
Signature · 1 line
2.29.0
PATCH 26/33 libportal: add a recipe
In reply to Alexander KanavinThis is a new build requirement of epiphany browser.
--- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-gnome/libportal/libportal_0.3.bb | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 meta/recipes-gnome/libportal/libportal_0.3.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -367,6 +367,7 @@ RECIPE_MAINTAINER_pn-libpcre = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER_pn-libpcre2 = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-libpipeline = "Wang Mingyu <[email protected]>" RECIPE_MAINTAINER_pn-libpng = "Anuj Mittal <[email protected]>" +RECIPE_MAINTAINER_pn-libportal = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libproxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-libpthread-stubs = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libpsl = "Anuj Mittal <[email protected]>"
meta/recipes-gnome/libportal/libportal_0.3.bb new file +13 -0
@@ -0,0 +1,13 @@ +SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals." +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https" +SRCREV = "a609e06d0c4adc5c510cf9ac7b060db3d368e78f" +S = "${WORKDIR}/git" + +GTKDOC_MESON_OPTION = 'gtk_doc' + +inherit meson gtk-doc + +DEPENDS += "glib-2.0 glib-2.0-native"
Signature · 1 line
2.29.0
PATCH 27/33 epiphany: upgrade 3.36.4 -> 3.38.1
In reply to Alexander Kanavinlibportal is a new hard dependency.
---
.../epiphany/{epiphany_3.36.4.bb => epiphany_3.38.1.bb} | 4 ++--
.../0002-help-meson.build-disable-the-use-of-yelp.patch | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.36.4.bb => epiphany_3.38.1.bb} (83%)meta/recipes-gnome/epiphany/epiphany_3.38.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.36.4.bb +2 -2
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ gsettings-desktop-schemas libxml2-native \ - glib-2.0 glib-2.0-native json-glib libdazzle libhandy" + glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg
@@ -14,7 +14,7 @@ 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.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf" +SRC_URI[archive.sha256sum] = "59b7576acb11fbb52eaca6dbf6fce28664de5c915ca2580c47f0b08ba83d2843" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch +3 -3
@@ -1,4 +1,4 @@ -From 0048ae2d225d25cc58f378718ca6f9ddb1a228f9 Mon Sep 17 00:00:00 2001 +From 3725c254f1d1d8204fa299e71c1e2bfd0ff6a634 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 31 Jan 2018 15:50:38 +0200 Subject: [PATCH] help/meson.build: disable the use of yelp
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/help/meson.build b/help/meson.build -index fddcf4c..f7d76c6 100644 +index 484860c..d9b2e80 100644 --- a/help/meson.build +++ b/help/meson.build @@ -32,7 +32,7 @@ help_media = [ - 'media/web-browser.png' + 'media/epiphany-private-3-36.png' ] -gnome.yelp(meson.project_name(),
Signature · 1 line
2.29.0
PATCH 28/33 gtk-doc: upgrade 1.32 -> 1.33.0
In reply to Alexander Kanavin---
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | 2 +-
.../gtk-doc/{gtk-doc_1.32.bb => gtk-doc_1.33.0.bb} | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.32.bb => gtk-doc_1.33.0.bb} (94%)meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +1 -1
@@ -1,4 +1,4 @@ -From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001 +From ebb0f7313a0931f646e86badce2627eff2fa37a8 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.33.0.bb renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb +1 -2
@@ -18,8 +18,7 @@ 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] = "07764836262e154e94922e5f2aa476ae" -SRC_URI[archive.sha256sum] = "de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c" +SRC_URI[archive.sha256sum] = "d5e3b3f837174d246fa8482455740627efec1e5210aa15d0c7989ca68f72bb51" 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 \
Signature · 1 line
2.29.0
PATCH 29/33 rpm: adjust MIPS64 N32 support
In reply to Alexander Kanavinupstream has switched from libmagic to elfutils to determine file 'colors', and so this adapts the existing patch accordingly.
--- ...olor-setting-for-mips64_n32-binaries.patch | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-)
meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch +18 -10
@@ -1,20 +1,21 @@ -From e3eff024826550aec4a6a5baef7210a29faf299d Mon Sep 17 00:00:00 2001 +From 5492ac3c716020a27a25253bbffe810db43202bf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 9 Mar 2017 18:54:02 +0200 Subject: [PATCH] Add a color setting for mips64_n32 binaries Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- - build/rpmfc.c | 1 + + build/rpmfc.c | 4 ++++ rpmrc.in | 2 ++ - 2 files changed, 3 insertions(+) + 2 files changed, 6 insertions(+) diff --git a/build/rpmfc.c b/build/rpmfc.c -index d38a10916..c8e2f876a 100644 +index 10c380ee9..b7655aa93 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c -@@ -622,6 +622,7 @@ exit: +@@ -639,6 +639,7 @@ exit: static const struct rpmfcTokens_s rpmfcTokens[] = { { "directory", RPMFC_INCLUDE },
@@ -22,11 +23,21 @@ index d38a10916..c8e2f876a 100644 { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, +@@ -1149,6 +1150,9 @@ static uint32_t getElfColor(const char *fn) + color = RPMFC_ELF32; + break; + } ++ if (ehdr.e_machine == EM_MIPS || ehdr.e_machine == EM_MIPS_RS3_LE) ++ if (ehdr.e_flags & EF_MIPS_ABI2) ++ color = RPMFC_ELFMIPSN32; + elf_end(elf); + } + close(fd); diff --git a/rpmrc.in b/rpmrc.in -index abc08fc31..f5bc820d8 100644 +index 5bd9ba3e5..f15bb8dad 100644 --- a/rpmrc.in +++ b/rpmrc.in -@@ -133,6 +133,8 @@ archcolor: mipsr6el 1 +@@ -137,6 +137,8 @@ archcolor: mipsr6el 1 archcolor: mips64r6 2 archcolor: mips64r6el 2
@@ -35,6 +46,3 @@ index abc08fc31..f5bc820d8 100644 archcolor: m68k 1 archcolor: m68kmint 1 --- -2.11.0 -
Signature · 1 line
2.29.0
PATCH 30/33 apt: remove host contamination with gtest
In reply to Alexander Kanavin--- ...t-configure-packages-on-installation.patch | 2 +- ...-init-tables-from-dpkg-configuration.patch | 2 +- ...n-dpkg-configure-a-at-the-end-of-our.patch | 2 +- ...ibapt-do-not-use-gtest-from-the-host.patch | 40 +++++++++++++++++++ meta/recipes-devtools/apt/apt_1.8.2.1.bb | 1 + 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/apt/apt/0001-test-libapt-do-not-use-gtest-from-the-host.patch
meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch +1 -1
@@ -1,4 +1,4 @@ -From 1ad21140787a6b8b0f774f75b50444d2c30a56f6 Mon Sep 17 00:00:00 2001 +From 96d23fc57d1ff9c851d563d6d6a6c4752dc4f1b6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 21 May 2020 20:28:12 +0000 Subject: [PATCH] Do not configure packages on installation
meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch +1 -1
@@ -1,4 +1,4 @@ -From b18d7aa7d71b53b86bac21cd1d8c3accabb28f2b Mon Sep 17 00:00:00 2001 +From bf45c314867e5fb12141803fba06f3e45679d628 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
meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +1 -1
@@ -1,4 +1,4 @@ -From 742fbb243f99e940c3e6b31296f7f416f550a57a Mon Sep 17 00:00:00 2001 +From 34700bebc52659e7e3eecd252f65bd36e669eee8 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
meta/recipes-devtools/apt/apt/0001-test-libapt-do-not-use-gtest-from-the-host.patch new file +40 -0
@@ -0,0 +1,40 @@ +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_1.8.2.1.bb +1 -0
@@ -8,6 +8,7 @@ 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 = " \
Signature · 1 line
2.29.0
PATCH 31/33 opkg-utils: correct priority matching in update-alternatives
In reply to Alexander Kanavin--- ...lternatives-correctly-match-priority.patch | 28 +++++++++++++++++++ .../opkg-utils/opkg-utils_0.4.3.bb | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-correctly-match-priority.patch
meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-correctly-match-priority.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 26206005dacd61380663bb4fd9b18178bb33665b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Sat, 24 Oct 2020 21:59:27 +0200 +Subject: [PATCH] update-alternatives: correctly match priority + +It should always be at the end of string, otherwise something +like "/usr/bin/python3.9-config 123" will erroneously match +against priority 9. + +Upstream-Status: Submitted +Signed-off-by: Alexander Kanavin <[email protected]> +--- + update-alternatives | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/update-alternatives b/update-alternatives +index 1389b3f..e0b31bf 100644 +--- a/update-alternatives ++++ b/update-alternatives +@@ -94,7 +94,7 @@ add_alt() { + local path="$2" + local priority="$3" + remove_alt $name $path +- if grep -qw "$priority" $ad/$name; then ++ if grep -qw "$priority"$ $ad/$name; then + echo "Warn: update-alternatives: $name has multiple providers with the same priority, please check $ad/$name for details" + fi + echo "$path $priority" >> $ad/$name
meta/recipes-devtools/opkg-utils/opkg-utils_0.4.3.bb +3 -2
@@ -7,8 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986" PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" -SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ -" +SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://0001-update-alternatives-correctly-match-priority.patch \ + " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" SRC_URI[md5sum] = "7bbadb3c381f3ea935b21d3bb8cc4671"
Signature · 1 line
2.29.0
PATCH 32/33 libxml2: add a patch to fix python 3.9 support
In reply to Alexander Kanavin--- .../libxml/libxml2/fix-python39.patch | 92 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 93 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/fix-python39.patch
meta/recipes-core/libxml/libxml2/fix-python39.patch new file +92 -0
@@ -0,0 +1,92 @@ +From e4fb36841800038c289997432ca547c9bfef9db1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <[email protected]> +Date: Fri, 28 Feb 2020 12:48:14 +0100 +Subject: [PATCH] Parenthesize Py<type>_Check() in ifs + +In C, if expressions should be parenthesized. +PyLong_Check, PyUnicode_Check etc. happened to expand to a parenthesized +expression before, but that's not API to rely on. + +Since Python 3.9.0a4 it needs to be parenthesized explicitly. + +Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149 +--- + python/libxml.c | 4 ++-- + python/types.c | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/python/libxml.c b/python/libxml.c +index bc676c4e0..81e709f34 100644 +--- a/python/libxml.c ++++ b/python/libxml.c +@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) { + lenread = PyBytes_Size(ret); + data = PyBytes_AsString(ret); + #ifdef PyUnicode_Check +- } else if PyUnicode_Check (ret) { ++ } else if (PyUnicode_Check (ret)) { + #if PY_VERSION_HEX >= 0x03030000 + Py_ssize_t size; + const char *tmp; +@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) { + lenread = PyBytes_Size(ret); + data = PyBytes_AsString(ret); + #ifdef PyUnicode_Check +- } else if PyUnicode_Check (ret) { ++ } else if (PyUnicode_Check (ret)) { + #if PY_VERSION_HEX >= 0x03030000 + Py_ssize_t size; + const char *tmp; +diff --git a/python/types.c b/python/types.c +index c2bafeb19..ed284ec74 100644 +--- a/python/types.c ++++ b/python/types.c +@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj) + if (obj == NULL) { + return (NULL); + } +- if PyFloat_Check (obj) { ++ if (PyFloat_Check (obj)) { + ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj)); +- } else if PyLong_Check(obj) { ++ } else if (PyLong_Check(obj)) { + #ifdef PyLong_AS_LONG + ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj)); + #else + ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj)); + #endif + #ifdef PyBool_Check +- } else if PyBool_Check (obj) { ++ } else if (PyBool_Check (obj)) { + + if (obj == Py_True) { + ret = xmlXPathNewBoolean(1); +@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj) + ret = xmlXPathNewBoolean(0); + } + #endif +- } else if PyBytes_Check (obj) { ++ } else if (PyBytes_Check (obj)) { + xmlChar *str; + + str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj), + PyBytes_GET_SIZE(obj)); + ret = xmlXPathWrapString(str); + #ifdef PyUnicode_Check +- } else if PyUnicode_Check (obj) { ++ } else if (PyUnicode_Check (obj)) { + #if PY_VERSION_HEX >= 0x03030000 + xmlChar *str; + const char *tmp; +@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj) + ret = xmlXPathWrapString(str); + #endif + #endif +- } else if PyList_Check (obj) { ++ } else if (PyList_Check (obj)) { + int i; + PyObject *node; + xmlNodePtr cur; +-- +GitLab +
meta/recipes-core/libxml/libxml2_2.9.10.bb +1 -0
@@ -23,6 +23,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://CVE-2020-7595.patch \ file://CVE-2019-20388.patch \ file://CVE-2020-24977.patch \ + file://fix-python39.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5"
Signature · 1 line
2.29.0
PATCH 33/33 python: update 3.8.5 -> 3.9.0
In reply to Alexander KanavinDrop 0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch, 0001-configure.ac-fix-LIBPL.patch and 0001-python3-Do-not-hardcode-lib-for-distutils.patch as they are all replaced by the new --platlibdir option to ./configure
Rename 0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch to 0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch and describe the changes better.
License-Update: documentation now dual license under PSF & BSD (not relevant for the recipe.
---
meta/classes/python3-dir.bbclass | 2 +-
...lib-as-location-for-site-packages-an.patch | 214 ------------------
...-search-system-for-headers-libraries.patch | 4 +-
...use-libdir-values-from-configuratio.patch} | 22 +-
...FLAG_REF-always-for-interned-strings.patch | 12 +-
.../python3/0001-configure.ac-fix-LIBPL.patch | 35 ---
...fig-append-STAGING_LIBDIR-python-sys.patch | 2 +-
...n3-Do-not-hardcode-lib-for-distutils.patch | 43 ----
...asename-to-replace-CC-for-checking-c.patch | 26 +--
...report-missing-dependencies-for-disa.patch | 2 +-
...tutils-prefix-is-inside-staging-area.patch | 38 ++--
.../python/python3/python-config.patch | 8 +-
.../{python3_3.8.5.bb => python3_3.9.0.bb} | 24 +-
13 files changed, 74 insertions(+), 358 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch
rename meta/recipes-devtools/python/python3/{0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch => 0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch} (57%)
delete mode 100644 meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch
delete mode 100644 meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch
rename meta/recipes-devtools/python/{python3_3.8.5.bb => python3_3.9.0.bb} (94%)meta/classes/python3-dir.bbclass +1 -1
@@ -1,4 +1,4 @@ -PYTHON_BASEVERSION = "3.8" +PYTHON_BASEVERSION = "3.9" PYTHON_ABI = "" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3"
meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch deleted +0 -214
214 lines not on this page · raw message
meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch +2 -2
@@ -1,4 +1,4 @@ -From b880e78bf4a1852e260188e6df3ec6034403d2fc Mon Sep 17 00:00:00 2001 +From 9da913bf5f39c6fe737219af7419170574d6fbfb Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <[email protected]> Date: Wed, 4 Mar 2020 00:06:42 +0000 Subject: [PATCH] Don't search system for headers/libraries
@@ -11,7 +11,7 @@ Signed-off-by: Jeremy Puhlman <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index 7208cd0..c0bd0ad 100644 +index a0bf9ea..da099bf 100644 --- a/setup.py +++ b/setup.py @@ -674,8 +674,8 @@ class PyBuildExt(build_ext):
meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch renamed from meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch +13 -9
@@ -1,27 +1,28 @@ -From a21f4f8fa5e5c0601898740b4ac08ec84f41e190 Mon Sep 17 00:00:00 2001 +From deeedd1b8799294ab276ab7dbbfdb59c1dacc9a2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> -Date: Thu, 18 Apr 2019 17:11:06 +0200 -Subject: [PATCH] Lib/sysconfig.py: fix another place where 'lib' is hardcoded - as the library path +Date: Thu, 22 Oct 2020 13:10:34 +0200 +Subject: [PATCH] Lib/sysconfig.py: use libdir values from configuration file + +This allows correctly substituting them for target installs using +native python. -Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> --- Lib/sysconfig.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index d15cec8..87fa5e6 100644 +index bf04ac5..ed0462b 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -20,10 +20,10 @@ __all__ = [ _INSTALL_SCHEMES = { 'posix_prefix': { -- 'stdlib': '{installed_base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', +- 'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}', +- 'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages', + 'stdlib': '{LIBDEST}', + 'platstdlib': '{LIBDEST}', + 'purelib': '{LIBDEST}/site-packages',
@@ -29,3 +30,6 @@ index d15cec8..87fa5e6 100644 'include': '{installed_base}/include/python{py_version_short}{abiflags}', 'platinclude': +-- +2.24.0 +
meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch +5 -7
@@ -1,19 +1,20 @@ -From 6c8ea7c1dacd42f3ba00440231ec0e6b1a38300d Mon Sep 17 00:00:00 2001 +From 9f63e83b1cec872917647b11155edaffe399d103 Mon Sep 17 00:00:00 2001 From: Inada Naoki <[email protected]> Date: Sat, 14 Jul 2018 00:46:11 +0900 Subject: [PATCH] Use FLAG_REF always for interned strings Upstream-Status: Submitted [https://github.com/python/cpython/pull/8226] Signed-off-by: Joshua Watt <[email protected]> + --- Python/marshal.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Python/marshal.c b/Python/marshal.c -index 6d06266c6a..51db2e3b2e 100644 +index c4538bd..2437160 100644 --- a/Python/marshal.c +++ b/Python/marshal.c -@@ -275,9 +275,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) +@@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) if (p->version < 3 || p->hashtable == NULL) return 0; /* not writing object references */
@@ -28,8 +29,5 @@ index 6d06266c6a..51db2e3b2e 100644 return 0; + } - entry = _Py_HASHTABLE_GET_ENTRY(p->hashtable, v); + entry = _Py_hashtable_get_entry(p->hashtable, v); if (entry != NULL) { --- -2.21.0 -
meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From acce3d441e7eadadd2d3ce38654155dc43f1f607 Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Fri, 7 Feb 2020 09:36:25 +0800 -Subject: [PATCH] configure.ac: fix LIBPL - -Use LIBDIR rather than prefix/lib, so that it would work when lib64. - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Robert Yang <[email protected]> -Signed-off-by: Li Zhou <[email protected]> -Signed-off-by: Changqing Li <[email protected]> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ce04258..915f475 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4532,9 +4532,9 @@ fi - dnl define LIBPL after ABIFLAGS and LDVERSION is defined. - AC_SUBST(PY_ENABLE_SHARED) - if test x$PLATFORM_TRIPLET = x; then -- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" -+ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}" - else -- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" -+ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" - fi - AC_SUBST(LIBPL) - --- -2.7.4 -
meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +1 -1
@@ -1,4 +1,4 @@ -From bc59d49efff41051034d7fbf5d0c8505e4c3134b Mon Sep 17 00:00:00 2001 +From e65bfe22c858872b08366aff49119d4145a77f40 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append
meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +13 -13
@@ -1,4 +1,4 @@ -From 994783da5c21cab81b6589ed2d4275e665a946f9 Mon Sep 17 00:00:00 2001 +From 5f9eea2c4f8716830f6c8855a3e10872119fae32 Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Mon, 22 Oct 2018 15:19:51 +0800 Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler
@@ -27,7 +27,7 @@ Signed-off-by: Changqing Li <[email protected]> 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index a189d42..0f85486 100644 +index d60f052..e491e24 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h)
@@ -38,7 +38,7 @@ index a189d42..0f85486 100644 # pybuilddir.txt will be created by --generate-posix-vars in the Makefile rm -f pybuilddir.txt -@@ -671,7 +672,7 @@ AC_MSG_RESULT($with_cxx_main) +@@ -689,7 +690,7 @@ AC_MSG_RESULT($with_cxx_main) preset_cxx="$CXX" if test -z "$CXX" then
@@ -47,7 +47,7 @@ index a189d42..0f85486 100644 gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; -@@ -957,7 +958,7 @@ rmdir CaseSensitiveTestDir +@@ -975,7 +976,7 @@ rmdir CaseSensitiveTestDir case $ac_sys_system in hp*|HP*)
@@ -56,7 +56,7 @@ index a189d42..0f85486 100644 cc|*/cc) CC="$CC -Ae";; esac;; esac -@@ -1335,7 +1336,7 @@ else +@@ -1366,7 +1367,7 @@ else fi], [AC_MSG_RESULT(no)]) if test "$Py_LTO" = 'true' ; then
@@ -65,7 +65,7 @@ index a189d42..0f85486 100644 *clang*) AC_SUBST(LLVM_AR) AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) -@@ -1425,7 +1426,7 @@ then +@@ -1456,7 +1457,7 @@ then fi fi LLVM_PROF_ERR=no
@@ -74,7 +74,7 @@ index a189d42..0f85486 100644 *clang*) # Any changes made here should be reflected in the GCC+Darwin case below PGO_PROF_GEN_FLAG="-fprofile-instr-generate" -@@ -1486,7 +1487,7 @@ esac +@@ -1517,7 +1518,7 @@ esac # compiler and platform. BASECFLAGS tweaks need to be made even if the # user set OPT.
@@ -83,7 +83,7 @@ index a189d42..0f85486 100644 *clang*) cc_is_clang=1 ;; -@@ -1622,7 +1623,7 @@ yes) +@@ -1653,7 +1654,7 @@ yes) # ICC doesn't recognize the option, but only emits a warning ## XXX does it emit an unused result warning and can it be disabled?
@@ -92,16 +92,16 @@ index a189d42..0f85486 100644 *icc*) ac_cv_disable_unused_result_warning=no ;; -@@ -1943,7 +1944,7 @@ yes) +@@ -1993,7 +1994,7 @@ yes) + ;; esac - # ICC needs -fp-model strict or floats behave badly -case "$CC" in +case "$cc_basename" in *icc*) + # ICC needs -fp-model strict or floats behave badly CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" - ;; -@@ -2711,7 +2712,7 @@ then +@@ -2765,7 +2766,7 @@ then then LINKFORSHARED="-Wl,--export-dynamic" fi;;
@@ -110,7 +110,7 @@ index a189d42..0f85486 100644 *gcc*) if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null then -@@ -5362,7 +5363,7 @@ if test "$have_gcc_asm_for_x87" = yes; then +@@ -5507,7 +5508,7 @@ if test "$have_gcc_asm_for_x87" = yes; then # Some versions of gcc miscompile inline asm: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch +1 -1
@@ -25,7 +25,7 @@ index 7691258..ec3f2a4 100644 + # There is no need to report missing module dependencies, + # if the modules have been disabled in the first place. -+ self.missing = list(set(self.missing) - set(sysconf_dis)) ++ self.missing = list(set(self.missing) - set(mods_disabled)) + if self.missing: print()
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +20 -18
@@ -1,27 +1,26 @@ -From 064187668fcbefdd39a8cde372bf651124c3e578 Mon Sep 17 00:00:00 2001 +From c52fa7948ef109db1132fdc1aee0b68f8d767b4e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 14 May 2013 15:00:26 -0700 -Subject: [PATCH] python3: Add target and native recipes +Subject: [PATCH 1/2] python3: Add target and native recipes Upstream-Status: Inappropriate [embedded specific] 02/2015 Rebased for Python 3.4.2 -# The proper prefix is inside our staging area. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> -# Signed-off-by: Phil Blundell <[email protected]> -# Signed-off-by: Khem Raj <[email protected]> -# Signed-off-by: Alejandro Hernandez <[email protected]> - +The proper prefix is inside our staging area. +Signed-Off: Michael 'Mickey' Lauer <[email protected]> +Signed-off-by: Phil Blundell <[email protected]> +Signed-off-by: Khem Raj <[email protected]> +Signed-off-by: Alejandro Hernandez <[email protected]> --- Lib/distutils/sysconfig.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 2df348c..4f8db84 100644 +index 4774e12..ccf7d58 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -96,7 +96,9 @@ def get_python_inc(plat_specific=0, prefix=None): +@@ -95,7 +95,9 @@ def get_python_inc(plat_specific=0, prefix=None): If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """
@@ -32,7 +31,7 @@ index 2df348c..4f8db84 100644 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX if os.name == "posix": if python_build: -@@ -139,7 +141,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): +@@ -138,7 +140,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): If 'prefix' is supplied, use it instead of sys.base_prefix or sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """
@@ -47,12 +46,15 @@ index 2df348c..4f8db84 100644 if standard_lib: prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX else: -@@ -147,7 +155,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ lib_basename, "python" + get_python_version()) +@@ -152,7 +160,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): + else: + # Pure Python + libdir = "lib" +- libpython = os.path.join(prefix, libdir, ++ libpython = os.path.join(prefix, lib_basename, + "python" + get_python_version()) if standard_lib: return libpython - else: +-- +2.24.0 +
meta/recipes-devtools/python/python3/python-config.patch +4 -4
@@ -1,4 +1,4 @@ -From 07df0ae0d70cba6d1847fe1c24a71063930bec60 Mon Sep 17 00:00:00 2001 +From 57d073c12e7bede29919117b0141df14015eb27f Mon Sep 17 00:00:00 2001 From: Tyler Hall <[email protected]> Date: Sun, 4 May 2014 20:06:43 -0400 Subject: [PATCH] python-config: Revert to using distutils.sysconfig
@@ -21,7 +21,7 @@ Signed-off-by: Tyler Hall <[email protected]> 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Misc/python-config.in b/Misc/python-config.in -index 727c4a8..c702829 100644 +index ebd99da..13e57ae 100644 --- a/Misc/python-config.in +++ b/Misc/python-config.in @@ -6,7 +6,7 @@
@@ -37,11 +37,11 @@ index 727c4a8..c702829 100644 for opt in opt_flags: if opt == '--prefix': -- print(sysconfig.get_config_var('prefix')) +- print(getvar('prefix')) + print(sysconfig.PREFIX) elif opt == '--exec-prefix': -- print(sysconfig.get_config_var('exec_prefix')) +- print(getvar('exec_prefix')) + print(sysconfig.EXEC_PREFIX) elif opt in ('--includes', '--cflags'):
meta/recipes-devtools/python/python3_3.9.0.bb renamed from meta/recipes-devtools/python/python3_3.8.5.bb +14 -10
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.python.org" LICENSE = "PSFv2" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642" +LIC_FILES_CHKSUM = "file://LICENSE;md5=33223c9ef60c31e3f0e866cb09b65e83" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://run-ptest \
@@ -11,27 +11,24 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://get_module_deps3.py \ file://python3-manifest.json \ file://check_build_completeness.py \ + file://reformat_sysconfig.py \ file://cgi_py.patch \ file://0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \ file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \ file://python-config.patch \ file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \ - file://0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch \ file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ - file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \ file://0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch \ file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ file://crosspythonpath.patch \ - file://reformat_sysconfig.py \ file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ file://0001-test_locale.py-correct-the-test-output-format.patch \ file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ - file://0001-configure.ac-fix-LIBPL.patch \ - file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ + file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \ " SRC_URI_append_class-native = " \
@@ -40,8 +37,7 @@ SRC_URI_append_class-native = " \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[md5sum] = "35b5a3d0254c1c59be9736373d429db7" -SRC_URI[sha256sum] = "e3003ed57db17e617acb382b0cade29a248c6026b1bd8aad1f976e9af66a83b0" +SRC_URI[sha256sum] = "9c73e63c99855709b9be0b3cc9e5b072cb60f37311e8c4e50f15576a0bf82854" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
@@ -52,7 +48,7 @@ CVE_PRODUCT = "python" # This is not exploitable when glibc has CVE-2016-10739 fixed. CVE_CHECK_WHITELIST += "CVE-2019-18348" -PYTHON_MAJMIN = "3.8" +PYTHON_MAJMIN = "3.9" S = "${WORKDIR}/Python-${PV}"
@@ -71,7 +67,7 @@ DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/li DEPENDS_append_class-target = " python3-native" DEPENDS_append_class-nativesdk = " python3-native" -EXTRA_OECONF = " --without-ensurepip --enable-shared" +EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib}" EXTRA_OECONF_append_class-native = " --bindir=${bindir}/${PN}" export CROSSPYTHONPATH="${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/"
@@ -162,6 +158,14 @@ do_install_append() { -e "/^ 'INCLDIRSTOMAKE'/{N; s,/usr/include,${STAGING_INCDIR},g}" \ -e "/^ 'INCLUDEPY'/s,/usr/include,${STAGING_INCDIR},g" \ ${D}${libdir}/python-sysconfigdata/_sysconfigdata.py + + # Unfortunately the following pyc files are non-deterministc due to 'frozenset' + # being written without strict ordering, even with PYTHONHASHSEED = 0 + # Upstream is discussing ways to solve the issue properly, until then let's + # just not install the problematic files. + # More info: http://benno.id.au/blog/2013/01/15/python-determinism + rm ${D}${libdir}/python${PYTHON_MAJMIN}/test/__pycache__/test_range.cpython* + rm ${D}${libdir}/python${PYTHON_MAJMIN}/test/__pycache__/test_xml_etree.cpython* } do_install_append_class-nativesdk () {
Signature · 1 line
2.29.0
Re: [OE-core] [PATCH 04/33] python3-pygobject: upgrade 3.36.1 -> 3.38.0
In reply to Alexander KanavinQuoted 25 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...thon3-pygobject_3.36.1.bb => python3-pygobject_3.38.0.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-pygobject_3.36.1.bb => python3-pygobject_3.38.0.bb} (78%)meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +1
-2@@ -14,8 +14,7 @@ SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ file://0001-Do-not-build-tests.patch \ " -SRC_URI[md5sum] = "ebfebc4533856572281add29f08412bf" -SRC_URI[sha256sum] = "d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f" +SRC_URI[sha256sum] = "0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5" UNKNOWN_CONFIGURE_WHITELIST = "introspection"
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb RDEPENDS_${PN} += "python3-pkgutil" · line 30
Quoted 6 lines
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +1
-1@@ -27,7 +26,7 @@ RDEPENDS_${PN} += "python3-pkgutil" # python3-pycairo is checked on configuration -> DEPENDS # we don't link against python3-pycairo -> RDEPENDS -PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python3-pycairo, python3-pycairo" +PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairo python3-pycairo, python3-pycairo"
is this a bug fix ? or a new change
Quoted 8 lines
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +0
-1BBCLASSEXTEND = "native" PACKAGECONFIG_class-native = "" --2.29.0
Re: [OE-core] [PATCH 25/33] libhandy: upgrade 0.0.13 -> 1.0.0
In reply to Alexander KanavinQuoted 5 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-gnome/libhandy/libhandy_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
perhaps rename the recipe to libhandy_1.0.0.bb and drop setting PV in recipe ?
Quoted 23 lines
meta/recipes-gnome/libhandy/libhandy_git.bb +2
-3@@ -3,9 +3,9 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://gitlab.gnome.org/GNOME/${BPN}.git;protocol=https" -SRCREV = "7a193d7692c9c76a1a94f17c4d30b585f77d177c" +SRCREV = "94313c206258860b2428712e7ece1d02c5177857" S = "${WORKDIR}/git" -PV = "0.0.13" +PV = "1.0.0" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' --2.29.0
Re: [OE-core] [PATCH 02/33] glib-2.0: upgrade 2.64.5 -> 2.66.1
In reply to Alexander KanavinI think this needs to accommodate/delete patch added by
https://lists.openembedded.org/g/openembedded-core/message/143792?p=,,,20,0,0,0::Created,,glib-2.0,20,2,0,77821523
since we are needing it on dunfell, I would say reverting it along with this upgrade on master is preferred.
Quoted 120 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...-correctly-when-building-with-mingw3.patch | 20 +++++++++---------- .../glib-2.0/glib-2.0/relocate-modules.patch | 2 +- ...{glib-2.0_2.64.5.bb => glib-2.0_2.66.1.bb} | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.64.5.bb => glib-2.0_2.66.1.bb} (95%)meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +10
-10@@ -1,4 +1,4 @@ -From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001 +From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index dab65d2..e8bb2ee 100644 +index 3a19c82..b762835 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -12,7 +12,7 @@ test_c_args = [@@ -26,7 +26,7 @@ index dab65d2..e8bb2ee 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -132,7 +132,7 @@ else +@@ -133,7 +133,7 @@ else endif # Test programs buildable on UNIX only@@ -35,7 +35,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += { 'file' : {}, 'gdbus-peer' : { -@@ -384,7 +384,7 @@ if host_machine.system() != 'windows' +@@ -385,7 +385,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only@@ -44,7 +44,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += {'win32-streams' : {}} endif -@@ -454,7 +454,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif@@ -54,10 +54,10 @@ index dab65d2..e8bb2ee 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 3dedafc..94605e6 100644 +index 6eb23e8..36eb919 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -134,7 +134,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif@@ -67,7 +67,7 @@ index 3dedafc..94605e6 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index e1b4b79..afb6eaa 100644 +index 47f3a5c..7ea7ad1 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,9 @@ else@@ -78,8 +78,8 @@ index e1b4b79..afb6eaa 100644 + host_system = 'windows' +endif - glib_version = meson.project_version() - glib_api_version = '2.0' + if host_system == 'darwin' + ios_test_code = '''#include <TargetConditionals.h> diff --git a/tests/meson.build b/tests/meson.build index 6741f8f..12fdc90 100644 --- a/tests/meson.buildmeta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +1
-1@@ -1,4 +1,4 @@ -From 2a715765c6ceb2e8b4cc42e060aee75016111d1a Mon Sep 17 00:00:00 2001 +From 75c0423e1dc34fa20de70bc9932625fd0de4a912 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native buildsmeta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.64.5.bb +1
-2@@ -21,7 +21,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "9cbd5bd2715ead1c28d53c46f7b7b6ff6166f5887b772c1a9e3bf2910cfecc11" +SRC_URI[sha256sum] = "a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. --2.29.0
Re: [OE-core] [PATCH 04/33] python3-pygobject: upgrade 3.36.1 -> 3.38.0
In reply to Khem RajUpstream has changed the meson option type from boolean (true/false) to feature (enabled/disabled/auto) in the new release.
Alex
Quoted 52 lines · Khem Raj
Quoted 6 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...thon3-pygobject_3.36.1.bb => python3-pygobject_3.38.0.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-pygobject_3.36.1.bb =>python3-pygobject_3.38.0.bb} (78%)
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta/recipes-devtools/python/python3-pygobject_3.38.0.bb
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb SRC_URI = " \ · line 14
Quoted 8 lines
similarity index 78%
rename from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb rename to meta/recipes-devtools/python/python3-pygobject_3.38.0.bb index0a34d4373f..b4427050f5100644meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +0
-0@@ -14,8 +14,7 @@ SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz\
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb SRC_URI = " \
Quoted 4 lines
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +0
-2file://0001-Do-not-build-tests.patch \ " -SRC_URI[md5sum] = "ebfebc4533856572281add29f08412bf" -SRC_URI[sha256sum] ="
d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"meta/recipes-devtools/python/python3-pygobject_3.38.0.bb SRC_URI = " \ · line 17
Quoted 1 line
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +1
-0+SRC_URI[sha256sum] ="
0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5"meta/recipes-devtools/python/python3-pygobject_3.38.0.bb RDEPENDS_${PN} += "python3-pkgutil" · line 30
Quoted 8 lines
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +0
-1UNKNOWN_CONFIGURE_WHITELIST = "introspection"@@ -27,7 +26,7 @@ RDEPENDS_${PN} += "python3-pkgutil" # python3-pycairo is checked on configuration -> DEPENDS # we don't link against python3-pycairo -> RDEPENDS -PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairopython3-pycairo, python3-pycairo"
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb RDEPENDS_${PN} += "python3-pkgutil" · line 29
Quoted 1 line
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +1
-0+PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairopython3-pycairo, python3-pycairo"
Quoted 1 line
is this a bug fix ? or a new change
Quoted 8 lines
BBCLASSEXTEND = "native"
PACKAGECONFIG_class-native = ""
--
2.29.0
Re: [OE-core] [PATCH 25/33] libhandy: upgrade 0.0.13 -> 1.0.0
In reply to Khem RajQuoted 11 lines · Khem Raj
Quoted 5 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-gnome/libhandy/libhandy_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)perhaps rename the recipe to libhandy_1.0.0.bb and drop setting PV in recipe ?
Sure, I queued a followup patch to do this.
Alex
Re: [OE-core] [PATCH 02/33] glib-2.0: upgrade 2.64.5 -> 2.66.1
In reply to Khem RajThe patch is already in master, so you can directly cherry-pick it. It is not deleted by the update, because the backport is even newer.
Alex
Quoted 146 lines · Khem Raj
I think this needs to accommodate/delete patch added by
since we are needing it on dunfell, I would say reverting it along with this upgrade on master is preferred.
Quoted 8 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...-correctly-when-building-with-mingw3.patch | 20 +++++++++---------- .../glib-2.0/glib-2.0/relocate-modules.patch | 2 +- ...{glib-2.0_2.64.5.bb => glib-2.0_2.66.1.bb} | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.64.5.bb =>glib-2.0_2.66.1.bb} (95%)
Quoted 2 lines
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patchb/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patchQuoted 2 lines
index
d075cd3f23..d6765b163b100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patchQuoted 1 line
+++
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patchmeta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch Signed-off-by: Alexander Kanavin <
Quoted 7 lines
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +1
-1@@ -1,4 +1,4 @@ -From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001 +From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index dab65d2..e8bb2ee 100644 · line 26
Quoted 10 lines
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +1
-14 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index dab65d2..e8bb2ee 100644 +index 3a19c82..b762835 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -12,7 +12,7 @@ test_c_args = [@@ -26,7 +26,7 @@ index dab65d2..e8bb2ee 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library('secur32')]
Quoted 17 lines
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +2
-2endif -@@ -132,7 +132,7 @@ else +@@ -133,7 +133,7 @@ else endif # Test programs buildable on UNIX only@@ -35,7 +35,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += { 'file' : {}, 'gdbus-peer' : { -@@ -384,7 +384,7 @@ if host_machine.system() != 'windows' +@@ -385,7 +385,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows onlymeta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index dab65d2..e8bb2ee 100644 · line 47
Quoted 4 lines
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +0
-1@@ -44,7 +44,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += {'win32-streams' : {}} endif -@@ -454,7 +454,7 @@ if cc.get_id() != 'msvc' and cc.get_id() !='clang-cl'
Review index dab65d2..e8bb2ee 100644 · line 47
Quoted 1 line
(quoted diff) +1
-0+@@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() !='clang-cl'
Review
Quoted 37 lines
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +5
-5} endif@@ -54,10 +54,10 @@ index dab65d2..e8bb2ee 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 3dedafc..94605e6 100644 +index 6eb23e8..36eb919 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -134,7 +134,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif@@ -67,7 +67,7 @@ index 3dedafc..94605e6 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index e1b4b79..afb6eaa 100644 +index 47f3a5c..7ea7ad1 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,9 @@ else@@ -78,8 +78,8 @@ index e1b4b79..afb6eaa 100644 + host_system = 'windows' +endif - glib_version = meson.project_version() - glib_api_version = '2.0' + if host_system == 'darwin' + ios_test_code = '''#include <TargetConditionals.h> diff --git a/tests/meson.build b/tests/meson.build index 6741f8f..12fdc90 100644 --- a/tests/meson.build(quoted diff) +0
-0
b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patchmeta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch line 4
Quoted 9 lines
index
fe87482ae2..07e37acf7d100644meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +1
-1@@ -1,4 +1,4 @@ -From 2a715765c6ceb2e8b4cc42e060aee75016111d1a Mon Sep 17 00:00:00 2001 +From 75c0423e1dc34fa20de70bc9932625fd0de4a912 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for nativebuilds
Review
Quoted 1 line
(quoted diff) +0
-0b/meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb
meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb SRC_URI =
Quoted 7 lines
similarity index 95%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.64.5.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb indexa30c5215be..52c7e42fbd100644meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.64.5.bb +0
-0@@ -21,7 +21,7 @@ SRC_URI ="${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
Quoted 4 lines
meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.64.5.bb +0
-1SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] ="
9cbd5bd2715ead1c28d53c46f7b7b6ff6166f5887b772c1a9e3bf2910cfecc11"meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb SRC_URI = · line 23
Quoted 1 line
meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.64.5.bb +1
-0+SRC_URI[sha256sum] ="
a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60"meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb SRC_URI = · line 24
Quoted 2 lines
meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.64.5.bb +0
-0# Find any meson cross files in FILESPATH that are relevant for thecurrent
Quoted 7 lines
meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.64.5.bb +0
-1# build (using siteinfo) and add them to EXTRA_OEMESON. --2.29.0
Re: [OE-core] [PATCH 04/33] python3-pygobject: upgrade 3.36.1 -> 3.38.0
In reply to Alexander KanavinQuoted 3 lines · Alexander Kanavin
Upstream has changed the meson option type from boolean (true/false) to feature (enabled/disabled/auto) in the new release.
ok thanks, I think having this mentioned in commit log would help users.
Quoted 48 lines
Alex
Quoted 45 lines · Khem Raj
Quoted 25 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...thon3-pygobject_3.36.1.bb => python3-pygobject_3.38.0.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-pygobject_3.36.1.bb => python3-pygobject_3.38.0.bb} (78%)meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +1
-2@@ -14,8 +14,7 @@ SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ file://0001-Do-not-build-tests.patch \ " -SRC_URI[md5sum] = "ebfebc4533856572281add29f08412bf" -SRC_URI[sha256sum] = "d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f" +SRC_URI[sha256sum] = "0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5" UNKNOWN_CONFIGURE_WHITELIST = "introspection"meta/recipes-devtools/python/python3-pygobject_3.38.0.bb RDEPENDS_${PN} += "python3-pkgutil" · line 30
Quoted 6 lines
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +1
-1@@ -27,7 +26,7 @@ RDEPENDS_${PN} += "python3-pkgutil" # python3-pycairo is checked on configuration -> DEPENDS # we don't link against python3-pycairo -> RDEPENDS -PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python3-pycairo, python3-pycairo" +PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairo python3-pycairo, python3-pycairo"is this a bug fix ? or a new change
Quoted 8 lines
meta/recipes-devtools/python/python3-pygobject_3.38.0.bb renamed from meta/recipes-devtools/python/python3-pygobject_3.36.1.bb +0
-1BBCLASSEXTEND = "native" PACKAGECONFIG_class-native = "" --2.29.0
Re: [OE-core] [PATCH 02/33] glib-2.0: upgrade 2.64.5 -> 2.66.1
In reply to Alexander KanavinQuoted 3 lines · Alexander Kanavin
The patch is already in master, so you can directly cherry-pick it. It is not deleted by the update, because the backport is even newer.
then I guess master-next is/was hosed for a while
Quoted 132 lines
Alex
Quoted 129 lines · Khem Raj
I think this needs to accommodate/delete patch added by
https://lists.openembedded.org/g/openembedded-core/message/143792?p=,,,20,0,0,0::Created,,glib-2.0,20,2,0,77821523since we are needing it on dunfell, I would say reverting it along with this upgrade on master is preferred.
Quoted 120 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...-correctly-when-building-with-mingw3.patch | 20 +++++++++---------- .../glib-2.0/glib-2.0/relocate-modules.patch | 2 +- ...{glib-2.0_2.64.5.bb => glib-2.0_2.66.1.bb} | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.64.5.bb => glib-2.0_2.66.1.bb} (95%)meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +10
-10@@ -1,4 +1,4 @@ -From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001 +From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index dab65d2..e8bb2ee 100644 +index 3a19c82..b762835 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -12,7 +12,7 @@ test_c_args = [@@ -26,7 +26,7 @@ index dab65d2..e8bb2ee 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -132,7 +132,7 @@ else +@@ -133,7 +133,7 @@ else endif # Test programs buildable on UNIX only@@ -35,7 +35,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += { 'file' : {}, 'gdbus-peer' : { -@@ -384,7 +384,7 @@ if host_machine.system() != 'windows' +@@ -385,7 +385,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only@@ -44,7 +44,7 @@ index dab65d2..e8bb2ee 100644 gio_tests += {'win32-streams' : {}} endif -@@ -454,7 +454,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif@@ -54,10 +54,10 @@ index dab65d2..e8bb2ee 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 3dedafc..94605e6 100644 +index 6eb23e8..36eb919 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -134,7 +134,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif@@ -67,7 +67,7 @@ index 3dedafc..94605e6 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index e1b4b79..afb6eaa 100644 +index 47f3a5c..7ea7ad1 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,9 @@ else@@ -78,8 +78,8 @@ index e1b4b79..afb6eaa 100644 + host_system = 'windows' +endif - glib_version = meson.project_version() - glib_api_version = '2.0' + if host_system == 'darwin' + ios_test_code = '''#include <TargetConditionals.h> diff --git a/tests/meson.build b/tests/meson.build index 6741f8f..12fdc90 100644 --- a/tests/meson.buildmeta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +1
-1@@ -1,4 +1,4 @@ -From 2a715765c6ceb2e8b4cc42e060aee75016111d1a Mon Sep 17 00:00:00 2001 +From 75c0423e1dc34fa20de70bc9932625fd0de4a912 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native buildsmeta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.64.5.bb +1
-2@@ -21,7 +21,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "9cbd5bd2715ead1c28d53c46f7b7b6ff6166f5887b772c1a9e3bf2910cfecc11" +SRC_URI[sha256sum] = "a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. --2.29.0
Re: [OE-core] [PATCH 11/33] rpm: update 4.15.1 -> 4.16.0
In reply to Alexander KanavinQuoted 8 lines · Alexander Kanavin
Drop backports.
Drop 0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch as enabling compression support in libmagic finally allows us to use parallel file classification.Add a backported patch that fixes musl builds.
I am still seeing an error on x86/gold linker where symbols are missing from libelf see
http://errors.yoctoproject.org/Errors/Details/510980/
Quoted 334 lines
License-Update: formatting
Signed-off-by Alexander Kanavin <[email protected]>--- ...he-limit-of-signature-header-to-64MB.patch | 62 ------------------ ...lib-rpm-as-the-installation-path-for.patch | 14 ++-- .../0001-rpmdb.c-add-a-missing-include.patch | 25 +++++++ ...-run-file-classification-in-parallel.patch | 65 ------------------- ...lugins.c-call-dlerror-prior-to-dlsym.patch | 29 --------- .../rpm/{rpm_4.15.1.bb => rpm_4.16.0.bb} | 16 +++-- 6 files changed, 42 insertions(+), 169 deletions(-) delete mode 100644 meta/recipes-devtools/rpm/files/0001-Bump-up-the-limit-of-signature-header-to-64MB.patch create mode 100644 meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch delete mode 100644 meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch delete mode 100644 meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch rename meta/recipes-devtools/rpm/{rpm_4.15.1.bb => rpm_4.16.0.bb} (94%)meta/recipes-devtools/rpm/files/0001-Bump-up-the-limit-of-signature-header-to-64MB.patch deleted +0
-62@@ -1,62 +0,0 @@ -From e8bf0eba7143abb6e69db82ee747a0c6790dd00a Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Wed, 3 Jun 2020 10:25:24 +0800 -Subject: [PATCH] Bump up the limit of signature header to 64MB - -Since commits [Place file signatures into the signature header where they -belong][1] applied, run `rpm -Kv **.rpm' failed if signature header -is larger than 64KB. Here are steps: - -1) A unsigned rpm package, the size is 227560 bytes -$ ls -al xz-src-5.2.5-r0.corei7_64.rpm --rw-------. 1 mockbuild 1000 227560 Jun 3 09:59 - -2) Sign the rpm package -$ rpmsign --addsign ... xz-src-5.2.5-r0.corei7_64.rpm - -3) The size of signed rpm is 312208 bytes -$ ls -al xz-src-5.2.5-r0.corei7_64.rpm --rw-------. 1 mockbuild 1000 312208 Jun 3 09:48 - -4) Run `rpm -Kv' failed with signature hdr data out of range -$ rpm -Kv xz-src-5.2.5-r0.corei7_64.rpm -xz-src-5.2.5-r0.corei7_64.rpm: -error: xz-src-5.2.5-r0.corei7_64.rpm: signature hdr data: BAD, no. of -bytes(88864) out of range - -From 1) and 3), the size of signed rpm package increased -312208 - 227560 = 84648, so the check of dl_max (64KB,65536) -is not enough. - -As [1] said: - - This also means the signature header can be MUCH bigger than ever - before,so bump up the limit (to 64MB, arbitrary something for now) - -So [1] missed to multiply by 1024. - -[1] https://github.com/rpm-software-management/rpm/commit/f558e886050c4e98f6cdde391df679a411b3f62c - -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/486579912381ede82172dc6d0ff3941a6d0536b5] - -Signed-off-by: Hongxu Jia <[email protected]> ---- - lib/header.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/header.c b/lib/header.c -index 9ec7ed0..cbf6890 100644 ---- a/lib/header.c -+++ b/lib/header.c -@@ -1906,7 +1906,7 @@ rpmRC hdrblobRead(FD_t fd, int magic, int exact_size, rpmTagVal regionTag, hdrbl - - if (regionTag == RPMTAG_HEADERSIGNATURES) { - il_max = 32; -- dl_max = 64 * 1024; -+ dl_max = 64 * 1024 * 1024; - } - - memset(block, 0, sizeof(block)); --- -2.25.4 -meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +7
-7@@ -1,4 +1,4 @@ -From 2f3d1619b6510bc131c4375827caf912559f0fa2 Mon Sep 17 00:00:00 2001 +From 4fd37bc9d8d0777aa038777dd81a76b64f536efd Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 27 Feb 2017 09:43:30 +0200 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index d3aeab86e..1a1f3f91f 100644 +index 186e4aeec..5df252085 100644 --- a/configure.ac +++ b/configure.ac -@@ -1086,7 +1086,7 @@ else +@@ -944,7 +944,7 @@ else usrprefix=$prefix fi@@ -27,10 +27,10 @@ index d3aeab86e..1a1f3f91f 100644 AC_SUBST(OBJDUMP) diff --git a/macros.in b/macros.in -index fe9803aad..d128675bf 100644 +index 35c8cf9df..9d8b2825c 100644 --- a/macros.in +++ b/macros.in -@@ -985,7 +985,7 @@ package or when debugging this package.\ +@@ -996,7 +996,7 @@ package or when debugging this package.\ %_sharedstatedir %{_prefix}/com %_localstatedir %{_prefix}/var %_lib lib@@ -40,7 +40,7 @@ index fe9803aad..d128675bf 100644 %_infodir %{_datadir}/info %_mandir %{_datadir}/man diff --git a/rpm.am b/rpm.am -index 40b4ec55f..3139ce8f6 100644 +index b46c6b7da..02d5c7a0a 100644 --- a/rpm.am +++ b/rpm.am @@ -1,10 +1,10 @@@@ -55,4 +55,4 @@ index 40b4ec55f..3139ce8f6 100644 +rpmconfigdir = $(libdir)/rpm # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 9:1:0 + rpm_version_info = 10:0:1meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch new file +25
-0@@ -0,0 +1,25 @@ +From 9de15c7e1f4ca23a10edb9a3b657f06b2b13e841 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 20 Oct 2020 22:16:39 +0200 +Subject: [PATCH] rpmdb.c: add a missing include + +This addressed build failures on non-glibc systems. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + lib/rpmdb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/rpmdb.c b/lib/rpmdb.c +index 4c101569f..73187630b 100644 +--- a/lib/rpmdb.c ++++ b/lib/rpmdb.c +@@ -8,6 +8,7 @@ + #include <utime.h> + #include <errno.h> + #include <dirent.h> ++#include <fcntl.h> + + #ifndef DYING /* XXX already in "system.h" */ + #include <fnmatch.h>meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch deleted +0
-65@@ -1,65 +0,0 @@ -From 93c3c7f043f62e96941274e957c4ad9432032af1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 18 Nov 2019 16:22:56 +0100 -Subject: [PATCH] rpmfc.c: do not run file classification in parallel - -This is causing freezes with libmagic when the file in question is compressed: -https://github.com/rpm-software-management/rpm/issues/756 - -Upstream-Status: Inappropriate [upstream wants a proper fix] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - build/rpmfc.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/build/rpmfc.c b/build/rpmfc.c -index 3db7a9352..17afdd57a 100644 ---- a/build/rpmfc.c -+++ b/build/rpmfc.c -@@ -680,7 +680,6 @@ static void rpmfcAttributes(rpmfc fc, int ix, const char *ftype, const char *ful - /* Add attributes on libmagic type & path pattern matches */ - if (matches(&(*attr)->incl, ftype, path, is_executable)) { - argvAddTokens(&fc->fattrs[ix], (*attr)->name); -- #pragma omp critical(fahash) - fattrHashAddEntry(fc->fahash, attr-fc->atypes, ix); - } - } -@@ -1105,7 +1104,6 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode) - /* Build (sorted) file class dictionary. */ - fc->cdict = rpmstrPoolCreate(); - -- #pragma omp parallel - { - /* libmagic is not thread-safe, each thread needs to a private handle */ - magic_t ms = magic_open(msflags); -@@ -1113,15 +1111,12 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode) - if (ms == NULL) { - rpmlog(RPMLOG_ERR, _("magic_open(0x%x) failed: %s\n"), - msflags, strerror(errno)); -- #pragma omp cancel parallel - } - - if (magic_load(ms, NULL) == -1) { - rpmlog(RPMLOG_ERR, _("magic_load failed: %s\n"), magic_error(ms)); -- #pragma omp cancel parallel - } - -- #pragma omp for ordered reduction(+:nerrors) - for (int ix = 0; ix < fc->nfiles; ix++) { - rpmsid ftypeId; - const char * ftype; -@@ -1185,14 +1180,11 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode) - fc->fcolor[ix] = fcolor; - - /* Add to file class dictionary and index array */ -- #pragma omp ordered - if (fcolor != RPMFC_WHITE && (fcolor & RPMFC_INCLUDE)) { - ftypeId = rpmstrPoolId(fc->cdict, ftype, 1); -- #pragma omp atomic - fc->fknown++; - } else { - ftypeId = rpmstrPoolId(fc->cdict, "", 1); -- #pragma omp atomic - fc->fwhite++; - } - /* Pool id's start from 1, for headers we want it from 0 */meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch deleted +0
-29@@ -1,29 +0,0 @@ -From 6878a83f9bac015c64d83cee42530a20a264cc5a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 7 Jan 2020 12:02:06 +0100 -Subject: [PATCH] rpmplugins.c: call dlerror() prior to dlsym() - -This is the recommended way in the manpage; if there is -a lingering error from an unrelated dl*() call that was -never obtained via dlerror(), it needs to be cleared -prior to calling dlsym(). - -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/998] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - lib/rpmplugins.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/rpmplugins.c b/lib/rpmplugins.c -index 65e684e84..b950f85cf 100644 ---- a/lib/rpmplugins.c -+++ b/lib/rpmplugins.c -@@ -68,6 +68,8 @@ static rpmPlugin rpmPluginNew(const char *name, const char *path, - - /* make sure the plugin has the supported hooks flag */ - hooks_name = rstrscat(NULL, name, "_hooks", NULL); -+ /* clear out any old errors that weren't fetched */ -+ dlerror(); - hooks = dlsym(handle, hooks_name); - if ((error = dlerror()) != NULL) { - rpmlog(RPMLOG_ERR, _("Failed to resolve symbol %s: %s\n"),meta/recipes-devtools/rpm/rpm_4.16.0.bb renamed from meta/recipes-devtools/rpm/rpm_4.15.1.bb +10
-7@@ -22,9 +22,9 @@ HOMEPAGE = "http://www.rpm.org" # libraries are also LGPL - how to express this? LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a" +LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.15.x \ +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ file://environment.d-rpm.sh \ file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ file://0001-Do-not-read-config-files-from-HOME.patch \@@ -38,14 +38,12 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.15.x \ file://0001-perl-disable-auto-reqs.patch \ file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ - file://0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch \ - file://0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch \ file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ - file://0001-Bump-up-the-limit-of-signature-header-to-64MB.patch \ + file://0001-rpmdb.c-add-a-missing-include.patch \ " PE = "1" -SRCREV = "ab2179452c5be276a6b96c591afded485c7e58c3" +SRCREV = "cd7f9303ef1070f027493cad7d00bc66935af2a0" S = "${WORKDIR}/git"@@ -55,6 +53,8 @@ DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native inherit autotools gettext pkgconfig python3native export PYTHON_ABI +AUTOTOOLS_AUXDIR = "${S}/build-aux" + # OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe EXTRA_AUTORECONF_append = " --exclude=gnu-configize"@@ -97,6 +97,10 @@ WRAPPER_TOOLS = " \ ${libdir}/rpm/rpmdeps \ " +do_configure_prepend() { + mkdir -p ${S}/build-aux +} + do_install_append_class-native() { for tool in ${WRAPPER_TOOLS}; do test -x ${D}$tool && create_wrapper ${D}$tool \ --2.29.0
PATCH 1/1 webkitgtk: fix opengl PACKAGECONFIG
In reply to Alexander Kanavin* ENABLE(OPENGL) was renamed to ENABLE(GRAPHICS_CONTEXT_GL) in r254064:
https://github.com/WebKit/webkit/commit/92f9916b4a0d799c3f7be10b69aa53f40a149a2d
and
https://github.com/WebKit/webkit/commit/b3cb3ba4fa713e23ae27b2a79c14c6735d40d671
but AUH doesn't notice that and builds without opengl in DISTRO_FEATURES are now failing with:
| CMake Error at Source/cmake/OptionsGTK.cmake:323 (message): | Either OpenGL or OpenGLES2 is needed for ENABLE_GRAPHICS_CONTEXT_GL. | Call Stack (most recent call first): | Source/cmake/WebKitCommon.cmake:58 (include) | CMakeLists.txt:173 (include)
--- meta/recipes-sato/webkit/webkitgtk_2.30.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.30.2.bb +1 -1
@@ -48,7 +48,7 @@ PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geocl PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" -PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" +PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"
Signature · 1 line
2.27.0
PATCH 1/1 webkitgtk: fix build with x11 enabled
In reply to Alexander Kanavin--- .../webkit/webkitgtk/include_xutil.patch | 24 +++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.30.2.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
meta/recipes-sato/webkit/webkitgtk/include_xutil.patch new file +24 -0
@@ -0,0 +1,24 @@ +Since +https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4 +it uses XVisualInfo which is defined in Xutil.h + +Without this the build fails with: +webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: 'XVisualInfo' was not declared in this scope; did you mean 'VisualID'? + 132 | XVisualInfo visualTemplate; + | ^~~~~~~~~~~ + | VisualID + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <[email protected]> + +diff -uNr webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp +--- webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-08-12 09:17:55.000000000 +0000 ++++ webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-11-06 03:11:40.379913528 +0000 +@@ -30,6 +30,7 @@ + + #if PLATFORM(X11) + #include <X11/Xlib.h> ++#include <X11/Xutil.h> + #include <X11/extensions/Xcomposite.h> + #if PLATFORM(GTK) + #include <X11/extensions/Xdamage.h>
meta/recipes-sato/webkit/webkitgtk_2.30.2.bb +1 -0
@@ -17,6 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ + file://include_xutil.patch \ " SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a"
Signature · 1 line
2.27.0