pkgconf: exclude pre-releases from version checks
Subsystems (2)
PATCH 1/8 pkgconf: exclude pre-releases from version checks
From: Alexander Kanavin <[email protected]>
--- meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb +1 -0
@@ -21,6 +21,7 @@ SRC_URI = "\ file://pkg-config-esdk.in \ " SRC_URI[sha256sum] = "cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a50c243" +UPSTREAM_CHECK_REGEX = "pkgconf-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)\.tar" inherit autotools pkgconfig
Signature · 1 line
2.47.3
PATCH 2/8 gtk-doc: upgrade 1.35.1 -> 1.36.1
From: Alexander Kanavin <[email protected]>
Convert to meson, remove autotools-specific tweaks and patches:
- conditionaltests.patch adds an option already available in meson
- 0001-Do-not-error-out-if-xsltproc-is-not-found.patch (see below).
Add a patch to avoid unneeded check for runtime python module dependencies.
Move dependencies needed to run gtk-doc to gtk-doc bbclass (so they aren't built and pulled in until actually needed).
This allows dropping the 'working-scripts' logic in the recipe, except for xsltproc-native whose location is used during build.
---
meta/classes-recipe/gtk-doc.bbclass | 2 +-
...t-error-out-if-xsltproc-is-not-found.patch | 28 -------------
...code-paths-to-perl-python-in-scripts.patch | 2 +-
...not-check-for-pygments-at-build-time.patch | 37 ++++++++++++++++
.../gtk-doc/files/conditionaltests.patch | 42 -------------------
.../gtk-doc/files/no-clobber.patch | 2 +-
.../gtk-doc/files/pkg-config-native.patch | 2 +-
.../{gtk-doc_1.35.1.bb => gtk-doc_1.36.1.bb} | 33 ++++-----------
8 files changed, 49 insertions(+), 99 deletions(-)
delete mode 100644 meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch
create mode 100644 meta/recipes-gnome/gtk-doc/files/0001-meson.build-do-not-check-for-pygments-at-build-time.patch
delete mode 100644 meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.35.1.bb => gtk-doc_1.36.1.bb} (51%)meta/classes-recipe/gtk-doc.bbclass +1 -1
@@ -36,7 +36,7 @@ DEPENDS:append = " gtk-doc-native" export STAGING_DIR_HOST inherit python3native pkgconfig qemu -DEPENDS:append = "${@' qemu-native' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" +DEPENDS:append = "${@' qemu-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native python3-pygments-native' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" do_compile:prepend:class-target () { if [ ${GTKDOC_ENABLED} = True ]; then
meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 5d64ab3a7c18904231d611b1262d1289b7282930 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 7 Sep 2016 14:52:04 +0300 -Subject: [PATCH] Do not error out if xsltproc is not found. - -This allows us to drop the hard xsltproc dependency, if we're not -going to actually run the gtkdoc scripts (when api documentation is -disabled). - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f238de9..909771d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -37,7 +37,7 @@ dnl Check for xsltproc - dnl - AC_PATH_PROG([XSLTPROC], [xsltproc]) - if test -z "$XSLTPROC"; then -- AC_MSG_ERROR([xsltproc not found]) -+ AC_MSG_WARN([xsltproc not found]) - fi - - dnl
meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch +1 -1
@@ -1,4 +1,4 @@ -From 98fc3c6e6ac36a2351ee7ff260bf74a7866c8483 Mon Sep 17 00:00:00 2001 +From 00a3a827aca9e053cb0d69bea50a61fece341f0f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 31 Aug 2016 16:44:46 +0300 Subject: [PATCH] Do not hardocode paths to perl/python in scripts.
meta/recipes-gnome/gtk-doc/files/0001-meson.build-do-not-check-for-pygments-at-build-time.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 80b4f8edc4273803a89d02bb6209734f7cfcce3e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Sun, 21 Jun 2026 11:11:04 +0200 +Subject: [PATCH] meson.build: do not check for python modules at build time + +pygments and parametrized are run-time dependencies, and should +not be enforced at build time as they are never actually used then. + +This is especially useful in cross-compilation, as the modules +are checked in the python installation on the build host, and that +has no relevance to the target environment that the build outputs +will be executed in. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/105] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 30f1520..a49d734 100644 +--- a/meson.build ++++ b/meson.build +@@ -8,12 +8,7 @@ fs = import('fs') + gnome = import('gnome') + python = import('python') + +-required_python_modules = ['pygments'] +-if get_option('tests') +- required_python_modules += ['parameterized'] +-endif +- +-python3 = python.find_installation('python3', modules: required_python_modules) ++python3 = python.find_installation('python3') + + # Paths + srcdir = meson.current_source_dir()
meta/recipes-gnome/gtk-doc/files/conditionaltests.patch deleted +0 -42
42 lines not on this page · raw message
meta/recipes-gnome/gtk-doc/files/no-clobber.patch +1 -1
@@ -1,4 +1,4 @@ -From bcf24419dc1965086793b4ff66a2f9b06574f974 Mon Sep 17 00:00:00 2001 +From 01a52d8cf076e2692d947c8ed2681cb794eaa3c0 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Wed, 21 Mar 2018 14:47:29 +0000 Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +1 -1
@@ -1,4 +1,4 @@ -From 24ddd2afb4fcdb8b7c88af5caec0c18ec9e7ff4e Mon Sep 17 00:00:00 2001 +From 9149fb41bdc1421102ccc3c0b64066e6dc03a2bd 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.36.1.bb renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.35.1.bb +8 -25
@@ -5,55 +5,38 @@ HOMEPAGE = "https://www.gtk.org/docs/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase -# Configure the scripts correctly (and build their dependencies) only if they are actually -# going to be used; otheriwse we need only the m4/makefile includes from the gtk-doc tarball. -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", "working-scripts", "", d)}" +DEPENDS += "libxslt-native" -# This will cause target gtk-doc to hardcode paths of native dependencies -# into its scripts. This means that target gtk-doc package is broken; -# hopefully no one minds because its scripts are not used for anything during build -# and shouldn't be used on targets. -PACKAGECONFIG[working-scripts] = ",,libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets python3-pygments" -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" +PACKAGECONFIG ??= "" -CACHED_CONFIGUREVARS += "ac_cv_path_XSLTPROC=xsltproc" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,glib-2.0" -SRC_URI[archive.sha256sum] = "611c9f24edd6d88a8ae9a79d73ab0dc63c89b81e90ecc31d6b9005c5f05b25e2" +EXTRA_OEMESON = "-Dyelp_manual=false" + +SRC_URI[archive.sha256sum] = "0e517a5f97069831181be177516bde8aa8b3922398f2bdb09e265d22aecadbc5" SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ - file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ - file://conditionaltests.patch \ file://no-clobber.patch \ + file://0001-meson.build-do-not-check-for-pygments-at-build-time.patch \ " SRC_URI:append:class-native = " file://pkg-config-native.patch" BBCLASSEXTEND = "native nativesdk" -# Do not check for XML catalogs when building because that -# information is not used for anything during build. Recipe -# dependencies make sure we have all the right bits. -do_configure:prepend() { - sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac -} - do_install:append () { # configure values for python3 and pkg-config encoded in scripts for fn in ${bindir}/gtkdoc-depscan \ ${bindir}/gtkdoc-mkhtml2 \ ${datadir}/gtk-doc/python/gtkdoc/config_data.py \ ${datadir}/gtk-doc/python/gtkdoc/config.py; do - sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \ + sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/,,' \ -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ -e '1s|^#!.*|#!/usr/bin/env python3|' \ -i ${D}$fn done } -FILES:${PN} += "${datadir}/sgml" -FILES:${PN}-doc = "" - SYSROOT_PREPROCESS_FUNCS:append:class-native = " gtkdoc_makefiles_sysroot_preprocess" gtkdoc_makefiles_sysroot_preprocess() { # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries
Signature · 1 line
2.47.3
Re: [OE-core] [PATCH 2/8] gtk-doc: upgrade 1.35.1 -> 1.36.1
Quoted 44 lines · Alexander Kanavin via lists.openembedded.org
From: Alexander Kanavin <[email protected]>
Convert to meson, remove autotools-specific tweaks and patches:
- conditionaltests.patch adds an option already available in meson
- 0001-Do-not-error-out-if-xsltproc-is-not-found.patch (see below).Add a patch to avoid unneeded check for runtime python module dependencies.
Move dependencies needed to run gtk-doc to gtk-doc bbclass (so they aren't built and pulled in until actually needed).
This allows dropping the 'working-scripts' logic in the recipe, except for xsltproc-native whose location is used during build.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/classes-recipe/gtk-doc.bbclass | 2 +- ...t-error-out-if-xsltproc-is-not-found.patch | 28 ------------- ...code-paths-to-perl-python-in-scripts.patch | 2 +- ...not-check-for-pygments-at-build-time.patch | 37 ++++++++++++++++ .../gtk-doc/files/conditionaltests.patch | 42 ------------------- .../gtk-doc/files/no-clobber.patch | 2 +- .../gtk-doc/files/pkg-config-native.patch | 2 +- .../{gtk-doc_1.35.1.bb => gtk-doc_1.36.1.bb} | 33 ++++----------- 8 files changed, 49 insertions(+), 99 deletions(-) delete mode 100644 meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch create mode 100644 meta/recipes-gnome/gtk-doc/files/0001-meson.build-do-not-check-for-pygments-at-build-time.patch delete mode 100644 meta/recipes-gnome/gtk-doc/files/conditionaltests.patch rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.35.1.bb => gtk-doc_1.36.1.bb} (51%)[...]
meta/recipes-gnome/gtk-doc/files/0001-meson.build-do-not-check-for-pygments-at-build-time.patch new file +4
-0@@ -0,0 +1,37 @@ +From 80b4f8edc4273803a89d02bb6209734f7cfcce3e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Sun, 21 Jun 2026 11:11:04 +0200 +Subject: [PATCH] meson.build: do not check for python modules at build time
meta/recipes-gnome/gtk-doc/files/0001-meson.build-do-not-check-for-pygments-at-build-time.patch line 14
Quoted 10 lines
meta/recipes-gnome/gtk-doc/files/0001-meson.build-do-not-check-for-pygments-at-build-time.patch new file +10
-0+ +pygments and parametrized are run-time dependencies, and should +not be enforced at build time as they are never actually used then. + +This is especially useful in cross-compilation, as the modules +are checked in the python installation on the build host, and that +has no relevance to the target environment that the build outputs +will be executed in. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/105]
Hello,
I just noticed that this patch merged but was modified.
Can you refresh please?
Thanks! :)
Signature · 2 lines
Yoann Congal Smile ECS
PATCH 3/8 webkitgtk: upgrade 2.50.6 -> 2.52.4
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Disable on 32 bit x86: upstream doesn't test the build for it, it has regressed, and it's just not a relevant or useful target for a web engine in 2026.
Drop patch merged upstream.
---
meta/recipes-gnome/epiphany/epiphany_50.4.bb | 4 +--
...able-to-control-macro-__PAS_ALWAYS_I.patch | 10 +++----
...spection.cmake-prefix-variables-obta.patch | 2 +-
...-on-RISCV-https-bugs.webkit.org-show.patch | 30 -------------------
...dGLib.cmake-do-not-set-include-dirs-.patch | 30 +++++++++++++++++++
.../webkit/webkitgtk/fix-ftbfs-riscv64.patch | 6 ++--
.../webkit/webkitgtk/reproducibility.patch | 4 +--
.../webkit/webkitgtk/sys_futex.patch | 2 +-
.../webkit/webkitgtk/t6-not-declared.patch | 6 ++--
...ebkitgtk_2.50.6.bb => webkitgtk_2.52.4.bb} | 9 +++---
10 files changed, 52 insertions(+), 51 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch
create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Source-cmake-FindGLib.cmake-do-not-set-include-dirs-.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.50.6.bb => webkitgtk_2.52.4.bb} (96%)meta/recipes-gnome/epiphany/epiphany_50.4.bb +2 -2
@@ -41,5 +41,5 @@ PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" -# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 -COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" +# please see webkitgtk recipe for details +COMPATIBLE_HOST:x86 = "null"
meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch +5 -5
@@ -1,4 +1,4 @@ -From ec0a881bb05e5a4eed9a71b4494e64373cdd4d25 Mon Sep 17 00:00:00 2001 +From 73c15fceb9bcb3896c56de0ab712e76d2eca0b19 Mon Sep 17 00:00:00 2001 From: Kai Kang <[email protected]> Date: Fri, 11 Aug 2023 14:20:48 +0800 Subject: [PATCH] Add a variable to control macro
@@ -44,10 +44,10 @@ Signed-off-by: Kai Kang <[email protected]> 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h -index ea511e5b..2e8df1e5 100644 +index a845ed01..4bde7544 100644 --- a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h +++ b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h -@@ -44,7 +44,7 @@ __PAS_BEGIN_EXTERN_C; +@@ -46,7 +46,7 @@ __PAS_BEGIN_EXTERN_C; #define __SUSPICIOUS__ #define __BROKEN__
@@ -57,10 +57,10 @@ index ea511e5b..2e8df1e5 100644 #else #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake -index 77a292fb..bf53d809 100644 +index efdf8d4d..8c57ad5b 100644 --- a/Source/cmake/WebKitCompilerFlags.cmake +++ b/Source/cmake/WebKitCompilerFlags.cmake -@@ -512,3 +512,10 @@ endif () +@@ -570,3 +570,10 @@ endif () # FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438> set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON)
meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch +1 -1
@@ -1,4 +1,4 @@ -From 14b50f50e1c8198f3a14767b8d62e25093babe51 Mon Sep 17 00:00:00 2001 +From 6ec23f12926c93746fdd30a9b5547a76878c9a4c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 27 Oct 2015 16:02:19 +0200 Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 7fe5b5ef35441a2e40cac13a51c6af10afa1dbe2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 21 Mar 2025 01:21:22 -0700 -Subject: [PATCH] Fix build errors on RISCV - https://bugs.webkit.org/show_bug.cgi?id=290163 - -Reviewed by NOBODY (OOPS!). - -Include c++ header <system_error> for std::error_code. - -* Source/WebCore/contentextensions/ContentExtensionActions.h: Include system_error - -Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/42802] -Signed-off-by: Khem Raj <[email protected]> ---- - Source/WebCore/contentextensions/ContentExtensionActions.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WebCore/contentextensions/ContentExtensionActions.h b/Source/WebCore/contentextensions/ContentExtensionActions.h -index a600f410..80512454 100644 ---- a/Source/WebCore/contentextensions/ContentExtensionActions.h -+++ b/Source/WebCore/contentextensions/ContentExtensionActions.h -@@ -28,6 +28,7 @@ - #if ENABLE(CONTENT_EXTENSIONS) - - #include "ContentExtensionStringSerialization.h" -+#include <system_error> - #include <wtf/JSONValues.h> - #include <wtf/Hasher.h> -
meta/recipes-sato/webkit/webkitgtk/0001-Source-cmake-FindGLib.cmake-do-not-set-include-dirs-.patch new file +30 -0
@@ -0,0 +1,30 @@ +From e625e06202f992936b43790ee2c992611facba04 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Sun, 21 Jun 2026 22:57:24 +0200 +Subject: [PATCH] Source/cmake/FindGLib.cmake: do not set include dirs from + INCLUDEDIR + +The correct include directory set is provided by INCLUDE_DIRS (e.g. the following line). +INCLUDEDIR is a prefix to them (e.g. it's set to /usr/include in most cases), and adding +it is causing problems in cross-compile scenarios where the build is performed against +a system root and include locations are substituted to that using pkg-config override +mechanisms. + +Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/67960] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + Source/cmake/FindGLib.cmake | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Source/cmake/FindGLib.cmake b/Source/cmake/FindGLib.cmake +index 00de647d..68581c25 100644 +--- a/Source/cmake/FindGLib.cmake ++++ b/Source/cmake/FindGLib.cmake +@@ -191,7 +191,6 @@ function(GLib_HandleComponent name) + list(TRANSFORM dependencies PREPEND GLib::) + add_library(GLib::${name} UNKNOWN IMPORTED GLOBAL) + set_target_properties(GLib::${name} PROPERTIES IMPORTED_LOCATION "${GLib_${name}_LIBRARY}") +- target_include_directories(GLib::${name} INTERFACE ${PC_GLib_${name}_INCLUDEDIR}) + target_include_directories(GLib::${name} INTERFACE ${PC_GLib_${name}_INCLUDE_DIRS}) + target_compile_options(GLib::${name} INTERFACE ${PC_GLib_${name}_CFLAGS}) + target_compile_options(GLib::${name} INTERFACE ${PC_GLib_${name}_CFLAGS_OTHER})
meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-riscv64.patch +3 -3
@@ -1,7 +1,7 @@ -From 9d09d47c01b8ee92a02662d58d2570160064fa5d Mon Sep 17 00:00:00 2001 +From 30ce10321a6f49aa27284139dafcf3517f95d13c Mon Sep 17 00:00:00 2001 From: Alberto Garcia <[email protected]> Date: Fri, 19 Dec 2025 10:10:41 +0000 -Subject: Use WTF_CPU_UNKNOWN when building for riscv64 +Subject: [PATCH] Use WTF_CPU_UNKNOWN when building for riscv64 WebKitGTK doesn't build on riscv64 even with the JIT disabled. Treating the CPU as unknown is perhaps a bit severe, but it allows us
@@ -36,7 +36,7 @@ index 8aac1024..d9d69a40 100644 #define WTF_CPU_UNKNOWN 1 #endif diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake -index 98ee788a..3861c0a4 100644 +index 639b7e5d..c7e60287 100644 --- a/Source/cmake/WebKitCommon.cmake +++ b/Source/cmake/WebKitCommon.cmake @@ -129,8 +129,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
meta/recipes-sato/webkit/webkitgtk/reproducibility.patch +2 -2
@@ -1,4 +1,4 @@ -From d8a41103d268c7d7de12326a15642508c3541d85 Mon Sep 17 00:00:00 2001 +From 983fe4a8fd6fb6512fdf78d9a32be345c252e64d Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Mon, 3 Jan 2022 14:18:34 +0000 Subject: [PATCH] webkitgtk: Add reproducibility fix
@@ -16,7 +16,7 @@ Signed-off-by: Richard Purdie <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/JavaScriptCore/generator/GeneratedFile.rb b/Source/JavaScriptCore/generator/GeneratedFile.rb -index 6ed2b6e4..86a28286 100644 +index 9a951947..d499ae30 100644 --- a/Source/JavaScriptCore/generator/GeneratedFile.rb +++ b/Source/JavaScriptCore/generator/GeneratedFile.rb @@ -25,7 +25,7 @@ require 'date'
meta/recipes-sato/webkit/webkitgtk/sys_futex.patch +1 -1
@@ -1,4 +1,4 @@ -From 5a82a729903fcd6943334c160838a143dc9a3b3c Mon Sep 17 00:00:00 2001 +From ddd3c2ff59abeea528d228ad5d5641fc3a3e5f83 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 18 Dec 2024 20:24:22 -0800 Subject: [PATCH] Fix build on newer 32bit architectures with only 64bit time_t
meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch +3 -3
@@ -1,4 +1,4 @@ -From 367cc1e4bdb122a72666314abdb09dad266fd8a6 Mon Sep 17 00:00:00 2001 +From d2df5d7398dea93b4c7907299dc5030274894b15 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <[email protected]> Date: Mon, 5 Feb 2024 11:00:49 -0600 Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?=
@@ -21,10 +21,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 deletions(-) diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -index d80e882a..84448df2 100644 +index fcec367d..851f68d9 100644 --- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -@@ -340,8 +340,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, +@@ -341,8 +341,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, UNUSED_VARIABLE(t2); UNUSED_VARIABLE(t3); UNUSED_VARIABLE(t5);
meta/recipes-sato/webkit/webkitgtk_2.52.4.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.50.6.bb +5 -4
@@ -15,10 +15,10 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ file://t6-not-declared.patch \ file://sys_futex.patch \ - file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \ file://fix-ftbfs-riscv64.patch \ + file://0001-Source-cmake-FindGLib.cmake-do-not-set-include-dirs-.patch \ " -SRC_URI[sha256sum] = "2b281abf8894ffc6172152e5660b75eeeedbe1cc43d6783d09dc79f7c865bb42" +SRC_URI[sha256sum] = "cf4076a1ca2a64788edca8c452d8ebb68d5e2965e588fe46a388a016513edce4" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
@@ -150,8 +150,9 @@ ARM_INSTRUCTION_SET:armv7a = "thumb" ARM_INSTRUCTION_SET:armv7r = "thumb" ARM_INSTRUCTION_SET:armv7ve = "thumb" -# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 -COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" +# As of 2.52.4, 32 bit x86 builds are broken: +# https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/4013/steps/12/logs/stdio +COMPATIBLE_HOST:x86 = "null" # introspection inside qemu-arm hangs forever on musl/arm builds # therefore disable GI_DATA
Signature · 1 line
2.47.3
PATCH 4/8 libical: upgrade 3.0.20 -> 4.0.3
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop -DSHARED_ONLY=True (replaced upstream with LIBICAL_STATIC, false by default).
Backport a bluez5 patch to support the new version.
Drop 0001-cmake-Do-not-export-CC-into-gir-compiler.patch (merged upstream).
Rebase flags.patch (couldn't find evidence of ical-glib-static and so that chunk was dropped).
Rework various upstream cmake options.
License-Update: file renamed, additional information added at the bottom:
https://github.com/libical/libical/blob/v4.0.3/LICENSE.txt
LGPL/MPL texts aren't necessary to track, as LICENSE.txt specifies what the actual terms are.
---
meta/conf/distro/include/no-static-libs.inc | 1 -
meta/recipes-connectivity/bluez5/bluez5.inc | 3 +-
.../0001-build-Support-libical-4.0.patch | 34 +++++++++++++++
...e-Do-not-export-CC-into-gir-compiler.patch | 30 -------------
.../libical/libical/flags.patch | 42 +++++++++----------
.../{libical_3.0.20.bb => libical_4.0.3.bb} | 19 ++++-----
6 files changed, 65 insertions(+), 64 deletions(-)
create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-build-Support-libical-4.0.patch
delete mode 100644 meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
rename meta/recipes-support/libical/{libical_3.0.20.bb => libical_4.0.3.bb} (74%)meta/conf/distro/include/no-static-libs.inc +0 -1
@@ -23,7 +23,6 @@ DISABLE_STATIC:pn-musl = "" EXTRA_OECONF:append = "${DISABLE_STATIC}" -EXTRA_OECMAKE:append:pn-libical = " -DSHARED_ONLY=True" EXTRA_OECMAKE:append:pn-libjpeg-turbo = " -DENABLE_STATIC=False" EXTRA_OECMAKE:append:pn-libjpeg-turbo-native = " -DENABLE_STATIC=False"
meta/recipes-connectivity/bluez5/bluez5.inc +2 -1
@@ -73,8 +73,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-gatt-client-Fix-use-after-free-caused-by-reentrant-c.patch \ file://0001-transport-Fix-set-volume-failure-with-invalid-device.patch \ file://0001-advertising-Fix-sending-extra-bytes-with-MGMT_OP_ADD.patch \ - file://0001-src-device-Fix-stored-gatt-cache-DB-Hash-value-no.patch \ + file://0001-src-device-Fix-stored-gatt-cache-DB-Hash-value-no.patch \ file://0001-profile-Set-L2CAP-IMTU-for-OBEX-profile-listeners.patch \ + file://0001-build-Support-libical-4.0.patch \ " S = "${UNPACKDIR}/bluez-${PV}"
meta/recipes-connectivity/bluez5/bluez5/0001-build-Support-libical-4.0.patch new file +34 -0
@@ -0,0 +1,34 @@ +From fe0d11b97634c546166e895bafbede2d4df6769f Mon Sep 17 00:00:00 2001 +From: Funda Wang <[email protected]> +Date: Thu, 4 Jun 2026 10:01:35 +0200 +Subject: [PATCH] build: Support libical 4.0 + +libical 4.0 split off some vcal related functions to a separate shared +library, libicalvcal. As libicalvcal depends on libical itself, first +check for libicalvcal being available, and if it fails, check for +just libical. + +Closes: https://github.com/bluez/bluez/issues/2090 + +Tested-by: Bastien Nocera <[email protected]> +Upstream-Status: Backport [https://github.com/bluez/bluez/commit/e60d07255327db3fc4e3a28d7fcc792cd42c34d0] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 52de7d6..1cdd551 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -306,7 +306,9 @@ fi + AC_ARG_ENABLE(obex, AS_HELP_STRING([--disable-obex], + [disable OBEX profile support]), [enable_obex=${enableval}]) + if (test "${enable_obex}" != "no"); then +- PKG_CHECK_MODULES(ICAL, libical) ++ PKG_CHECK_MODULES(ICAL, [libicalvcal >= 4.0.0], [], ++ [PKG_CHECK_MODULES(ICAL, [libical])] ++ ) + fi + AM_CONDITIONAL(OBEX, test "${enable_obex}" != "no") +
meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 7b20ca7f24a4cac25998bfcc70eed75bf796816b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 3 Mar 2022 20:10:04 -0800 -Subject: [PATCH] cmake: Do not export CC into gir compiler - -this helps cross compilers where full compiler commandline defines the -compiler rather than just CC variable, therefore let it use the default -values from environment and not synthesize it from CMAKE_C_COMPILER just -for this case. - -Upstream-Status: Backport [https://github.com/libical/libical/pull/552] -Signed-off-by: Khem Raj <[email protected]> ---- - cmake/modules/GObjectIntrospectionMacros.cmake | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake -index 83aff93..d7d3f89 100644 ---- a/cmake/modules/GObjectIntrospectionMacros.cmake -+++ b/cmake/modules/GObjectIntrospectionMacros.cmake -@@ -50,8 +50,7 @@ macro(gir_add_introspections introspections_girs) - set(_gir_libtool "--no-libtool") - - add_custom_command( -- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" -- ${GObjectIntrospection_SCANNER} -+ COMMAND ${GObjectIntrospection_SCANNER} - ${GObjectIntrospection_SCANNER_ARGS} - --namespace=${_gir_namespace} - --nsversion=${_gir_version}
meta/recipes-support/libical/libical/flags.patch +20 -22
56 lines not on this page · raw message
meta/recipes-support/libical/libical_4.0.3.bb renamed from meta/recipes-support/libical/libical_3.0.20.bb +9 -10
@@ -6,17 +6,14 @@ their calendar data and arrange meetings with other users. " HOMEPAGE = "https://github.com/libical/libical" BUGTRACKER = "https://github.com/libical/libical/issues" LICENSE = "LGPL-2.1-only | MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ - file://LICENSE.LGPL21.txt;md5=8f690bb538f4b301d931374a6eb864d0 \ - file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6d9294493d031c817783b0400a126c89 \ " SECTION = "libs" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ - file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ file://flags.patch \ - " -SRC_URI[sha256sum] = "e73de92f5a6ce84c1b00306446b290a2b08cdf0a80988eca0a2c9d5c3510b4c2" + " +SRC_URI[sha256sum] = "86f29029d0ec9fa30c9001de16c0859a3816ae154ff5b097392b014e21a3d254" inherit cmake pkgconfig gobject-introspection vala github-releases
@@ -24,7 +21,7 @@ DEPENDS += "libical-native" PACKAGECONFIG ??= "icu glib" PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db" -PACKAGECONFIG[glib] = "-DICAL_GLIB=True,-DICAL_GLIB=False,glib-2.0-native libxml2-native glib-2.0 libxml2" +PACKAGECONFIG[glib] = "-DLIBICAL_GLIB=True,-DLIBICAL_GLIB=False,glib-2.0-native libxml2-native glib-2.0 libxml2" # ICU is used for RSCALE (RFC7529) support PACKAGECONFIG[icu] = ",-DCMAKE_DISABLE_FIND_PACKAGE_ICU=True,icu"
@@ -33,13 +30,15 @@ EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" # Disable the test suite as we can't install it EXTRA_OECMAKE += "-DLIBICAL_BUILD_TESTING=false" # doc build fails with linker error (??) for libical-glib so disable it -EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" +EXTRA_OECMAKE += "-DLIBICAL_GLIB_BUILD_DOCS=false" # gobject-introspection EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" -EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF', d)}" -EXTRA_OECMAKE:append:class-native = " -DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF" +EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DLIBICAL_GOBJECT_INTROSPECTION=ON -DLIBICAL_GLIB_VAPI=ON', '-DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF', d)}" +EXTRA_OECMAKE:append:class-native = " -DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF" +# no java +EXTRA_OECMAKE += "-DLIBICAL_JAVA_BINDINGS=False" # Tell the cross-libical where the tool it needs to build is EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake"
Signature · 1 line
2.47.3
PATCH 5/8 systemtap: upgrade 5.4 -> 5.5
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop a backport, rebase a readline patch
(it may be hard to read, but the + and - sections are reordered), add a reproducibility tweak.
---
...-native_5.4.bb => systemtap-native_5.5.bb} | 0
...gure-write-a-python-location-into-th.patch | 7 +-
...ython-modules-to-correct-library-dir.patch | 2 +-
.../0001-elaborate.cxx-fix-32-bit-build.patch | 104 ------------------
...rove-reproducibility-for-c-compiling.patch | 10 +-
...staprun-address-ncurses-6.3-failures.patch | 11 +-
...-don-t-support-installing-a-non-root.patch | 17 ++-
.../systemtap/systemtap/readline.patch | 29 +++--
.../{systemtap_5.4.bb => systemtap_5.5.bb} | 6 +
.../systemtap/systemtap_git.inc | 3 +-
10 files changed, 45 insertions(+), 144 deletions(-)
rename meta/recipes-kernel/systemtap/{systemtap-native_5.4.bb => systemtap-native_5.5.bb} (100%)
delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-fix-32-bit-build.patch
rename meta/recipes-kernel/systemtap/{systemtap_5.4.bb => systemtap_5.5.bb} (93%)meta/recipes-kernel/systemtap/systemtap-native_5.5.bb renamed from meta/recipes-kernel/systemtap/systemtap-native_5.4.bb +0 -0
meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch +2 -5
@@ -1,4 +1,4 @@ -From ab29615ed6c2e779b472903564dc683dc1015de7 Mon Sep 17 00:00:00 2001 +From adf505ededdd25cf43111fd12a59090a8f7de856 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 22 Feb 2017 13:37:33 +0200 Subject: [PATCH] Do not let configure write a python location into the dtrace
@@ -11,7 +11,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dtrace.in b/dtrace.in -index 5e1cf8079..a24229cbc 100644 +index 73a6f22e2..870999e36 100644 --- a/dtrace.in +++ b/dtrace.in @@ -1,4 +1,4 @@
@@ -20,6 +20,3 @@ index 5e1cf8079..a24229cbc 100644 # vim: et sta sts=4 sw=4 ts=8 # This handles the systemtap equivalent of --- -2.11.0 -
meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch +1 -1
@@ -1,4 +1,4 @@ -From 7847240a97f5010ebab775f7ac51812a7705a886 Mon Sep 17 00:00:00 2001 +From a261ee9efca120b6d65310a972d91dffc00ac937 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 24 Feb 2017 17:53:02 +0200 Subject: [PATCH] Install python modules to correct library dir.
meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-fix-32-bit-build.patch deleted +0 -104
104 lines not on this page · raw message
meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch +5 -5
@@ -1,4 +1,4 @@ -From 6288ba5df0a8c73ef842b609081449ac4de86123 Mon Sep 17 00:00:00 2001 +From 06522edad080caa76f5abc8586fe5baf3b620f16 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Wed, 18 Jul 2018 16:58:33 +0800 Subject: [PATCH] improve reproducibility for c++ compiling
@@ -13,10 +13,10 @@ Signed-off-by: Hongxu Jia <[email protected]> stringtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: git/stringtable.h -=================================================================== ---- git.orig/stringtable.h -+++ git/stringtable.h +diff --git a/stringtable.h b/stringtable.h +index aef564824..a04888f3c 100644 +--- a/stringtable.h ++++ b/stringtable.h @@ -23,7 +23,7 @@ #if 0 && defined(HAVE_BOOST_UTILITY_STRING_REF_HPP)
meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch +4 -7
@@ -1,4 +1,4 @@ -From 191f528da19193d713d94ee252e2485efd9af4d3 Mon Sep 17 00:00:00 2001 +From 7672d0e398b29a52f59a1a0cbb75d4d07bd5f975 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 25 Oct 2021 17:59:24 +0200 Subject: [PATCH] staprun: address ncurses 6.3 failures
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/staprun/monitor.c b/staprun/monitor.c -index 478634c09..f4fbfd686 100644 +index 851ee14c4..7d83a3846 100644 --- a/staprun/monitor.c +++ b/staprun/monitor.c -@@ -448,12 +448,12 @@ void monitor_render(void) +@@ -453,12 +453,12 @@ void monitor_render(void) if (active_window == 0) wattron(status, A_BOLD); wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n",
@@ -32,7 +32,7 @@ index 478634c09..f4fbfd686 100644 HIGHLIGHT("name", p_name, comp_fn_index)); if (active_window == 0) wattroff(status, A_BOLD); -@@ -466,17 +466,17 @@ void monitor_render(void) +@@ -471,17 +471,17 @@ void monitor_render(void) json_object *probe, *field; probe = json_object_array_get_idx(jso_probe_list, i); json_object_object_get_ex(probe, "index", &field);
@@ -56,6 +56,3 @@ index 478634c09..f4fbfd686 100644 getyx(status, discard, cur_x); json_object_object_get_ex(probe, "name", &field); wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); --- -2.20.1 -
meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch +8 -9
@@ -1,4 +1,4 @@ -From 3e13a006fe3dff9489269274093bf868532036e2 Mon Sep 17 00:00:00 2001 +From 3483d0bc400eb618add607097027eafb075722f4 Mon Sep 17 00:00:00 2001 From: Saul Wold <[email protected]> Date: Tue, 5 Sep 2017 16:02:55 -0700 Subject: [PATCH] staprun/stapbpf: don't support installing a non-root
@@ -10,15 +10,14 @@ the binaries. Upstream-Status: Inappropriate [Embedded] Signed-off-by: Saul Wold <[email protected]> --- - stapbpf/Makefile.am | 14 +++++++------- - staprun/Makefile.am | 12 ++++++------ - 2 files changed, 13 insertions(+), 13 deletions(-) + stapbpf/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) -Index: git/stapbpf/Makefile.am -=================================================================== ---- git.orig/stapbpf/Makefile.am -+++ git/stapbpf/Makefile.am -@@ -41,10 +41,10 @@ +diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am +index 4bd116bc3..e06d0801b 100644 +--- a/stapbpf/Makefile.am ++++ b/stapbpf/Makefile.am +@@ -40,10 +40,10 @@ git_version.stamp ../git_version.h: # Why the "id -u" condition? This way, an unprivileged user can run # make install, and have "sudo stap ...." or "sudo stapbpf ...." work later.
meta/recipes-kernel/systemtap/systemtap/readline.patch +18 -11
@@ -1,4 +1,7 @@ -configure: add option to enable/disable readline +From ee20cb1c1ca0337c56087934efbd66ba30d2d5c3 Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Mon, 13 Apr 2026 11:28:39 +0100 +Subject: [PATCH] configure: add option to enable/disable readline Add an option to control explicitly whether systemtap will look for and use readline, for reproducible builds.
@@ -10,11 +13,14 @@ not be used. Upstream-Status: Submitted [https://sourceware.org/pipermail/systemtap/2026q2/028333.html] Signed-off-by: Ross Burton <[email protected]> +--- + configure.ac | 67 +++++++++++++++++++++++++++++----------------------- + 1 file changed, 38 insertions(+), 29 deletions(-) -diff --git i/configure.ac w/configure.ac -index 6fb99da40..01457bafb 100644 ---- i/configure.ac -+++ w/configure.ac +diff --git a/configure.ac b/configure.ac +index 6fb99da40..2ec72e85a 100644 +--- a/configure.ac ++++ b/configure.ac @@ -525,38 +525,47 @@ AC_CHECK_HEADERS([rpm/rpmcrypto.h], [ have_rpmcrypto_h=yes AC_MSG_NOTICE([separate rpm/rpmcrypto.h])])
@@ -23,7 +29,7 @@ index 6fb99da40..01457bafb 100644 -dnl -dnl First save the orignal value of LIBS. -LIBS_no_readline=$LIBS - +- -dnl Check how for readline presence and how to link with it. On some -dnl systems you need to add a termcap compatible library. -have_libreadline="no"
@@ -31,6 +37,7 @@ index 6fb99da40..01457bafb 100644 -for libtermcap in "" tinfo ncursesw ncurses curses termcap; do - if test -z "$libtermcap"; then - READLINE_LIBS="-lreadline" ++ +AC_ARG_WITH([readline], + AS_HELP_STRING([--without-readline],[disable use of readline]), [], [with_readline="check"]) +
@@ -66,17 +73,17 @@ index 6fb99da40..01457bafb 100644 + READLINE_LIBS="" else - READLINE_LIBS="-lreadline -l$libtermcap" -+ AC_MSG_RESULT([$READLINE_LIBS]) -+ AC_DEFINE(HAVE_LIBREADLINE, [1], -+ [Define if you have the readline library (-lreadline).]) - fi +- fi - LIBS="$READLINE_LIBS $LIBS_no_readline" - AC_LINK_IFELSE( - [AC_LANG_CALL([],[readline])], - [have_libreadline="yes"]) - if test "$have_libreadline" = "yes"; then - break -- fi ++ AC_MSG_RESULT([$READLINE_LIBS]) ++ AC_DEFINE(HAVE_LIBREADLINE, [1], ++ [Define if you have the readline library (-lreadline).]) + fi -done -if test "$have_libreadline" = "no"; then - AC_MSG_RESULT([none])
meta/recipes-kernel/systemtap/systemtap_5.5.bb renamed from meta/recipes-kernel/systemtap/systemtap_5.4.bb +6 -0
@@ -76,6 +76,12 @@ do_configure:prepend () { # Improve reproducibility for c++ object files reltivepath="${@os.path.relpath(d.getVar('STAGING_INCDIR'), d.getVar('S'))}" sed -i "s:@RELATIVE_STAGING_INCDIR@:$reltivepath:g" ${S}/stringtable.h + + # These shouldn't be stored in git, as they can be spontaneously regenerated in + # non-reproducible ways in builds, if their timestamp is slightly newer than the + # source *.po file, depending on the order of git checkout. + # Use touch to avoid such re-generation. + touch ${S}/po/*.gmo } do_install:append () {
meta/recipes-kernel/systemtap/systemtap_git.inc +1 -2
@@ -5,11 +5,10 @@ SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;t file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ - file://0001-elaborate.cxx-fix-32-bit-build.patch \ file://readline.patch \ " -SRCREV = "911a1354aac264651fda932061e7f20d2ecc2471" +SRCREV = "90b164cf106ef16f873ab58c8c6f653718bb6e17" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64|riscv32).*-linux' COMPATIBLE_HOST:libc-musl = 'null'
Signature · 1 line
2.47.3
PATCH 6/8 kea: upgrade 3.0.3 -> 3.2.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop patches, as they're either backports
or not necessary anymore (issue solved upstream
differently).
Drop a chunk from fix-multilib-conflict.patch
as the file has been removed upstream.
---
.../files/0001-build-boost-1.89.0-fixes.patch | 59 ---
...s-dhcpsrv-Avoid-Boost-lexical_cast-o.patch | 348 ------------------
...se-a-runtime-safe-interpreter-string.patch | 20 +-
.../0001-mk_cfgrpt.sh-strip-prefixes.patch | 2 +-
...er_level_impl.cc-add-a-missing-inclu.patch | 24 --
...er_unittest_support.cc-do-not-write-.patch | 6 +-
.../kea/files/fix-multilib-conflict.patch | 27 +-
.../kea/{kea_3.0.3.bb => kea_3.2.0.bb} | 5 +-
8 files changed, 21 insertions(+), 470 deletions(-)
delete mode 100644 meta/recipes-connectivity/kea/files/0001-build-boost-1.89.0-fixes.patch
delete mode 100644 meta/recipes-connectivity/kea/files/0001-d2-dhcp-46-radius-dhcpsrv-Avoid-Boost-lexical_cast-o.patch
delete mode 100644 meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_level_impl.cc-add-a-missing-inclu.patch
rename meta/recipes-connectivity/kea/{kea_3.0.3.bb => kea_3.2.0.bb} (93%)meta/recipes-connectivity/kea/files/0001-build-boost-1.89.0-fixes.patch deleted +0 -59
@@ -1,59 +0,0 @@ -From c7d1036c6476ddca79a6beb03604a2364d7c469e Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 27 Aug 2025 22:20:09 -0700 -Subject: [PATCH] build: boost 1.89.0 fixes - -Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2771/] -Signed-off-by: Khem Raj <[email protected]> ---- - meson.build | 4 ++-- - src/lib/asiodns/io_fetch.cc | 1 + - src/lib/asiolink/interval_timer.cc | 1 + - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 8ed5b2d..d5723ba 100644 ---- a/meson.build -+++ b/meson.build -@@ -189,7 +189,7 @@ message(f'Detected system "@SYSTEM@".') - - #### Dependencies - --boost_dep = dependency('boost', version: '>=1.66', modules: ['system']) -+boost_dep = dependency('boost', version: '>=1.66') - dl_dep = dependency('dl') - threads_dep = dependency('threads') - add_project_dependencies(boost_dep, dl_dep, threads_dep, language: ['cpp']) -@@ -1094,7 +1094,7 @@ pkg.generate( - if TARGETS_GEN_MESSAGES.length() > 0 - alias_target('messages', TARGETS_GEN_MESSAGES) - else -- error( -+ warning( - 'No messages to generate. This is probably an error in the meson.build files.', - ) - endif -diff --git a/src/lib/asiodns/io_fetch.cc b/src/lib/asiodns/io_fetch.cc -index c140676..94f46fa 100644 ---- a/src/lib/asiodns/io_fetch.cc -+++ b/src/lib/asiodns/io_fetch.cc -@@ -22,6 +22,7 @@ - #include <dns/rcode.h> - #include <util/io.h> - -+#include <boost/asio/deadline_timer.hpp> - #include <boost/scoped_ptr.hpp> - #include <boost/date_time/posix_time/posix_time_types.hpp> - -diff --git a/src/lib/asiolink/interval_timer.cc b/src/lib/asiolink/interval_timer.cc -index fa0d9e1..1410a85 100644 ---- a/src/lib/asiolink/interval_timer.cc -+++ b/src/lib/asiolink/interval_timer.cc -@@ -9,6 +9,7 @@ - #include <asiolink/interval_timer.h> - #include <asiolink/io_service.h> - -+#include <boost/asio/deadline_timer.hpp> - #include <boost/enable_shared_from_this.hpp> - #include <boost/noncopyable.hpp> - #include <boost/shared_ptr.hpp>
meta/recipes-connectivity/kea/files/0001-d2-dhcp-46-radius-dhcpsrv-Avoid-Boost-lexical_cast-o.patch deleted +0 -348
348 lines not on this page · raw message
meta/recipes-connectivity/kea/files/0001-meson-use-a-runtime-safe-interpreter-string.patch +10 -10
@@ -1,4 +1,4 @@ -From f7024a5e7153538072a57858e1b48bbb806167e7 Mon Sep 17 00:00:00 2001 +From 312f5b7e8286c306502bed348fe5da765c20f98d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 28 Aug 2025 17:02:49 -0700 Subject: [PATCH] meson: use a runtime-safe interpreter string
@@ -25,7 +25,7 @@ Signed-off-by: Khem Raj <[email protected]> 5 files changed, 40 insertions(+), 6 deletions(-) diff --git a/doc/sphinx/meson.build b/doc/sphinx/meson.build -index 74ba705..71f1c7b 100644 +index 5fc5ee9..6485ce2 100644 --- a/doc/sphinx/meson.build +++ b/doc/sphinx/meson.build @@ -70,7 +70,13 @@ doc_conf.set('builddir', meson.current_build_dir())
@@ -44,10 +44,10 @@ index 74ba705..71f1c7b 100644 if PDFLATEX.found() doc_conf.set('HAVE_PDFLATEX', 'yes') diff --git a/meson.build b/meson.build -index d5723ba..3bb5185 100644 +index f3ef0ea..11a41cf 100644 --- a/meson.build +++ b/meson.build -@@ -638,9 +638,13 @@ link_args = [] +@@ -648,9 +648,13 @@ link_args = [] # Also, Meson might use it by default, but might not use it on all systems, so lots of variables... # EXECUTABLE_RPATH = f'$ORIGIN/../@LIBDIR@' # HOOK_RPATH = '$ORIGIN/../..'
@@ -62,7 +62,7 @@ index d5723ba..3bb5185 100644 # Add rpaths for NETCONF dependencies. if NETCONF_DEP.found() -@@ -759,7 +763,13 @@ report_conf_data.set('CXX_ARGS', ' '.join(compile_args)) +@@ -769,7 +773,13 @@ report_conf_data.set('CXX_ARGS', ' '.join(compile_args)) report_conf_data.set('LD_ID', cpp.get_linker_id()) link_args += get_option('cpp_link_args') report_conf_data.set('LD_ARGS', ' '.join(link_args))
@@ -76,9 +76,9 @@ index d5723ba..3bb5185 100644 +report_conf_data.set('PYTHON_PATH', py_for_runtime) report_conf_data.set('PYTHON_VERSION', PYTHON.version()) report_conf_data.set('PKGPYTHONDIR', PKGPYTHONDIR) - result = cpp.run( + result = cpp.get_define( diff --git a/src/bin/shell/meson.build b/src/bin/shell/meson.build -index 273293d..846a280 100644 +index d9d0863..75231ff 100644 --- a/src/bin/shell/meson.build +++ b/src/bin/shell/meson.build @@ -1,5 +1,11 @@
@@ -92,10 +92,10 @@ index 273293d..846a280 100644 +endif +kea_shell_conf_data.set('PYTHON', py_for_runtime) kea_shell_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION) - kea_shell_conf_data.set( - 'EXTENDED_VERSION', + kea_shell_conf_data.set('EXTENDED_VERSION', EXTENDED_VERSION) + kea_shell_conf_data.set('PKGPYTHONDIR', PKGPYTHONDIR) diff --git a/src/bin/shell/tests/meson.build b/src/bin/shell/tests/meson.build -index 18a7bc3..c5c07ad 100644 +index 077187a..32ae19a 100644 --- a/src/bin/shell/tests/meson.build +++ b/src/bin/shell/tests/meson.build @@ -3,7 +3,13 @@ if not TESTS_OPT.enabled()
meta/recipes-connectivity/kea/files/0001-mk_cfgrpt.sh-strip-prefixes.patch +1 -1
@@ -1,4 +1,4 @@ -From 920e4895c679a5bfda29e66fa199ad8e889659d0 Mon Sep 17 00:00:00 2001 +From 97599e59234b8d79748eb7b1cdd451c91e94152f Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 28 Aug 2025 17:31:39 -0700 Subject: [PATCH] mk_cfgrpt.sh: strip prefixes
meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_level_impl.cc-add-a-missing-inclu.patch deleted +0 -24
@@ -1,24 +0,0 @@ -From 1ad52a9bbec644e653cc67a596b811b70787c2dd Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 17 Dec 2025 12:36:24 +0100 -Subject: [PATCH] src/lib/log/logger_level_impl.cc: add a missing include to - address failures with boost 1.90.0 - -Upstream-Status: Inappropriate [a different, more invasive fix is being developed upstream https://gitlab.isc.org/isc-projects/kea/-/issues/4266] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - src/lib/log/logger_level_impl.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/log/logger_level_impl.cc b/src/lib/log/logger_level_impl.cc -index a4aba73..c2e4ee5 100644 ---- a/src/lib/log/logger_level_impl.cc -+++ b/src/lib/log/logger_level_impl.cc -@@ -10,6 +10,7 @@ - #include <string.h> - #include <iostream> - #include <boost/lexical_cast.hpp> -+#include <boost/static_assert.hpp> - - #include <log4cplus/logger.h> -
meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch +3 -3
@@ -1,4 +1,4 @@ -From 1a0a7b9633ebc4c171b8ee6db6fcf48e8e27a4b8 Mon Sep 17 00:00:00 2001 +From 39281b6199b1307b6b70f3163a70ab9ce4f445d0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 10 Nov 2020 15:57:03 +0000 Subject: [PATCH] src/lib/log/logger_unittest_support.cc: do not write build
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/log/logger_unittest_support.cc b/src/lib/log/logger_unittest_support.cc -index fc01c6e..f46d17e 100644 +index c90109c..a2729f8 100644 --- a/src/lib/log/logger_unittest_support.cc +++ b/src/lib/log/logger_unittest_support.cc -@@ -84,7 +84,7 @@ void initLogger(isc::log::Severity severity, int dbglevel) { +@@ -85,7 +85,7 @@ void initLogger(isc::log::Severity severity, int dbglevel) { const char* localfile = getenv("KEA_LOGGER_LOCALMSG"); // Set a directory for creating lockfiles when running tests
meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +6 -21
@@ -1,4 +1,4 @@ -From 00e2905dc622f98f608d253b1148a3d778131cad Mon Sep 17 00:00:00 2001 +From 5180d1866b99125d3353f76151e84644a5791e3d Mon Sep 17 00:00:00 2001 From: Kai Kang <[email protected]> Date: Tue, 14 Oct 2025 01:37:35 +0000 Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
@@ -19,27 +19,12 @@ Signed-off-by: Kai Kang <[email protected]> Signed-off-by: Lei Maohui <[email protected]> Signed-off-by: Liu Yiding <[email protected]> --- - src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++- - src/bin/keactrl/kea-dhcp4.conf.pre | 6 +++--- - src/bin/keactrl/kea-dhcp6.conf.pre | 6 +++--- - 3 files changed, 8 insertions(+), 7 deletions(-) + src/bin/keactrl/kea-dhcp4.conf.pre | 6 +++--- + src/bin/keactrl/kea-dhcp6.conf.pre | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre -index 29d8111..de71f41 100644 ---- a/src/bin/keactrl/kea-ctrl-agent.conf.pre -+++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre -@@ -85,7 +85,8 @@ - // Agent will fail to start. - "hooks-libraries": [ - // { --// "library": "@libdir@/kea/hooks/control-agent-commands.so", -+// // Replace $libdir with real library path /usr/lib or /usr/lib64 -+// "library": "$libdir/kea/hooks/control-agent-commands.so", - // "parameters": { - // "param1": "foo" - // } diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre -index 2a58507..86b5abf 100644 +index a6030eb..a1eedcd 100644 --- a/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre @@ -255,7 +255,7 @@
@@ -69,7 +54,7 @@ index 2a58507..86b5abf 100644 // ], diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre -index c69a508..2bb488f 100644 +index a16171f..14fe3f4 100644 --- a/src/bin/keactrl/kea-dhcp6.conf.pre +++ b/src/bin/keactrl/kea-dhcp6.conf.pre @@ -201,7 +201,7 @@
meta/recipes-connectivity/kea/kea_3.2.0.bb renamed from meta/recipes-connectivity/kea/kea_3.0.3.bb +1 -4
@@ -17,13 +17,10 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.xz \ file://kea.volatiles \ file://fix-multilib-conflict.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ - file://0001-build-boost-1.89.0-fixes.patch \ file://0001-meson-use-a-runtime-safe-interpreter-string.patch \ file://0001-mk_cfgrpt.sh-strip-prefixes.patch \ - file://0001-d2-dhcp-46-radius-dhcpsrv-Avoid-Boost-lexical_cast-o.patch \ - file://0001-src-lib-log-logger_level_impl.cc-add-a-missing-inclu.patch \ " -SRC_URI[sha256sum] = "09702ddb078b637e85de9236cbedd3fb9d7af7c6e797026c538b45748ad4d631" +SRC_URI[sha256sum] = "14bf695d37b65b9b1bf550fea5d0adaf9806c50e5419ef2a176a4b8e9aade3df" inherit meson pkgconfig systemd update-rc.d upstream-version-is-even
Signature · 1 line
2.47.3
PATCH 7/8 boost: upgrade 1.90.0 -> 1.91.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop 'system' from BOOST_LIBS, as it seems
to be header-only (no separate shared library)
in the new version.
---
.../boost/{boost-1.90.0.inc => boost-1.91.0.inc} | 2 +-
meta/recipes-support/boost/boost.inc | 1 -
...et-up-arch-instruction-set-flags-we-do-that-o.patch | 10 +++++-----
.../boost/0001-dont-setup-compiler-flags-m32-m64.patch | 4 ++--
.../boost/boost/boost-math-disable-pch-for-gcc.patch | 2 +-
.../boost/{boost_1.90.0.bb => boost_1.91.0.bb} | 0
6 files changed, 9 insertions(+), 10 deletions(-)
rename meta/recipes-support/boost/{boost-1.90.0.inc => boost-1.91.0.inc} (90%)
rename meta/recipes-support/boost/{boost_1.90.0.bb => boost_1.91.0.bb} (100%)meta/recipes-support/boost/boost-1.91.0.inc renamed from meta/recipes-support/boost/boost-1.90.0.inc +1 -1
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "https://archives.boost.io/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305" +SRC_URI[sha256sum] = "de5e6b0e4913395c6bdfa90537febd9028ea4c0735d2cdb0cd9b45d5f51264f5" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
meta/recipes-support/boost/boost.inc +0 -1
@@ -37,7 +37,6 @@ BOOST_LIBS = "\ random \ regex \ serialization \ - system \ test \ thread \ timer \
meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +5 -5
@@ -1,4 +1,4 @@ -From c2c2a53afc46775146c0960fc6c5f714530afa21 Mon Sep 17 00:00:00 2001 +From 98fff479c074472833dcacb815115f247e9023c7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 18 Dec 2018 15:42:57 +0100 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 153 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 2b6caed41..8325a3f65 100644 +index acf02ce26..becd0ad05 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1143,156 +1143,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1150,156 +1150,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : <architecture>$(architecture)/<instruction-set>$(instruction-set) : $(values) ; }
@@ -162,10 +162,10 @@ index 2b6caed41..8325a3f65 100644 -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; -# ARM --cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ; +-cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 ; -cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ; -cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ; --cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ; +-cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 ; -# AIX variant of RS/6000 & PowerPC -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; -
meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +2 -2
@@ -1,4 +1,4 @@ -From bb73dd0d99a13e9c5aecbed34b166ff810a00dae Mon Sep 17 00:00:00 2001 +From 03ec6a66ad60d224d56c0b85eae843b469b572e0 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Thu, 14 Nov 2019 10:13:53 +0800 Subject: [PATCH] dont setup compiler flags -m32/-m64
@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <[email protected]> 1 file changed, 16 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 8325a3f65..5a95046e7 100644 +index becd0ad05..e39bf8454 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam @@ -375,22 +375,6 @@ local rule compile-link-flags ( * )
meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch +1 -1
@@ -1,4 +1,4 @@ -From 52f928686da5ef699dec7f7a296c5226d82180c1 Mon Sep 17 00:00:00 2001 +From 2dd80802e0b9747ed32f45a886c7ad21b7fa61be Mon Sep 17 00:00:00 2001 From: Jackie Huang <[email protected]> Date: Fri, 23 Sep 2016 01:04:50 -0700 Subject: [PATCH] boost-math: disable pch for gcc
meta/recipes-support/boost/boost_1.91.0.bb renamed from meta/recipes-support/boost/boost_1.90.0.bb +0 -0
Signature · 1 line
2.47.3
PATCH 8/8 oeqa: allow exceptions in buildpath HOME checks
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Sometimes upstreams hardcode directories that match users' own home directories, which triggers a false positive in the test:
https://lists.yoctoproject.org/g/yocto/message/66612
It's very hard to programmatically establish what is hardcoded in the original source, and what is a genuine build contamination, so this adds a way to specify such occurences in recipes.
--- meta/classes-global/insane.bbclass | 4 ++-- meta/recipes-devtools/perl/perl_5.42.2.bb | 2 ++ meta/recipes-devtools/python/python3-numpy_2.4.6.bb | 2 ++ meta/recipes-devtools/python/python3-pytest_9.1.0.bb | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-)
meta/classes-global/insane.bbclass +2 -2
@@ -445,9 +445,9 @@ def package_qa_check_buildpaths(path, name, d, elf): if tmpdir in file_content: path = package_qa_clean_path(path, d, name) oe.qa.handle_error("buildpaths", "File %s in package %s contains reference to TMPDIR" % (path, name), d) - if homedir and homedir in file_content: + if homedir and homedir in file_content and not homedir.decode() in (d.getVar("OEQA_BUILDPATHS_SKIP") or "").split(): path = package_qa_clean_path(path, d, name) - oe.qa.handle_error("buildpaths", "File %s in package %s contains reference to the build host HOME directory" % (path, name), d) + oe.qa.handle_error("buildpaths", "File %s in package %s contains a reference to the build host HOME directory. If upstream hardcodes a directory path that matches your home, you can set OEQA_BUILDPATHS_SKIP = \"%s\" in the recipe." % (path, name, homedir.decode()), d) QAPATHTEST[xorg-driver-abi] = "package_qa_check_xorg_driver_abi"
meta/recipes-devtools/perl/perl_5.42.2.bb +2 -0
@@ -448,3 +448,5 @@ SSTATE_HASHEQUIV_FILEMAP = " \ populate_sysroot:*/lib*/perl5/config.sh:${TMPDIR} \ populate_sysroot:*/lib*/perl5/config.sh:${COREBASE} \ " + +OEQA_BUILDPATHS_SKIP = "/home/alex"
meta/recipes-devtools/python/python3-numpy_2.4.6.bb +2 -0
@@ -84,3 +84,5 @@ RDEPENDS:${PN}-ptest += "\ " BBCLASSEXTEND = "native nativesdk" + +OEQA_BUILDPATHS_SKIP = "/home/alex"
meta/recipes-devtools/python/python3-pytest_9.1.0.bb +2 -0
@@ -33,3 +33,5 @@ ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test" ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test" BBCLASSEXTEND = "native nativesdk" + +OEQA_BUILDPATHS_SKIP = "/home/user"
Signature · 1 line
2.47.3
Re: [OE-core] [PATCH 8/8] oeqa: allow exceptions in buildpath HOME checks
Quoted 33 lines · Alexander Kanavin via lists.openembedded.org
From: Alexander Kanavin <[email protected]>
Sometimes upstreams hardcode directories that match users' own home directories, which triggers a false positive in the test:
https://lists.yoctoproject.org/g/yocto/message/66612
It's very hard to programmatically establish what is hardcoded in the original source, and what is a genuine build contamination, so this adds a way to specify such occurences in recipes.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/classes-global/insane.bbclass | 4 ++-- meta/recipes-devtools/perl/perl_5.42.2.bb | 2 ++ meta/recipes-devtools/python/python3-numpy_2.4.6.bb | 2 ++ meta/recipes-devtools/python/python3-pytest_9.1.0.bb | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-)meta/classes-global/insane.bbclass +1
-1@@ -445,9 +445,9 @@ def package_qa_check_buildpaths(path, name, d, elf): if tmpdir in file_content: path = package_qa_clean_path(path, d, name) oe.qa.handle_error("buildpaths", "File %s in package %s contains reference to TMPDIR" % (path, name), d) - if homedir and homedir in file_content: + if homedir and homedir in file_content and not homedir.decode()
Quoted 2 lines
in (
d.getVar("OEQA_BUILDPATHS_SKIP")or "").split():
It works for the specific false-positive case, but it disables the HOME buildpath QA for the whole recipe whenever the builder’s HOME exactly matches that path, which could hide a real contamination in those recipes. Perhaps a narrowed down scope if possible maybe better.
Quoted 18 lines
path =
package_qa_clean_path(path, d, name)
- oe.qa.handle_error("buildpaths", "File %s in package %s
contains reference to the build host HOME directory" % (path, name), d)
+ oe.qa.handle_error("buildpaths", "File %s in package %s
contains a reference to the build host HOME directory. If upstream hardcodes a directory path that matches your home, you can setOEQA_BUILDPATHS_SKIP= \"%s\" in the recipe." % (path, name,homedir.decode()), d)QAPATHTEST[xorg-driver-abi] = "
package_qa_check_xorg_driver_abi"meta/recipes-devtools/perl/perl_5.42.2.bb +0
-0
meta/recipes-devtools/perl/perl_5.42.2.bb SSTATE_HASHEQUIV_FILEMAP = " \ · line 452
Quoted 5 lines
meta/recipes-devtools/perl/perl_5.42.2.bb +2
-0@@ -448,3 +448,5 @@ SSTATE_HASHEQUIV_FILEMAP = " \ populate_sysroot:*/lib*/perl5/config.sh:${TMPDIR} \ populate_sysroot:*/lib*/perl5/config.sh:${COREBASE} \ " + +OEQA_BUILDPATHS_SKIP = "/home/alex"
does this need to be hardcoded for every user ?
Quoted 37 lines
meta/recipes-devtools/python/python3-numpy_2.4.6.bb +2
-0@@ -84,3 +84,5 @@ RDEPENDS:${PN}-ptest += "\ " BBCLASSEXTEND = "native nativesdk" + +OEQA_BUILDPATHS_SKIP = "/home/alex"meta/recipes-devtools/python/python3-pytest_9.1.0.bb +2
-1@@ -33,3 +33,5 @@ ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test" ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test" BBCLASSEXTEND = "native nativesdk" + +OEQA_BUILDPATHS_SKIP = "/home/user" --2.47.3
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#239692):
https://lists.openembedded.org/g/openembedded-core/message/239692
Mute This Topic: https://lists.openembedded.org/mt/120001458/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 8/8] oeqa: allow exceptions in buildpath HOME checks
Quoted 2 lines · Khem Raj
It works for the specific false-positive case, but it disables the HOME buildpath QA for the whole recipe whenever the builder’s HOME exactly matches that path, which could hide a real contamination in those recipes. Perhaps a narrowed down scope if possible maybe better.
It would hide only on that machine for that username. The moment the recipe is built on a different machine by a different username, the real contamination would immediately appear, as it would not be covered by the exclusion variable.
Quoted 2 lines
Quoted 1 line
+OEQA_BUILDPATHS_SKIP = "
/home/alex"does this need to be hardcoded for every user ?
Why, no. Some files that perl installs contain hardcoded '/home/alex', so only that needs to be excluded.
Alex