ptest-packagelists.inc: correctly assign fast and slow tests
PATCH 1/24 ptest-packagelists.inc: correctly assign fast and slow tests
The execution times were checked from
https://autobuilder.yocto.io/pub/non-release/20221127-2/testresults/qemux86-64-ptest/core-image-ptest-all/log.do_testimage.40537.20221127010849
and ptests were moved both ways according to the same criteria:
more than 30 seconds or less.
openssl is dropped from fast tests, as it is also listed in slow tests (which is correct).
With the rearrangement fast ptests altogether take about 420 seconds on qemux86_64 with kvm.
m4 ptest was missing a depedency.
--- .../distro/include/ptest-packagelists.inc | 21 +++++++++---------- meta/recipes-devtools/m4/m4-1.4.19.inc | 1 + 2 files changed, 11 insertions(+), 11 deletions(-)
meta/conf/distro/include/ptest-packagelists.inc +10 -11
@@ -5,22 +5,22 @@ # PTESTS_FAST = "\ acl-ptest \ - apr-ptest \ apr-util-ptest \ attr-ptest \ + babeltrace-ptest \ + babeltrace2-ptest \ bc-ptest \ bluez5-ptest \ - bzip2-ptest \ + busybox-ptest \ diffstat-ptest \ diffutils-ptest \ - elfutils-ptest \ ethtool-ptest \ expat-ptest \ + findutils-ptest \ flex-ptest \ gawk-ptest \ gdbm-ptest \ gdk-pixbuf-ptest \ - gettext-ptest \ glib-networking-ptest \ gzip-ptest \ json-c-ptest \
@@ -29,7 +29,6 @@ PTESTS_FAST = "\ liberror-perl-ptest \ libgpg-error-ptest\ libnl-ptest \ - libmodule-build-perl-ptest \ libpcre-ptest \ libssh2-ptest \ libtimedate-perl-ptest \
@@ -50,10 +49,8 @@ PTESTS_FAST = "\ lzo-ptest \ m4-ptest \ nettle-ptest \ - openssl-ptest \ opkg-ptest \ pango-ptest \ - parted-ptest \ popt-ptest \ python3-atomicwrites-ptest \ python3-bcrypt-ptest \
@@ -82,21 +79,23 @@ PTESTS_FAST:remove:riscv32 = "qemu-ptest" PTESTS_PROBLEMS:append:riscv32 = " qemu-ptest" PTESTS_SLOW = "\ - babeltrace-ptest \ - babeltrace2-ptest \ - busybox-ptest \ + apr-ptest \ + bzip2-ptest \ coreutils-ptest \ curl-ptest \ dbus-ptest \ e2fsprogs-ptest \ - findutils-ptest \ + elfutils-ptest \ + gettext-ptest \ glib-2.0-ptest \ gstreamer1.0-ptest \ libevent-ptest \ libgcrypt-ptest \ + libmodule-build-perl-ptest \ lttng-tools-ptest \ openssh-ptest \ openssl-ptest \ + parted-ptest \ perl-ptest \ python3-cryptography-ptest \ python3-ptest \
meta/recipes-devtools/m4/m4-1.4.19.inc +1 -0
@@ -54,6 +54,7 @@ do_install_ptest() { RDEPENDS:${PN}-ptest += "make coreutils diffutils" RDEPENDS:${PN}-ptest:append:libc-glibc = "\ + locale-base-fr-fr \ locale-base-fr-fr.iso-8859-1 \ "
Signature · 1 line
2.30.2
PATCH 2/24 devtool/upgrade: correctly handle recipes where S is a subdir of upstream tree
'devtool modify' writes additional settings to workspace .bbappend so that this can be handled correctly, but 'devtool upgrade' does not. This adds the missing settings.
In particular, local files should not anymore mysteriously disappear from SRC_URIs on upgrades.
--- scripts/lib/devtool/standard.py | 19 +++++++++++-------- scripts/lib/devtool/upgrade.py | 18 ++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-)
scripts/lib/devtool/standard.py +11 -8
@@ -765,6 +765,16 @@ def get_staging_kbranch(srcdir): staging_kbranch = "".join(branch.split('\n')[0]) return staging_kbranch +def get_real_srctree(srctree, s, workdir): + # Check that recipe isn't using a shared workdir + s = os.path.abspath(s) + workdir = os.path.abspath(workdir) + if s.startswith(workdir) and s != workdir and os.path.dirname(s) != workdir: + # Handle if S is set to a subdirectory of the source + srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1] + srctree = os.path.join(srctree, srcsubdir) + return srctree + def modify(args, config, basepath, workspace): """Entry point for the devtool 'modify' subcommand""" import bb
@@ -923,14 +933,7 @@ def modify(args, config, basepath, workspace): # Need to grab this here in case the source is within a subdirectory srctreebase = srctree - - # Check that recipe isn't using a shared workdir - s = os.path.abspath(rd.getVar('S')) - workdir = os.path.abspath(rd.getVar('WORKDIR')) - if s.startswith(workdir) and s != workdir and os.path.dirname(s) != workdir: - # Handle if S is set to a subdirectory of the source - srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1] - srctree = os.path.join(srctree, srcsubdir) + srctree = get_real_srctree(srctree, rd.getVar('S'), rd.getVar('WORKDIR')) bb.utils.mkdirhier(os.path.dirname(appendfile)) with open(appendfile, 'w') as f:
scripts/lib/devtool/upgrade.py +8 -10
@@ -88,7 +88,7 @@ def _rename_recipe_files(oldrecipe, bpn, oldpv, newpv, path): _rename_recipe_dirs(oldpv, newpv, path) return _rename_recipe_file(oldrecipe, bpn, oldpv, newpv, path) -def _write_append(rc, srctree, same_dir, no_same_dir, rev, copied, workspace, d): +def _write_append(rc, srctreebase, srctree, same_dir, no_same_dir, rev, copied, workspace, d): """Writes an append file""" if not os.path.exists(rc): raise DevtoolError("bbappend not created because %s does not exist" % rc)
@@ -104,6 +104,11 @@ def _write_append(rc, srctree, same_dir, no_same_dir, rev, copied, workspace, d) af = os.path.join(appendpath, '%s.bbappend' % brf) with open(af, 'w') as f: f.write('FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n\n') + # Local files can be modified/tracked in separate subdir under srctree + # Mostly useful for packages with S != WORKDIR + f.write('FILESPATH:prepend := "%s:"\n' % + os.path.join(srctreebase, 'oe-local-files')) + f.write('# srctreebase: %s\n' % srctreebase) f.write('inherit externalsrc\n') f.write(('# NOTE: We use pn- overrides here to avoid affecting' 'multiple variants in the case where the recipe uses BBCLASSEXTEND\n'))
@@ -524,14 +529,7 @@ def upgrade(args, config, basepath, workspace): else: srctree = standard.get_default_srctree(config, pn) - # Check that recipe isn't using a shared workdir - s = os.path.abspath(rd.getVar('S')) - workdir = os.path.abspath(rd.getVar('WORKDIR')) - srctree_s = srctree - if s.startswith(workdir) and s != workdir and os.path.dirname(s) != workdir: - # Handle if S is set to a subdirectory of the source - srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1] - srctree_s = os.path.join(srctree, srcsubdir) + srctree_s = standard.get_real_srctree(srctree, rd.getVar('S'), rd.getVar('WORKDIR')) # try to automatically discover latest version and revision if not provided on command line if not args.version and not args.srcrev:
@@ -575,7 +573,7 @@ def upgrade(args, config, basepath, workspace): _upgrade_error(e, recipedir, srctree, args.keep_failure) standard._add_md5(config, pn, os.path.dirname(rf)) - af = _write_append(rf, srctree_s, args.same_dir, args.no_same_dir, rev2, + af = _write_append(rf, srctree, srctree_s, args.same_dir, args.no_same_dir, rev2, copied, config.workspace_path, rd) standard._add_md5(config, pn, af)
Signature · 1 line
2.30.2
PATCH 3/24 llvm: update 15.0.4 -> 15.0.6
In reply to Alexander Kanavin--- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/llvm/llvm_git.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -26,7 +26,7 @@ QEMUVERSION ?= "7.1%" GOVERSION ?= "1.19%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "15.0.4" +LLVMVERSION ?= "15.0.6" RUSTVERSION ?= "1.65%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
meta/recipes-devtools/llvm/llvm_git.bb +2 -2
@@ -19,14 +19,14 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -PV = "15.0.4" +PV = "15.0.6" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "5c68a1cb123161b54b72ce90e7975d95a8eaf2a4" +SRCREV = "088f33605d8a61ff519c580a71b1dd57d16a03f8" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \
Signature · 1 line
2.30.2
PATCH 4/24 tcmode-default.inc: set LLVMVERSION to a major version wildcard
In reply to Alexander KanavinThere is no longer need to be specific: none of the recipes using this variable in core need to know the particular version of llvm exactly when using the default one set via PREFERRED_VERSION from LLVMVERSION.
This as well enables automated version updates of llvm for minor releases.
--- meta/classes-recipe/meson.bbclass | 2 +- meta/conf/distro/include/tcmode-default.inc | 4 +--- meta/recipes-graphics/mesa/mesa.inc | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
meta/classes-recipe/meson.bbclass +1 -1
@@ -72,7 +72,7 @@ strip = ${@meson_array('STRIP', d)} readelf = ${@meson_array('READELF', d)} objcopy = ${@meson_array('OBJCOPY', d)} pkgconfig = 'pkg-config' -llvm-config = 'llvm-config${LLVMVERSION}' +llvm-config = 'llvm-config' cups-config = 'cups-config' g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper'
meta/conf/distro/include/tcmode-default.inc +1 -3
@@ -24,9 +24,7 @@ GLIBCVERSION ?= "2.36" LINUXLIBCVERSION ?= "5.19%" QEMUVERSION ?= "7.1%" GOVERSION ?= "1.19%" -# This can not use wildcards like 8.0.% since it is also used in mesa to denote -# llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "15.0.6" +LLVMVERSION ?= "15.%" RUSTVERSION ?= "1.65%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
meta/recipes-graphics/mesa/mesa.inc +1 -1
@@ -58,7 +58,7 @@ ANY_OF_DISTRO_FEATURES:class-target = "opengl vulkan" PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" -MESA_LLVM_RELEASE ?= "${LLVMVERSION}" +MESA_LLVM_RELEASE ?= "" # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug' # by default the upstream mesa sources build a debug release
Signature · 1 line
2.30.2
PATCH 5/24 python3-numpy: fix upstream version check
In reply to Alexander KanavinDefault regex is also considering numpy release candidates.
--- meta/recipes-devtools/python/python3-numpy_1.23.4.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/python/python3-numpy_1.23.4.bb +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ SRC_URI[sha256sum] = "ed2cc92af0efad20198638c69bb0fc2870a58dabfba6eb722c933b48556c686c" GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" DEPENDS += "python3-cython-native"
Signature · 1 line
2.30.2
PATCH 6/24 python3-poetry-core: update 1.3.2 -> 1.4.0
In reply to Alexander KanavinUpstream has changed the tarball and the dir inside it to poetry_core (with underscore).
License-Update: formatting, copyright years.
---
...-poetry-core_1.3.2.bb => python3-poetry-core_1.4.0.bb} | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python3-poetry-core_1.3.2.bb => python3-poetry-core_1.4.0.bb} (84%)meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb renamed from meta/recipes-devtools/python/python3-poetry-core_1.3.2.bb +5 -3
@@ -10,19 +10,21 @@ LIC_FILES_CHKSUM = "\ file://src/poetry/core/_vendor/attr/_version_info.py;beginline=1;endline=1;md5=b2dccaa94b3629a08bfb4f983cad6f89 \ file://src/poetry/core/_vendor/attrs/LICENSE;md5=5e55731824cf9205cfabeab9a0600887 \ file://src/poetry/core/_vendor/jsonschema/COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8 \ - file://src/poetry/core/_vendor/lark/LICENSE;md5=b37b83a9cf129d92ee65aaa71c01ce72 \ + file://src/poetry/core/_vendor/lark/LICENSE;md5=fcfbf1e2ecc0f37acbb5871aa0267500 \ file://src/poetry/core/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ file://src/poetry/core/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \ file://src/poetry/core/_vendor/packaging/LICENSE.BSD;md5=7bef9bf4a8e4263634d0597e7ba100b8 \ file://src/poetry/core/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \ file://src/poetry/core/_vendor/pyrsistent/LICENSE.mit;md5=b695eb9c6e7a6fb1b1bc2d193c42776e \ file://src/poetry/core/_vendor/tomlkit/LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82 \ - file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f \ + file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \ " -SRC_URI[sha256sum] = "0ab006a40cb38d6a38b97264f6835da2f08a96912f2728ce668e9ac6a34f686f" +SRC_URI[sha256sum] = "514bd33c30e0bf56b0ed44ee15e120d7e47b61ad908b2b1011da68c48a84ada9" inherit python_poetry_core pypi +PYPI_ARCHIVE_NAME = "poetry_core-${PV}.${PYPI_PACKAGE_EXT}" +S = "${WORKDIR}/poetry_core-${PV}" RDEPENDS:${PN}:append:class-target = "\ python3-compression \
Signature · 1 line
2.30.2
Re: [OE-core] [PATCH 06/24] python3-poetry-core: update 1.3.2 -> 1.4.0
Quoted 69 lines · Alexander Kanavin
Upstream has changed the tarball and the dir inside it to
poetry_core(with underscore).License-Update: formatting, copyright years.
Signed-off-by Alexander Kanavin <[email protected]>--- ...-poetry-core_1.3.2.bb => python3-poetry-core_1.4.0.bb} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-poetry-core_1.3.2.bb =>python3-poetry-core_1.4.0.bb} (84%)
meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb renamed from meta/recipes-devtools/python/python3-poetry-core_1.3.2.bb +0
-1@@ -10,19 +10,21 @@ LIC_FILES_CHKSUM = "\ file://src/poetry/core/_vendor/attr/_version_info.py;beginline=1;endline=1;md5=b2dccaa94b3629a08bfb4f983cad6f89 \ file://src/poetry/core/_vendor/attrs/LICENSE;md5=5e55731824cf9205cfabeab9a0600887 \ file://src/poetry/core/_vendor/jsonschema/COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8 \ -file://src/poetry/core/_vendor/lark/LICENSE;md5=b37b83a9cf129d92ee65aaa71c01ce72 \
+ file://src/poetry/core/_vendor/lark/LICENSE;md5=fcfbf1e2ecc0f37acbb5871aa0267500 \file://src/poetry/core/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91
\file://src/poetry/core/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93
\file://src/poetry/core/_vendor/packaging/LICENSE.BSD;md5=7bef9bf4a8e4263634d0597e7ba100b8
\file://src/poetry/core/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1
\file://src/poetry/core/_vendor/pyrsistent/LICENSE.mit;md5=b695eb9c6e7a6fb1b1bc2d193c42776e
\file://src/poetry/core/_vendor/tomlkit/LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82
\
- file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f \
+ file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \
"-SRC_URI[sha256sum] = "
0ab006a40cb38d6a38b97264f6835da2f08a96912f2728ce668e9ac6a34f686f" +SRC_URI[sha256sum] = "514bd33c30e0bf56b0ed44ee15e120d7e47b61ad908b2b1011da68c48a84ada9"inherit
python_poetry_corepypi
meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb LIC_FILES_CHKSUM = "\ · line 27
Quoted 2 lines
meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb renamed from meta/recipes-devtools/python/python3-poetry-core_1.3.2.bb +2
-0+PYPI_ARCHIVE_NAME = "poetry_core-${PV}.${PYPI_PACKAGE_EXT}" +S = "${WORKDIR}/poetry_core-${PV}"
Thank you. I had this staged but my local tests showed ‘devtool check-upgrade-status’ went wonky.
I appreciate you keeping us up to date.
Quoted 17 lines
RDEPENDS:${PN}:append:class-target = "\ python3-compression \--
2.30.2-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#174516):
https://lists.openembedded.org/g/openembedded-core/message/174516
Mute This Topic: https://lists.openembedded.org/mt/95642216/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 06/24] python3-poetry-core: update 1.3.2 -> 1.4.0
Quoted 3 lines · Tim Orling
Thank you. I had this staged but my local tests showed ‘devtool check-upgrade-status’ went wonky.
I appreciate you keeping us up to date.
Cheers. I picked this one up because it was in the list of fails that AUH couldn't handle.
I think it's time we move a big bunch of listed maintainers who never react to AUH (this is not you) to 'Unassigned'. The problem should then at least be better seen, if not solved.
Alex
PATCH 7/24 tcl: update 8.6.12 -> 8.6.13
In reply to Alexander Kanavin---
.../tcltk/tcl/alter-includedir.patch | 18 ++++++++----------
.../tcltk/tcl/fix_non_native_build_issue.patch | 11 +++++++----
.../tcltk/{tcl_8.6.12.bb => tcl_8.6.13.bb} | 2 +-
3 files changed, 16 insertions(+), 15 deletions(-)
rename meta/recipes-devtools/tcltk/{tcl_8.6.12.bb => tcl_8.6.13.bb} (97%)meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +8 -10
@@ -1,4 +1,4 @@ -From c6960f4ca82a153416d138221dd2426475aed683 Mon Sep 17 00:00:00 2001 +From 27e5595c065ce3af687818555a882ab5e1dfbc2b Mon Sep 17 00:00:00 2001 From: Mingli Yu <[email protected]> Date: Tue, 22 Nov 2022 18:48:27 +0800 Subject: [PATCH] tcl: update the header location
@@ -19,6 +19,7 @@ to detect tcl doesn't find the header. Signed-off-by: Robert Yang <[email protected]> Signed-off-by: Yi Zhao <[email protected]> Signed-off-by: Mingli Yu <[email protected]> + --- unix/Makefile.in | 2 +- unix/configure.in | 4 ++--
@@ -26,7 +27,7 @@ Signed-off-by: Mingli Yu <[email protected]> 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index 0ebac43..b0c3ee0 100644 +index 0b8179f..4824b28 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
@@ -39,10 +40,10 @@ index 0ebac43..b0c3ee0 100644 # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ diff --git a/unix/configure.in b/unix/configure.in -index 9f96e2b..e323e02 100644 +index 0354a0b..2d0c00f 100644 --- a/unix/configure.in +++ b/unix/configure.in -@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +@@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
@@ -51,7 +52,7 @@ index 9f96e2b..e323e02 100644 HTML_DIR='$(DISTDIR)/html' # Note: in the following variable, it's important to use the absolute -@@ -894,7 +894,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -895,7 +895,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" # Install time header dir can be set via --includedir
@@ -61,7 +62,7 @@ index 9f96e2b..e323e02 100644 #------------------------------------------------------------------------ # tclConfig.sh refers to this by a different name diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in -index 846cb11..72ca44b 100644 +index 93b5e69..dcd51d7 100644 --- a/unix/tcl.pc.in +++ b/unix/tcl.pc.in @@ -3,7 +3,7 @@
@@ -70,9 +71,6 @@ index 846cb11..72ca44b 100644 libdir=@libdir@ -includedir=@includedir@ +includedir=@includedir@/tcl@PACKAGE_VERSION@ + libfile=@TCL_LIB_FILE@ Name: Tool Command Language - Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses. --- -2.25.1 -
meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +7 -4
@@ -1,4 +1,4 @@ -From 34c3a1adc1bfd13fb877179c37ef74a108f2a749 Mon Sep 17 00:00:00 2001 +From 8a6c77cdd265fe7ce35929f58f1ade0c6bc4025b Mon Sep 17 00:00:00 2001 From: Nitin A Kamble <[email protected]> Date: Fri, 13 Aug 2010 12:24:00 -0700 Subject: [PATCH] tcl: fix a build issue
@@ -10,10 +10,10 @@ Upstream-Status: Inappropriate [upstream does not support installed tests] 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index 804532e..a9cb339 100644 +index b110fe9..d7b35a8 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in -@@ -810,23 +810,23 @@ tcltest-real: +@@ -814,23 +814,23 @@ tcltest-real: test: test-tcl test-packages test-tcl: ${TCLTEST_EXE}
@@ -41,7 +41,7 @@ index 804532e..a9cb339 100644 # The following target generates the shared libraries in dltest/ that are used # for testing; they are included as part of the "tcltest" target (via the -@@ -844,25 +844,25 @@ dltest.marker: ${STUB_LIB_FILE} +@@ -848,28 +848,28 @@ dltest.marker: ${STUB_LIB_FILE} # This target can be used to run tclsh from the build directory # via `make shell SCRIPT=/tmp/foo.tcl` shell: ${TCL_EXE}
@@ -53,6 +53,9 @@ index 804532e..a9cb339 100644 - $(SHELL_ENV) $(GDB) ./${TCL_EXE} + $(SHELL_ENV) $(GDB) ${TCL_EXE} + lldb: ${TCL_EXE} + $(SHELL_ENV) $(LLDB) ./${TCL_EXE} + valgrind: ${TCL_EXE} ${TCLTEST_EXE} - $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} \ + $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCLTEST_EXE} \
meta/recipes-devtools/tcltk/tcl_8.6.13.bb renamed from meta/recipes-devtools/tcltk/tcl_8.6.12.bb +1 -1
@@ -25,7 +25,7 @@ SRC_URI = "${BASE_SRC_URI} \ file://interp.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "186748f1131cef3d637421a18d70892f808e526a29c694bebfeb1c540f98727c" +SRC_URI[sha256sum] = "c61f0d6699e2bc7691f119b41963aaa8dc980f23532c4e937739832a5f4a6642" SRC_URI:class-native = "${BASE_SRC_URI}"
Signature · 1 line
2.30.2
PATCH 8/24 libnewt: update 0.52.21 -> 0.52.23
In reply to Alexander Kanavin---
.../0001-detect-gold-as-GNU-linker-too.patch | 14 ++++-----
...-t-ignore-CFLAGS-when-building-snack.patch | 29 -------------------
...{libnewt_0.52.21.bb => libnewt_0.52.23.bb} | 4 +--
3 files changed, 7 insertions(+), 40 deletions(-)
delete mode 100644 meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch
rename meta/recipes-extended/newt/{libnewt_0.52.21.bb => libnewt_0.52.23.bb} (87%)meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch +6 -8
@@ -1,4 +1,4 @@ -From 58245b859ffbcb1780575bf1b0a018d55e74e434 Mon Sep 17 00:00:00 2001 +From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Wed, 21 Sep 2016 21:14:40 +0200 Subject: [PATCH] detect gold as GNU linker too
@@ -9,23 +9,21 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending Signed-off-by: Andreas Müller <[email protected]> + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 03e8bda..c2fce51 100644 +index 468c718..cd93f30 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *]) AC_MSG_CHECKING([for GNU ld]) - LD=`$CC -print-prog-name=ld 2>&5` + LD=$($CC -print-prog-name=ld 2>&5) --if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then -+if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU "` = 0; then +-if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then ++if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ") = 0; then # Not GNU_LD="" AC_MSG_RESULT([no]) --- -2.5.5 -
meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From f60dc1063607ca1f201ba4cbda467d8af3f78f64 Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar <[email protected]> -Date: Tue, 1 Oct 2019 16:37:55 +0200 -Subject: [PATCH] don't ignore CFLAGS when building snack - -In addition to the flags returned by python-config --cflags, use the -user-specified CFLAGS when building the snack object. - -Upstream-Status: Backport from master -Signed-off-by: Joshua Watt <[email protected]> ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index be5f87b..6facd5e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -96,8 +96,8 @@ _snack.$(SOEXT): snack.c $(LIBNEWTSH) - PIFLAGS=`$$pyconfig --includes`; \ - PLDFLAGS=`$$pyconfig --ldflags`; \ - PLFLAGS=`$$pyconfig --libs`; \ -- echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ -- $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ -+ echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ -+ $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ - echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ - $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ - done || :
meta/recipes-extended/newt/libnewt_0.52.23.bb renamed from meta/recipes-extended/newt/libnewt_0.52.21.bb +1 -3
@@ -21,11 +21,9 @@ SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ file://cross_ar.patch \ file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ file://0001-detect-gold-as-GNU-linker-too.patch \ - file://0002-don-t-ignore-CFLAGS-when-building-snack.patch \ " -SRC_URI[md5sum] = "a0a5fd6b53bb167a65e15996b249ebb5" -SRC_URI[sha256sum] = "265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31" +SRC_URI[sha256sum] = "caa372907b14ececfe298f0d512a62f41d33b290610244a58aed07bbc5ada12a" S = "${WORKDIR}/newt-${PV}"
Signature · 1 line
2.30.2
PATCH 9/24 gtk+3: update 3.24.34 -> 3.24.35
In reply to Alexander Kanavin---
...-Add-disable-opengl-configure-option.patch | 60 +++++++++----------
.../{gtk+3_3.24.34.bb => gtk+3_3.24.35.bb} | 2 +-
2 files changed, 31 insertions(+), 31 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.24.34.bb => gtk+3_3.24.35.bb} (89%)meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +30 -30
@@ -1,4 +1,4 @@ -From eef50c94587fc30cd624adb5eb213eb9fa663dc1 Mon Sep 17 00:00:00 2001 +From 8f3edf5f8379ac482d9eb7a64d7408b5f95535ce Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Tue, 21 Jun 2016 15:11:39 +0300 Subject: [PATCH] Add --disable-opengl configure option
@@ -25,7 +25,7 @@ Signed-off-by: Jussi Kukkonen <[email protected]> demos/gtk-demo/glarea.c | 14 ++++++ docs/tools/Makefile.am | 9 +++- docs/tools/widgets.c | 4 +- - gdk/Makefile.am | 8 ++- + gdk/gdk-sources.inc | 8 ++- gdk/gdkdisplay.c | 4 +- gdk/gdkgl.c | 10 ++++ gdk/gdkglcontext.c | 6 +++
@@ -47,7 +47,7 @@ Signed-off-by: Jussi Kukkonen <[email protected]> create mode 100644 gdk/x11/gdkx-without-gl-context.h diff --git a/configure.ac b/configure.ac -index 851bcbf..6cbf6a2 100644 +index 9ed65e5..70c6836 100644 --- a/configure.ac +++ b/configure.ac @@ -346,6 +346,15 @@ AC_ARG_ENABLE(cloudproviders,
@@ -66,7 +66,7 @@ index 851bcbf..6cbf6a2 100644 AC_ARG_ENABLE(glx, [AS_HELP_STRING([--enable-glx], [When enabled Gdk will try to initialize GLX])]) -@@ -1345,7 +1354,7 @@ CFLAGS="$saved_cflags" +@@ -1367,7 +1376,7 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
@@ -75,7 +75,7 @@ index 851bcbf..6cbf6a2 100644 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" -@@ -1379,7 +1388,7 @@ fi +@@ -1401,7 +1410,7 @@ fi PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
@@ -209,11 +209,11 @@ index 932daf1..54239d6 100644 info = new_widget_info ("glarea", widget, MEDIUM); return info; -diff --git a/gdk/Makefile.am b/gdk/Makefile.am -index 710a548..b45f631 100644 ---- a/gdk/Makefile.am -+++ b/gdk/Makefile.am -@@ -274,7 +274,6 @@ x11_introspection_files = \ +diff --git a/gdk/gdk-sources.inc b/gdk/gdk-sources.inc +index 9235edb..eb59524 100644 +--- a/gdk/gdk-sources.inc ++++ b/gdk/gdk-sources.inc +@@ -146,7 +146,6 @@ x11_introspection_files = \ x11/gdkeventsource.c \ x11/gdkeventtranslator.c \ x11/gdkgeometry-x11.c \
@@ -221,7 +221,7 @@ index 710a548..b45f631 100644 x11/gdkkeys-x11.c \ x11/gdkmain-x11.c \ x11/gdkmonitor-x11.c \ -@@ -300,7 +299,6 @@ x11_introspection_files = \ +@@ -172,7 +171,6 @@ x11_introspection_files = \ x11/gdkx11display.h \ x11/gdkx11displaymanager.h \ x11/gdkx11dnd.h \
@@ -229,19 +229,19 @@ index 710a548..b45f631 100644 x11/gdkx11keys.h \ x11/gdkx11monitor.h \ x11/gdkx11property.h \ -@@ -310,6 +308,12 @@ x11_introspection_files = \ +@@ -182,6 +180,12 @@ x11_introspection_files = \ x11/gdkx11visual.h \ x11/gdkx11window.h +if HAVE_OPENGL -+x11_introspection_files += \ -+ x11/gdkglcontext-x11.c \ -+ x11/gdkx11glcontext.h ++x11_introspection_files += \ ++ x11/gdkglcontext-x11.c \ ++ x11/gdkx11glcontext.h +endif + - GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile - GdkX11_3_0_gir_SCANNERFLAGS = \ - --identifier-prefix=Gdk \ + w32_introspection_files = \ + win32/gdkcursor-win32.c \ + win32/gdkdevicemanager-win32.c \ diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 748f548..911ab2a 100644 --- a/gdk/gdkdisplay.c
@@ -380,7 +380,7 @@ index 3b23639..1f04f8e 100644 /** diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index 2de8ba4..1883a79 100644 +index 727b0cf..d4d91b0 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -45,7 +45,9 @@
@@ -538,10 +538,10 @@ index 7e08f47..30fd7b6 100644 display_class->get_default_seat = gdk_x11_display_get_default_seat; diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c -index bb4df05..46f5349 100644 +index c2b7480..114fd4c 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c -@@ -1827,3 +1827,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) +@@ -1842,3 +1842,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) { return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); }
@@ -551,7 +551,7 @@ index bb4df05..46f5349 100644 +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} +#endif diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 721d9bb..8e87acc 100644 +index 194bc82..0302bb6 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -36,7 +36,9 @@
@@ -564,7 +564,7 @@ index 721d9bb..8e87acc 100644 #include "gdkprivate-x11.h" #include "gdk-private.h" -@@ -5881,7 +5883,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) +@@ -5888,7 +5890,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; impl_class->show_window_menu = gdk_x11_window_show_window_menu;
@@ -668,10 +668,10 @@ index 0000000..c9e2617 + +#endif /* __GDK_X_H__ */ diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 074fb35..4fa9eb6 100644 +index 946e72f..b01da7f 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1457,7 +1457,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s +@@ -467,7 +467,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ sort | uniq | \
@@ -777,7 +777,7 @@ index 802303e..33001cf 100644 static gboolean diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index 48237d1..1f9b9be 100644 +index 4fd0c30..a8e59ed 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -33,8 +33,10 @@
@@ -791,7 +791,7 @@ index 48237d1..1f9b9be 100644 #ifdef GDK_WINDOWING_WIN32 #include "win32/gdkwin32.h" -@@ -196,6 +198,7 @@ add_label_row (GtkInspectorGeneral *gen, +@@ -217,6 +219,7 @@ add_label_row (GtkInspectorGeneral *gen, gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); }
@@ -799,7 +799,7 @@ index 48237d1..1f9b9be 100644 #ifdef GDK_WINDOWING_X11 static void append_glx_extension_row (GtkInspectorGeneral *gen, -@@ -205,6 +208,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, +@@ -226,6 +229,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, add_check_row (gen, GTK_LIST_BOX (gen->priv->gl_box), ext, epoxy_has_glx_extension (dpy, 0, ext), 0); } #endif
@@ -807,7 +807,7 @@ index 48237d1..1f9b9be 100644 #ifdef GDK_WINDOWING_WAYLAND static void -@@ -254,6 +258,7 @@ wayland_get_display (struct wl_display *wl_display) +@@ -275,6 +279,7 @@ wayland_get_display (struct wl_display *wl_display) static void init_gl (GtkInspectorGeneral *gen) {
@@ -815,7 +815,7 @@ index 48237d1..1f9b9be 100644 #ifdef GDK_WINDOWING_X11 if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { -@@ -280,6 +285,7 @@ init_gl (GtkInspectorGeneral *gen) +@@ -301,6 +306,7 @@ init_gl (GtkInspectorGeneral *gen) } else #endif
meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.34.bb +1 -1
@@ -7,7 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec" +SRC_URI[sha256sum] = "ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1" S = "${WORKDIR}/gtk+-${PV}"
Signature · 1 line
2.30.2
Re: [OE-core] [PATCH 09/24] gtk+3: update 3.24.34 -> 3.24.35
I just posted this, and have a followup to move to Meson too that is just going through the final tweaks.
Ross
Quoted 234 lines · Alexander Kanavin via lists.openembedded.org
Signed-off-by Alexander Kanavin <[email protected]>---
...-Add-disable-opengl-configure-option.patch | 60 +++++++++----------
.../{gtk+3_3.24.34.bb => gtk+3_3.24.35.bb} | 2 +-2 files changed, 31 insertions(+), 31 deletions(-)rename meta/recipes-gnome/gtk+/{gtk+3_3.24.34.bb => gtk+3_3.24.35.bb} (89%)
meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +1
-1@@ -1,4 +1,4 @@ -From eef50c94587fc30cd624adb5eb213eb9fa663dc1 Mon Sep 17 00:00:00 2001 +From 8f3edf5f8379ac482d9eb7a64d7408b5f95535ce Mon Sep 17 00:00:00 2001From: Jussi Kukkonen <[email protected]>
Date: Tue, 21 Jun 2016 15:11:39 +0300
Subject: [PATCH] Add --disable-opengl configure optionmeta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +1
-1@@ -25,7 +25,7 @@ Signed-off-by: Jussi Kukkonen <[email protected]> demos/gtk-demo/glarea.c | 14 ++++++ docs/tools/Makefile.am | 9 +++- docs/tools/widgets.c | 4 +- - gdk/Makefile.am | 8 ++- + gdk/gdk-sources.inc | 8 ++- gdk/gdkdisplay.c | 4 +- gdk/gdkgl.c | 10 ++++ gdk/gdkglcontext.c | 6 +++@@ -47,7 +47,7 @@ Signed-off-by: Jussi Kukkonen <[email protected]> create mode 100644 gdk/x11/gdkx-without-gl-context.hconfigure.ac +1
-1-index 851bcbf..6cbf6a2 100644 +index 9ed65e5..70c6836 100644configure.ac +18
-15@@ -346,6 +346,15 @@ AC_ARG_ENABLE(cloudproviders,@@ -66,7 +66,7 @@ index 851bcbf..6cbf6a2 100644 AC_ARG_ENABLE(glx, [AS_HELP_STRING([--enable-glx], [When enabled Gdk will try to initialize GLX])]) -@@ -1345,7 +1354,7 @@ CFLAGS="$saved_cflags" +@@ -1367,7 +1376,7 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"@@ -75,7 +75,7 @@ index 851bcbf..6cbf6a2 100644 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" -@@ -1379,7 +1388,7 @@ fi +@@ -1401,7 +1410,7 @@ fi PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"@@ -209,11 +209,11 @@ index 932daf1..54239d6 100644 info = new_widget_info ("glarea", widget, MEDIUM); return info; -diff --git a/gdk/Makefile.am b/gdk/Makefile.am -index 710a548..b45f631 100644 ---- a/gdk/Makefile.am -+++ b/gdk/Makefile.am -@@ -274,7 +274,6 @@ x11_introspection_files = \ +diff --git a/gdk/gdk-sources.inc b/gdk/gdk-sources.inc +index 9235edb..eb59524 100644 +--- a/gdk/gdk-sources.inc ++++ b/gdk/gdk-sources.inc +@@ -146,7 +146,6 @@ x11_introspection_files = \ x11/gdkeventsource.c \ x11/gdkeventtranslator.c \ x11/gdkgeometry-x11.c \@@ -221,7 +221,7 @@ index 710a548..b45f631 100644 x11/gdkkeys-x11.c \ x11/gdkmain-x11.c \ x11/gdkmonitor-x11.c \ -@@ -300,7 +299,6 @@ x11_introspection_files = \ +@@ -172,7 +171,6 @@ x11_introspection_files = \ x11/gdkx11display.h \ x11/gdkx11displaymanager.h \ x11/gdkx11dnd.h \@@ -229,19 +229,19 @@ index 710a548..b45f631 100644 x11/gdkx11keys.h \ x11/gdkx11monitor.h \ x11/gdkx11property.h \ -@@ -310,6 +308,12 @@ x11_introspection_files = \ +@@ -182,6 +180,12 @@ x11_introspection_files = \ x11/gdkx11visual.h \ x11/gdkx11window.h +if HAVE_OPENGL -+x11_introspection_files += \ -+ x11/gdkglcontext-x11.c \ -+ x11/gdkx11glcontext.h ++x11_introspection_files += \ ++ x11/gdkglcontext-x11.c \ ++ x11/gdkx11glcontext.h +endif + - GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile - GdkX11_3_0_gir_SCANNERFLAGS = \ - --identifier-prefix=Gdk \ + w32_introspection_files = \ + win32/gdkcursor-win32.c \ + win32/gdkdevicemanager-win32.c \gdk/gdkdisplay.c +0
-1--- a/gdk/gdkdisplay.c@@ -380,7 +380,7 @@ index 3b23639..1f04f8e 100644/** gdk/gdkwindow.c +1
-1-index 2de8ba4..1883a79 100644 +index 727b0cf..d4d91b0 100644gdk/gdkwindow.c +0
-0@@ -45,7 +45,9 @@@@ -538,10 +538,10 @@ index 7e08f47..30fd7b6 100644 display_class->get_default_seat = gdk_x11_display_get_default_seat;gdk/x11/gdkscreen-x11.c +1
-1-index bb4df05..46f5349 100644 +index c2b7480..114fd4c 100644gdk/x11/gdkscreen-x11.c +3
-1-@@ -1827,3 +1827,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) +@@ -1842,3 +1842,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) {return get_netwm_cardinal_property (screen,"_NET_CURRENT_DESKTOP" ); }@@ -551,7 +551,7 @@ index bb4df05..46f5349 100644 +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} +#endif gdk/x11/gdkwindow-x11.c +1
-1-index 721d9bb..8e87acc 100644 +index 194bc82..0302bb6 100644gdk/x11/gdkwindow-x11.c +3
-1@@ -36,7 +36,9 @@@@ -564,7 +564,7 @@ index 721d9bb..8e87acc 100644#include "gdkprivate-x11.h" #include "gdk-private.h" -@@ -5881,7 +5883,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) +@@ -5888,7 +5890,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; impl_class->show_window_menu = gdk_x11_window_show_window_menu;@@ -668,10 +668,10 @@ index 0000000..c9e2617 + +#endif /* __GDK_X_H__ */ gtk/Makefile.am +1
-1-index 074fb35..4fa9eb6 100644 +index 946e72f..b01da7f 100644gtk/Makefile.am +1
-1-@@ -1457,7 +1457,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s +@@ -467,7 +467,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ sort | uniq | \@@ -777,7 +777,7 @@ index 802303e..33001cf 100644 static gbooleangtk/inspector/general.c +1
-1-index 48237d1..1f9b9be 100644 +index 4fd0c30..a8e59ed 100644gtk/inspector/general.c +4
-4@@ -33,8 +33,10 @@@@ -791,7 +791,7 @@ index 48237d1..1f9b9be 100644#ifdef GDK_WINDOWING_WIN32 #include "win32/gdkwin32.h" -@@ -196,6 +198,7 @@ add_label_row (GtkInspectorGeneral *gen, +@@ -217,6 +219,7 @@ add_label_row (GtkInspectorGeneral *gen, gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); }@@ -799,7 +799,7 @@ index 48237d1..1f9b9be 100644#ifdef GDK_WINDOWING_X11 static void append_glx_extension_row (GtkInspectorGeneral *gen, -@@ -205,6 +208,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, +@@ -226,6 +229,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, add_check_row (gen, GTK_LIST_BOX (gen->priv->gl_box), ext, epoxy_has_glx_extension (dpy, 0, ext), 0); }#endif @@ -807,7 +807,7 @@ index 48237d1..1f9b9be 100644#ifdef GDK_WINDOWING_WAYLAND static void -@@ -254,6 +258,7 @@ wayland_get_display (struct wl_display *wl_display) +@@ -275,6 +279,7 @@ wayland_get_display (struct wl_display *wl_display) static voidinit_gl (GtkInspectorGeneral *gen) {@@ -815,7 +815,7 @@ index 48237d1..1f9b9be 100644#ifdef GDK_WINDOWING_X11 if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { -@@ -280,6 +285,7 @@ init_gl (GtkInspectorGeneral *gen) +@@ -301,6 +306,7 @@ init_gl (GtkInspectorGeneral *gen) } else#endif meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.34.bb +1
-1@@ -7,7 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec" +SRC_URI[sha256sum] = "ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1"S = "${WORKDIR}/gtk+-${PV}"
Signature · 10 lines
2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174519): https://lists.openembedded.org/g/openembedded-core/message/174519 Mute This Topic: https://lists.openembedded.org/mt/95642219/6875888 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
PATCH 10/24 libxdmcp: update 1.1.3 -> 1.1.4
In reply to Alexander Kanavin---
.../xorg-lib/{libxdmcp_1.1.3.bb => libxdmcp_1.1.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxdmcp_1.1.3.bb => libxdmcp_1.1.4.bb} (83%)meta/recipes-graphics/xorg-lib/libxdmcp_1.1.4.bb renamed from meta/recipes-graphics/xorg-lib/libxdmcp_1.1.3.bb +2 -2
@@ -19,11 +19,11 @@ PROVIDES = "xdmcp" PE = "1" XORG_PN = "libXdmcp" +XORG_EXT = "tar.xz" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "115c5c12ecce0e749cd91d999a5fd160" -SRC_URI[sha256sum] = "20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529" +SRC_URI[sha256sum] = "2dce5cc317f8f0b484ec347d87d81d552cdbebb178bd13c5d8193b6b7cd6ad00" PACKAGECONFIG ??= "" PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd"
Signature · 1 line
2.30.2
PATCH 11/24 libxpm: update 3.5.13 -> 3.5.14
In reply to Alexander Kanavin---
.../xorg-lib/{libxpm_3.5.13.bb => libxpm_3.5.14.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxpm_3.5.13.bb => libxpm_3.5.14.bb} (81%)meta/recipes-graphics/xorg-lib/libxpm_3.5.14.bb renamed from meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb +2 -2
@@ -16,12 +16,12 @@ DEPENDS += "libxext libsm libxt gettext-native" PE = "1" XORG_PN = "libXpm" +XORG_EXT = "tar.xz" PACKAGES =+ "sxpm cxpm" FILES:cxpm = "${bindir}/cxpm" FILES:sxpm = "${bindir}/sxpm" -SRC_URI[md5sum] = "6f0ecf8d103d528cfc803aa475137afa" -SRC_URI[sha256sum] = "9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25" +SRC_URI[sha256sum] = "f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2" BBCLASSEXTEND = "native"
Signature · 1 line
2.30.2
PATCH 12/24 libxrandr: update 1.5.2 -> 1.5.3
In reply to Alexander Kanavin---
.../xorg-lib/{libxrandr_1.5.2.bb => libxrandr_1.5.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxrandr_1.5.2.bb => libxrandr_1.5.3.bb} (81%)meta/recipes-graphics/xorg-lib/libxrandr_1.5.3.bb renamed from meta/recipes-graphics/xorg-lib/libxrandr_1.5.2.bb +2 -2
@@ -16,8 +16,8 @@ DEPENDS += "virtual/libx11 xorgproto libxrender libxext" PE = "1" XORG_PN = "libXrandr" +XORG_EXT = "tar.xz" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "18f3b20d522f45e4dadd34afb5bea048" -SRC_URI[sha256sum] = "8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023" +SRC_URI[sha256sum] = "897639014a78e1497704d669c5dd5682d721931a4452c89a7ba62676064eb428"
Signature · 1 line
2.30.2
PATCH 13/24 bluez: update 5.65 -> 5.66
In reply to Alexander Kanavin---
meta/recipes-connectivity/bluez5/bluez5.inc | 1 +
...shared-util.c-include-linux-limits.h.patch | 26 +++++++++++++++++++
.../bluez5/{bluez5_5.65.bb => bluez5_5.66.bb} | 2 +-
3 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch
rename meta/recipes-connectivity/bluez5/{bluez5_5.65.bb => bluez5_5.66.bb} (95%)meta/recipes-connectivity/bluez5/bluez5.inc +1 -0
@@ -54,6 +54,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ + file://0004-src-shared-util.c-include-linux-limits.h.patch \ " S = "${WORKDIR}/bluez-${PV}"
meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 51584158b9a2e58f3790f8a7387b5cf167eca88b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 12 Dec 2022 13:10:19 +0100 +Subject: [PATCH] src/shared/util.c: include linux/limits.h + +MAX_INPUT is defined in that file. This matters on non-glibc +systems such as those using musl. + +Upstream-Status: Submitted [to [email protected],[email protected],[email protected]] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/shared/util.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 0a0308c..1f61314 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -22,6 +22,7 @@ + #include <unistd.h> + #include <dirent.h> + #include <limits.h> ++#include <linux/limits.h> + #include <string.h> + + #ifdef HAVE_SYS_RANDOM_H
meta/recipes-connectivity/bluez5/bluez5_5.66.bb renamed from meta/recipes-connectivity/bluez5/bluez5_5.65.bb +1 -1
@@ -1,6 +1,6 @@ require bluez5.inc -SRC_URI[sha256sum] = "2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4" +SRC_URI[sha256sum] = "39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574" # These issues have kernel fixes rather than bluez fixes so exclude here CVE_CHECK_IGNORE += "CVE-2020-12352 CVE-2020-24490"
Signature · 1 line
2.30.2
PATCH 14/24 cmake: always add local files to WORKDIR
In reply to Alexander KanavinThis reduces friction in version updates, as devtool can handle conditional patches, but not conditional local files.
--- meta/recipes-devtools/cmake/cmake-native_3.24.2.bb | 3 +-- meta/recipes-devtools/cmake/cmake.inc | 4 ++++ meta/recipes-devtools/cmake/cmake_3.24.2.bb | 4 ---- 3 files changed, 5 insertions(+), 6 deletions(-)
meta/recipes-devtools/cmake/cmake-native_3.24.2.bb +1 -2
@@ -3,8 +3,7 @@ inherit native DEPENDS += "bzip2-replacement-native xz-native zlib-native curl-native ncurses-native zstd-native" -SRC_URI += "file://OEToolchainConfig.cmake \ - file://environment.d-cmake.sh \ +SRC_URI += "\ file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ "
meta/recipes-devtools/cmake/cmake.inc +4 -0
@@ -17,6 +17,10 @@ LIC_FILES_CHKSUM = "file://Copyright.txt;md5=45025187a129339459b6f1a24f7fac6e \ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ + file://OEToolchainConfig.cmake \ + file://SDKToolchainConfig.cmake.template \ + file://cmake-setup.py \ + file://environment.d-cmake.sh \ " SRC_URI[sha256sum] = "0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db"
meta/recipes-devtools/cmake/cmake_3.24.2.bb +0 -4
@@ -5,10 +5,6 @@ inherit cmake bash-completion DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" SRC_URI:append:class-nativesdk = " \ - file://OEToolchainConfig.cmake \ - file://SDKToolchainConfig.cmake.template \ - file://cmake-setup.py \ - file://environment.d-cmake.sh \ file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ "
Signature · 1 line
2.30.2
Re: [OE-core] [PATCH 14/24] cmake: always add local files to WORKDIR
Quoted 2 lines · Alexander Kanavin
This reduces friction in version updates, as devtool can handle conditional patches, but not conditional local files.
Whilst I understand the desire, putting files in SRC_URI which aren't used just complicates the build and means if you change those files, things rebuild which really don't care. As such I'd really prefer not to do this.
Can't we fix devtool to handle this if it can already handle patches that way?
Cheers,
Richard
Re: [OE-core] [PATCH 14/24] cmake: always add local files to WORKDIR
Quoted 2 lines · Richard Purdie
Can't we fix devtool to handle this if it can already handle patches that way?
That's right. I queued a fix to devtool, where 'devtool finish' processes local files only for the main SRC_URI set, but not any of the conditional ones. This matches 'devtool modify/upgrade' which both only install one set from the no-override list (via meta/classes/devtool-source.bbclass).
Implementing multiple sets of local files (one for each override) is not impossible, but is significant work, and the use case is marginal.
Alex
PATCH 15/24 cmake: update 3.24.2 -> 3.25.1
In reply to Alexander KanavinLicense-Update: additional contributors
---
.../cmake/{cmake-native_3.24.2.bb => cmake-native_3.25.1.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 4 ++--
...CMakeDetermineSystem-use-oe-environment-vars-to-load.patch | 4 ++--
.../cmake/{cmake_3.24.2.bb => cmake_3.25.1.bb} | 0
4 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.24.2.bb => cmake-native_3.25.1.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.24.2.bb => cmake_3.25.1.bb} (100%)meta/recipes-devtools/cmake/cmake-native_3.25.1.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.24.2.bb +0 -0
meta/recipes-devtools/cmake/cmake.inc +2 -2
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=45025187a129339459b6f1a24f7fac6e \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=09069e0fffe4e5eaf6dde04c3b1932e5 \ file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ "
@@ -23,7 +23,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://environment.d-cmake.sh \ " -SRC_URI[sha256sum] = "0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db" +SRC_URI[sha256sum] = "1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +2 -2
@@ -1,4 +1,4 @@ -From 89f6c846f02ad6d30b9ebb7eaaaa4fb6f9cec054 Mon Sep 17 00:00:00 2001 +From 8e53dd7f6f534ad933e7e9c7fc20cc1a6cded3f4 Mon Sep 17 00:00:00 2001 From: Cody P Schafer <[email protected]> Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
@@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador <[email protected]> 1 file changed, 7 insertions(+) diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake -index 8c7af067..ade2b189 100644 +index 2c2c2ac3..fae4f97f 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -112,6 +112,13 @@ else()
meta/recipes-devtools/cmake/cmake_3.25.1.bb renamed from meta/recipes-devtools/cmake/cmake_3.24.2.bb +0 -0
Signature · 1 line
2.30.2
PATCH 16/24 libxcrypt: update PV to match SRCREV
In reply to Alexander KanavinWhen SRCREV was updated, only libxcrypt-compat was renamed to match, but not libxcrypt proper.
---
.../libxcrypt/{libxcrypt_4.4.30.bb => libxcrypt_4.4.33.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.30.bb => libxcrypt_4.4.33.bb} (100%)meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb renamed from meta/recipes-core/libxcrypt/libxcrypt_4.4.30.bb +0 -0
Signature · 1 line
2.30.2
PATCH 17/24 ovmf: update edk2-stable202208 -> edk2-stable202211
In reply to Alexander Kanavin--- .../ovmf/ovmf/0005-debug-prefix-map.patch | 26 +++++++++---------- meta/recipes-core/ovmf/ovmf_git.bb | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-)
meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch +13 -13
@@ -1,7 +1,7 @@ -From 860bb1979f3578bb83257076fe0f3bd33f9d68bf Mon Sep 17 00:00:00 2001 +From 9f28dd5f183f6e4d2b023cd555bb30446ae5f618 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 14 Jun 2021 19:56:28 +0200 -Subject: [PATCH 5/6] debug prefix map +Subject: [PATCH] debug prefix map We want to pass ${DEBUG_PREFIX_MAP} to gcc commands and also pass in --debug-prefix-map to nasm (we carry a patch to nasm for this). The
@@ -22,10 +22,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 36241b6ede..947fbf2e8d 100755 +index c4e4c7ded0..058205da72 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -1863,7 +1863,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N +@@ -1849,7 +1849,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N *_*_*_DTCPP_PATH = DEF(DTCPP_BIN) *_*_*_DTC_PATH = DEF(DTC_BIN)
@@ -34,9 +34,9 @@ index 36241b6ede..947fbf2e8d 100755 DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -fno-pic -fno-pie -@@ -1881,8 +1881,8 @@ DEFINE GCC_IA32_X64_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _Ref - DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) +@@ -1871,8 +1871,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) + DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map -DEFINE GCC_ASM_FLAGS = -c -x assembler -imacros AutoGen.h -DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h
@@ -45,7 +45,7 @@ index 36241b6ede..947fbf2e8d 100755 DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h DEFINE GCC_ASLCC_FLAGS = -x c -@@ -2027,7 +2027,7 @@ DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include A +@@ -2026,7 +2026,7 @@ DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include A *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS) *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC48_IA32_OBJCOPY_FLAGS =
@@ -54,7 +54,7 @@ index 36241b6ede..947fbf2e8d 100755 DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but-set-variable -@@ -2055,7 +2055,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but +@@ -2054,7 +2054,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS) *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC48_X64_OBJCOPY_FLAGS =
@@ -63,7 +63,7 @@ index 36241b6ede..947fbf2e8d 100755 DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Os RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Os -Wno-unused-but-set-variable -@@ -2167,7 +2167,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s +@@ -2166,7 +2166,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS) *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC49_IA32_OBJCOPY_FLAGS =
@@ -72,7 +72,7 @@ index 36241b6ede..947fbf2e8d 100755 DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but-set-variable -Wno-unused-const-variable -@@ -2195,7 +2195,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but +@@ -2194,7 +2194,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS) *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC49_X64_OBJCOPY_FLAGS =
@@ -81,7 +81,7 @@ index 36241b6ede..947fbf2e8d 100755 DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Os RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Os -Wno-unused-but-set-variable -Wno-unused-const-variable -@@ -2313,7 +2313,7 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 +@@ -2312,7 +2312,7 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC5_IA32_OBJCOPY_FLAGS =
@@ -90,7 +90,7 @@ index 36241b6ede..947fbf2e8d 100755 DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto -Os DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386 -@@ -2345,7 +2345,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, +@@ -2344,7 +2344,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS) *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC5_X64_OBJCOPY_FLAGS =
@@ -100,5 +100,5 @@ index 36241b6ede..947fbf2e8d 100755 DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO -Os DEBUG_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os -- -2.32.0 +2.30.2
meta/recipes-core/ovmf/ovmf_git.bb +2 -2
@@ -26,8 +26,8 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0006-reproducible.patch \ " -PV = "edk2-stable202208" -SRCREV = "ba0e0e4c6a174b71b18ccd6e47319cc45878893c" +PV = "edk2-stable202211" +SRCREV = "fff6d81270b57ee786ea18ad74f43149b9f03494" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" inherit deploy
Signature · 1 line
2.30.2
PATCH 18/24 python3-dbusmock: update 0.28.4 -> 0.28.6
In reply to Alexander KanavinConvert to python_setuptools_build_meta.
---
...python3-dbusmock_0.28.4.bb => python3-dbusmock_0.28.6.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-dbusmock_0.28.4.bb => python3-dbusmock_0.28.6.bb} (70%)meta/recipes-devtools/python/python3-dbusmock_0.28.6.bb renamed from meta/recipes-devtools/python/python3-dbusmock_0.28.4.bb +3 -2
@@ -4,11 +4,12 @@ HOMEPAGE = "https://pypi.org/project/python-dbusmock/" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI[sha256sum] = "52ad024a44d46602084fd91c0c467ab95b7ecf27c4e2168e0d2160623f18c0a2" +SRC_URI[sha256sum] = "3b496fab84aff3936054f747e9a22bb07ac5783b1d967c6cc39536c7ba315fce" PYPI_PACKAGE = "python-dbusmock" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta +DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += "\ ${PYTHON_PN}-dbus \
Signature · 1 line
2.30.2
PATCH 19/24 ruby: merge .inc into .bb
In reply to Alexander Kanavin--- meta/recipes-devtools/ruby/ruby.inc | 39 -------------------- meta/recipes-devtools/ruby/ruby_3.1.2.bb | 45 +++++++++++++++++++++--- 2 files changed, 40 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-devtools/ruby/ruby.inc
meta/recipes-devtools/ruby/ruby.inc deleted +0 -39
@@ -1,39 +0,0 @@ -SUMMARY = "An interpreter of object-oriented scripting language" -DESCRIPTION = "Ruby is an interpreted scripting language for quick \ -and easy object-oriented programming. It has many features to process \ -text files and to do system management tasks (as in Perl). \ -It is simple, straight-forward, and extensible. \ -" -HOMEPAGE = "http://www.ruby-lang.org/" -SECTION = "devel/ruby" -LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ - file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ - file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LEGAL;md5=f260190bc1e92e363f0ee3c0463d4c7c \ - " - -DEPENDS = "zlib openssl libyaml gdbm readline libffi" -DEPENDS:append:class-target = " ruby-native" - -SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" -SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ - file://0001-extmk-fix-cross-compilation-of-external-gems.patch \ - file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \ - " -UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" - -inherit autotools ptest pkgconfig - - -# This snippet lets compiled extensions which rely on external libraries, -# such as zlib, compile properly. If we don't do this, then when extmk.rb -# runs, it uses the native libraries instead of the target libraries, and so -# none of the linking operations succeed -- which makes extconf.rb think -# that the libraries aren't available and hence that the extension can't be -# built. - -do_configure:prepend() { - sed -i "s#%%TARGET_CFLAGS%%#$CFLAGS#; s#%%TARGET_LDFLAGS%%#$LDFLAGS#" ${S}/common.mk - rm -rf ${S}/ruby/ -}
meta/recipes-devtools/ruby/ruby_3.1.2.bb +40 -5
54 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH 20/24 ruby: update 3.1.2 -> 3.1.3
In reply to Alexander Kanavin---
...001-Remove-dependency-on-libcapstone.patch | 36 -------------------
.../ruby/{ruby_3.1.2.bb => ruby_3.1.3.bb} | 3 +-
2 files changed, 1 insertion(+), 38 deletions(-)
delete mode 100644 meta/recipes-devtools/ruby/ruby/0001-Remove-dependency-on-libcapstone.patch
rename meta/recipes-devtools/ruby/{ruby_3.1.2.bb => ruby_3.1.3.bb} (97%)meta/recipes-devtools/ruby/ruby/0001-Remove-dependency-on-libcapstone.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 222203297966f312109e8eaa2520f2cf2f59c09d Mon Sep 17 00:00:00 2001 -From: Alan Wu <[email protected]> -Date: Thu, 31 Mar 2022 17:26:28 -0400 -Subject: [PATCH] Remove dependency on libcapstone - -We have received reports of build failures due to this configuration -check modifying compile flags. Since only YJIT devs use this library -we can remove it to make Ruby easier to build for users. - -See: https://github.com/rbenv/ruby-build/discussions/1933 - -Upstream-Status: Backport ---- - configure.ac | 9 --------- - 1 file changed, 9 deletions(-) - -Index: ruby-3.1.2/configure.ac -=================================================================== ---- ruby-3.1.2.orig/configure.ac -+++ ruby-3.1.2/configure.ac -@@ -1244,15 +1244,6 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linki - AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX - AC_CHECK_LIB(socket, shutdown) # SunOS/Solaris - --if pkg-config --exists capstone; then -- CAPSTONE_CFLAGS=`pkg-config --cflags capstone` -- CAPSTONE_LIB_L=`pkg-config --libs-only-L capstone` -- LDFLAGS="$LDFLAGS $CAPSTONE_LIB_L" -- CFLAGS="$CFLAGS $CAPSTONE_CFLAGS" --fi -- --AC_CHECK_LIB(capstone, cs_open) # Capstone disassembler for debugging YJIT -- - dnl Checks for header files. - AC_HEADER_DIRENT - dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
meta/recipes-devtools/ruby/ruby_3.1.3.bb renamed from meta/recipes-devtools/ruby/ruby_3.1.2.bb +1 -2
@@ -29,7 +29,6 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \ file://0006-Make-gemspecs-reproducible.patch \ file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ - file://0001-Remove-dependency-on-libcapstone.patch \ " UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
@@ -50,7 +49,7 @@ do_configure:prepend() { DEPENDS:append:libc-musl = " libucontext" -SRC_URI[sha256sum] = "61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e" +SRC_URI[sha256sum] = "5ea498a35f4cd15875200a52dde42b6eb179e1264e17d78732c3a57cd1c6ab9e" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
Signature · 1 line
2.30.2
PATCH 21/24 ghostscript: update 9.56.1 -> 10.0.0
In reply to Alexander KanavinDrop --without-jbig2dec as it is now required by pdf support and jbig2dec library is in ghostscript's source tree.
---
.../ghostscript/cross-compile.patch | 40 +++++++++++++++++++
.../do-not-check-local-libpng-source.patch | 8 ++--
...script_9.56.1.bb => ghostscript_10.0.0.bb} | 5 ++-
3 files changed, 47 insertions(+), 6 deletions(-)
create mode 100644 meta/recipes-extended/ghostscript/ghostscript/cross-compile.patch
rename meta/recipes-extended/ghostscript/{files => ghostscript}/do-not-check-local-libpng-source.patch (85%)
rename meta/recipes-extended/ghostscript/{ghostscript_9.56.1.bb => ghostscript_10.0.0.bb} (96%)meta/recipes-extended/ghostscript/ghostscript/cross-compile.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 4c3575346b9c7d394ebc73b4e5fabebadd8877ec Mon Sep 17 00:00:00 2001 +From: Chris Liddell <[email protected]> +Date: Thu, 24 Nov 2022 16:33:47 +0000 +Subject: [PATCH] Fix a little bitrot in the cross-compiling logic + +Removing the option to disable FAPI meant configuring for cross compiling would +fail because the option being passed to the sub-call to configure would include +an unknown command line option. + +Upstream-Status: Backport [https://git.ghostscript.com/?p=ghostpdl.git;a=patch;f=configure.ac;h=4c3575346b9c7d394ebc73b4e5fabebadd8877ec] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d5c68c4b3..738eb10a9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -138,7 +138,7 @@ if test x"$host" != x"$build" ; then + echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in + + AC_MSG_NOTICE([Begin recursive call to configure script (for auxiliary tools)]) +- "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers="" ++ "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers="" + status=$? + cp config.log "$olddir/configaux.log" + if test $status -eq 0 ; then +@@ -2530,7 +2530,7 @@ PDF= + PDF_MAK="\$(GLSRCDIR)\$(D)stub.mak" + PDFROMFS_MAK="\$(GLSRCDIR)\$(D)stub.mak" + +-if test x"$with_pdf" != x"no" ; then ++if test x"$with_pdf" != x"no" -a x"$enable_auxtools_only" != x"yes" ; then + + if test x"$JBIG2_DECODER" = x""; then + AC_MSG_ERROR([No JBIG2 decoder available, required for PDF support]) +-- +2.25.1 +
meta/recipes-extended/ghostscript/ghostscript/do-not-check-local-libpng-source.patch renamed from meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch +4 -4
@@ -1,4 +1,4 @@ -From 2adaa7366064a8f18af864eda74e52877a89620c Mon Sep 17 00:00:00 2001 +From 108a7d3f79af8c669af129bd87401402e76edfa9 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Mon, 18 Jan 2016 01:00:30 -0500 Subject: [PATCH] configure.ac: do not check local png source
@@ -17,12 +17,12 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 698abd3..e65ac8b 100644 +index bb57825..389c473 100644 --- a/configure.ac +++ b/configure.ac -@@ -1241,7 +1241,7 @@ else +@@ -1441,7 +1441,7 @@ else PNGDEVS='' - PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' + PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha png16malpha' AC_MSG_CHECKING([for local png library source]) - if test -f $srcdir/libpng/pngread.c; then + if false; then
meta/recipes-extended/ghostscript/ghostscript_10.0.0.bb renamed from meta/recipes-extended/ghostscript/ghostscript_9.56.1.bb +3 -2
@@ -33,6 +33,7 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d file://do-not-check-local-libpng-source.patch \ file://avoid-host-contamination.patch \ file://mkdir-p.patch \ + file://cross-compile.patch \ " SRC_URI = "${SRC_URI_BASE} \
@@ -44,7 +45,7 @@ SRC_URI:class-native = "${SRC_URI_BASE} \ file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ " -SRC_URI[sha256sum] = "1598b9a38659cce8448d42a73054b2f9cbfcc40a9b97eeec5f22d4d6cd1de8e6" +SRC_URI[sha256sum] = "a57764d70caf85e2fc0b0f59b83b92e25775631714dcdb97cc6e0cea414bb5a3" # Put something like #
@@ -72,7 +73,7 @@ EXTRA_OECONF:append:mipsarcho32 = " --with-large_color_index=0" # Explicity disable libtiff, fontconfig, # freetype, cups for ghostscript-native EXTRA_OECONF:class-native = "--without-x --with-system-libtiff=no \ - --without-jbig2dec --without-libpaper \ + --without-libpaper \ --with-fontpath=${datadir}/fonts \ --without-libidn --disable-fontconfig \ --enable-freetype --disable-cups "
Signature · 1 line
2.30.2
PATCH 22/24 tzdata: update 2022d -> 2022g
In reply to Alexander Kanavin--- meta/recipes-extended/timezone/timezone.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
meta/recipes-extended/timezone/timezone.inc +3 -4
@@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2022d" +PV = "2022g" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \
@@ -14,6 +14,5 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "d644ba0f938899374ea8cb554e35fb4afa0f7bd7b716c61777cd00500b8759e0" -SRC_URI[tzdata.sha256sum] = "6ecdbee27fa43dcfa49f3d4fd8bb1dfef54c90da1abcd82c9abcf2dc4f321de0" - +SRC_URI[tzcode.sha256sum] = "9610bb0b9656ff404c361a41f3286da53064b5469d84f00c9cb2314c8614da74" +SRC_URI[tzdata.sha256sum] = "4491db8281ae94a84d939e427bdd83dc389f26764d27d9a5c52d782c16764478"
Signature · 1 line
2.30.2
PATCH 23/24 systemtap: upgrade 4.7 -> 4.8
In reply to Alexander Kanavin--- .../systemtap/systemtap/python-3.11.patch | 37 ------------------- .../systemtap/systemtap_git.inc | 5 +-- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-kernel/systemtap/systemtap/python-3.11.patch
meta/recipes-kernel/systemtap/systemtap/python-3.11.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 069e109c95d1afca17cd3781b39f220cf8b39978 Mon Sep 17 00:00:00 2001 -From: Stan Cox <[email protected]> -Date: Wed, 13 Jul 2022 09:49:51 -0400 -Subject: [PATCH 1/1] python 3.11 removed direct access to PyFrameObject - members - -Take into account the change in PyFrameObject definition to allow -building systemtap with python 3.11. Additional support for python -3.11 is forthcoming. - -Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=069e109c95d1afca17cd3781b39f220cf8b39978] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - python/HelperSDT/_HelperSDT.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/python/HelperSDT/_HelperSDT.c b/python/HelperSDT/_HelperSDT.c -index 967cb6077..4d287132e 100644 ---- a/python/HelperSDT/_HelperSDT.c -+++ b/python/HelperSDT/_HelperSDT.c -@@ -14,7 +14,13 @@ - // PR25841: ensure that the libHelperSDT.so file contains debuginfo - // for the tapset helper functions, so they don't have to look into libpython* - #include <frameobject.h> -+// python 3.11 removed direct access to PyFrameObject members -+// https://docs.python.org/3.11/whatsnew/3.11.html#c-api-changes -+#if PY_MAJOR_VERSION <= 3 && PY_MINOR_VERSION < 11 - PyFrameObject _dummy_frame; -+#else -+//PyFrameObject *_dummy_frame; -+#endif - #include <object.h> - PyVarObject _dummy_var; - #include <dictobject.h> --- -2.31.1 -
meta/recipes-kernel/systemtap/systemtap_git.inc +2 -3
@@ -1,13 +1,12 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "0c335a75a789ff44b514e567d458881e15cc283d" -PV = "4.7" +SRCREV = "b176afb2e49119ef844d193d27b0752a6d84fe8f" +PV = "4.8" SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master \ 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://python-3.11.patch \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux'
Signature · 1 line
2.30.2
PATCH 24/24 gnupg: upgrade 2.3.7 -> 2.3.8
In reply to Alexander Kanavin---
...-a-custom-value-for-the-location-of-.patch | 4 +--
.../gnupg/gnupg/fix-ldap.patch | 35 +++++++++++++++++++
.../gnupg/gnupg/relocate.patch | 18 +++++-----
.../gnupg/{gnupg_2.3.7.bb => gnupg_2.3.8.bb} | 3 +-
4 files changed, 48 insertions(+), 12 deletions(-)
create mode 100644 meta/recipes-support/gnupg/gnupg/fix-ldap.patch
rename meta/recipes-support/gnupg/{gnupg_2.3.7.bb => gnupg_2.3.8.bb} (95%)meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +2 -2
@@ -1,4 +1,4 @@ -From 89b98553084fbefe1ef2c7cbff9e72cf43144c49 Mon Sep 17 00:00:00 2001 +From b0c42c8273c5fa1e31094567122be24ba28a965d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d86c60e..65c22b2 100644 +index b043386..dd839d0 100644 --- a/configure.ac +++ b/configure.ac @@ -1955,7 +1955,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
meta/recipes-support/gnupg/gnupg/fix-ldap.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 7011286ce6e1fb56c2989fdafbd11b931c489faa Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <[email protected]> +Date: Fri, 14 Oct 2022 09:58:41 +0900 +Subject: [PATCH] dirmngr: Fix build with no LDAP support. + +* dirmngr/server.c [USE_LDAP] (start_command_handler): Conditionalize. + +-- + +GnuPG-bug-id: 6239 +Signed-off-by: NIIBE Yutaka <[email protected]> +Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=7011286ce6e1fb56c2989fdafbd11b931c489faa] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + dirmngr/server.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dirmngr/server.c b/dirmngr/server.c +index 04ebfd317..98f354300 100644 +--- a/dirmngr/server.c ++++ b/dirmngr/server.c +@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) + ctrl->refcount); + else + { ++#if USE_LDAP + ks_ldap_free_state (ctrl->ks_get_state); + ctrl->ks_get_state = NULL; ++#endif + release_ctrl_ocsp_certs (ctrl); + xfree (ctrl->server_local); + dirmngr_deinit_default_ctrl (ctrl); +-- +2.11.0 +
meta/recipes-support/gnupg/gnupg/relocate.patch +9 -9
@@ -1,4 +1,4 @@ -From 89ae4f03307104689e1857d9857d452af6b35ac4 Mon Sep 17 00:00:00 2001 +From 7c6f9724f53ed2c5237dad4e3f4ec44091ac683d Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 260aeb2..1aeb08d 100644 +index 67bbde8..7f360ba 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -1143,7 +1143,7 @@ gnupg_socketdir (void) +@@ -1171,7 +1171,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy;
@@ -26,7 +26,7 @@ index 260aeb2..1aeb08d 100644 gpgrt_annotate_leaked_object (name); } -@@ -1175,7 +1175,7 @@ gnupg_sysconfdir (void) +@@ -1203,7 +1203,7 @@ gnupg_sysconfdir (void) if (dir) return dir; else
@@ -35,7 +35,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1211,7 +1211,7 @@ gnupg_bindir (void) +@@ -1239,7 +1239,7 @@ gnupg_bindir (void) return name; } else
@@ -44,7 +44,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1238,7 +1238,7 @@ gnupg_libexecdir (void) +@@ -1266,7 +1266,7 @@ gnupg_libexecdir (void) return name; } else
@@ -53,7 +53,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1268,7 +1268,7 @@ gnupg_libdir (void) +@@ -1296,7 +1296,7 @@ gnupg_libdir (void) return name; } else
@@ -62,7 +62,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1299,7 +1299,7 @@ gnupg_datadir (void) +@@ -1327,7 +1327,7 @@ gnupg_datadir (void) return name; } else
@@ -71,7 +71,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1331,7 +1331,7 @@ gnupg_localedir (void) +@@ -1359,7 +1359,7 @@ gnupg_localedir (void) return name; } else
meta/recipes-support/gnupg/gnupg_2.3.8.bb renamed from meta/recipes-support/gnupg/gnupg_2.3.7.bb +2 -1
@@ -18,12 +18,13 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0002-use-pkgconfig-instead-of-npth-config.patch \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ + file://fix-ldap.patch \ " SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "ee163a5fb9ec99ffc1b18e65faef8d086800c5713d15a672ab57d3799da83669" +SRC_URI[sha256sum] = "540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \
Signature · 1 line
2.30.2