devtool upgrade: rebase override-only patches as well
PATCH 1/19 devtool upgrade: rebase override-only patches as well
There's a number of recipes (such as nettle or glib) which were upgraded incorrectly due to rebasing only the default set of patches in main SRC_URI. Native-only or musl-only patches were not handled, causing do_patch fails and overall misery.
Unfortunately, this also necessitates aborting any incomplete rebases as devtool needs to be able to return to the original branch to complete the upgrade command.
Also, do not add devtool-patched-%version tags, as they are not used anywhere, and it's unclear how to extend them to cover multiple override branches.
--- scripts/lib/devtool/upgrade.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
scripts/lib/devtool/upgrade.py +14 -15
@@ -261,21 +261,20 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee logger.warning('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches])) else: __run('git checkout devtool-patched -b %s' % branch) - skiptag = False - try: - __run('git rebase %s' % rev) - except bb.process.ExecutionError as e: - skiptag = True - if 'conflict' in e.stdout: - logger.warning('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip())) - else: - logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) - if not skiptag: - if uri.startswith('git://') or uri.startswith('gitsm://'): - suffix = 'new' - else: - suffix = newpv - __run('git tag -f devtool-patched-%s' % suffix) + (stdout, _) = __run('git branch --list devtool-override-*') + branches_to_rebase = [branch] + stdout.split() + for b in branches_to_rebase: + logger.info("Rebasing {} onto {}".format(b, rev)) + __run('git checkout %s' % b) + try: + __run('git rebase %s' % rev) + except bb.process.ExecutionError as e: + if 'conflict' in e.stdout: + logger.warning('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip())) + __run('git rebase --abort') + else: + logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) + __run('git checkout %s' % branch) if tmpsrctree: if keep_temp:
Signature · 1 line
2.31.1
PATCH 2/19 cmake: update 3.20.3 -> 3.20.4
---
.../cmake/{cmake-native_3.20.3.bb => cmake-native_3.20.4.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 2 +-
.../recipes-devtools/cmake/{cmake_3.20.3.bb => cmake_3.20.4.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.20.3.bb => cmake-native_3.20.4.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.20.3.bb => cmake_3.20.4.bb} (100%)meta/recipes-devtools/cmake/cmake-native_3.20.4.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.20.3.bb +0 -0
meta/recipes-devtools/cmake/cmake.inc +1 -1
@@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8" +SRC_URI[sha256sum] = "87a4060298f2c6bb09d479de1400bc78195a5b55a65622a7dceeb3d1090a1b16" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/cmake/cmake_3.20.4.bb renamed from meta/recipes-devtools/cmake/cmake_3.20.3.bb +0 -0
Signature · 1 line
2.31.1
PATCH 3/19 gnu-config: update to latest revision
In reply to Alexander Kanavin--- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config_git.bb +2 -2
@@ -9,8 +9,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "92fac9b5ceb9f111a04d7f8f98831570e77886c6" -PV = "20210522+git${SRCPV}" +SRCREV = "4550d2f15b3a7ce2451c1f29500b9339430c877f" +PV = "20210620+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in"
Signature · 1 line
2.31.1
PATCH 4/19 bash: update 5.1 -> 5.1.8
In reply to Alexander Kanavin--- meta/recipes-extended/bash/bash_5.1.8.bb | 24 ++++++++++++++++++ meta/recipes-extended/bash/bash_5.1.bb | 32 ------------------------ 2 files changed, 24 insertions(+), 32 deletions(-) create mode 100644 meta/recipes-extended/bash/bash_5.1.8.bb delete mode 100644 meta/recipes-extended/bash/bash_5.1.bb
meta/recipes-extended/bash/bash_5.1.8.bb new file +24 -0
@@ -0,0 +1,24 @@ +require bash.inc + +# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ + file://execute_cmd.patch \ + file://mkbuiltins_have_stringize.patch \ + file://build-tests.patch \ + file://test-output.patch \ + file://run-ptest \ + file://run-bash-ptests \ + file://fix-run-builtins.patch \ + file://use_aclocal.patch \ + file://makerace.patch \ + " + +SRC_URI[tarball.sha256sum] = "0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be" + +DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" +DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" + +BBCLASSEXTEND = "nativesdk"
meta/recipes-extended/bash/bash_5.1.bb deleted +0 -32
@@ -1,32 +0,0 @@ -require bash.inc - -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-001;apply=yes;striplevel=0;name=patch001 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-002;apply=yes;striplevel=0;name=patch002 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-003;apply=yes;striplevel=0;name=patch003 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-004;apply=yes;striplevel=0;name=patch004 \ - file://execute_cmd.patch \ - file://mkbuiltins_have_stringize.patch \ - file://build-tests.patch \ - file://test-output.patch \ - file://run-ptest \ - file://run-bash-ptests \ - file://fix-run-builtins.patch \ - file://use_aclocal.patch \ - file://makerace.patch \ - " - -SRC_URI[tarball.sha256sum] = "cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa" -SRC_URI[patch001.sha256sum] = "ebb07b3dbadd98598f078125d0ae0d699295978a5cdaef6282fe19adef45b5fa" -SRC_URI[patch002.sha256sum] = "15ea6121a801e48e658ceee712ea9b88d4ded022046a6147550790caf04f5dbe" -SRC_URI[patch003.sha256sum] = "22f2cc262f056b22966281babf4b0a2f84cb7dd2223422e5dcd013c3dcbab6b1" -SRC_URI[patch004.sha256sum] = "9aaeb65664ef0d28c0067e47ba5652b518298b3b92d33327d84b98b28d873c86" - -DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" - -BBCLASSEXTEND = "nativesdk"
Signature · 1 line
2.31.1
PATCH 5/19 dnf: updatee 4.7.0 -> 4.8.0
In reply to Alexander KanavinRemove patches merged upstream.
---
...-dnf-rpm-miscutils.py-fix-usage-of-_.patch | 39 -------------------
...s.py-do-not-hardcode-usr-bin-rpmkeys.patch | 37 ------------------
...PYTHON_INSTALL_DIR-by-running-python.patch | 8 ++--
.../dnf/{dnf_4.7.0.bb => dnf_4.8.0.bb} | 4 +-
4 files changed, 5 insertions(+), 83 deletions(-)
delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch
delete mode 100644 meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch
rename meta/recipes-devtools/dnf/{dnf_4.7.0.bb => dnf_4.8.0.bb} (94%)meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 2729c00f0060beab8537a9bebc796b170949093d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 4 May 2021 22:03:30 +0200 -Subject: [PATCH 1/2] dnf/rpm/miscutils.py: fix usage of _() - -Specifically: -- an import of _ was missing -- _ was reused for a different purpose - -Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/1762] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - dnf/rpm/miscutils.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py -index 235aaf28f..7e33d4c42 100644 ---- a/dnf/rpm/miscutils.py -+++ b/dnf/rpm/miscutils.py -@@ -22,6 +22,7 @@ import subprocess - import logging - - from dnf.i18n import ucd -+from dnf.i18n import _ - from shutil import which - - -@@ -46,7 +47,7 @@ def _verifyPkgUsingRpmkeys(package, installroot): - env={'LC_ALL': 'C'}, - stdout=subprocess.PIPE, - cwd='/') as p: -- data, _ = p.communicate() -+ data, err = p.communicate() - if p.returncode != 0 or data != (package.encode('ascii', 'strict') + b': digests signatures OK\n'): - return 0 - else: --- -2.31.1 -
meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From dc14022a99dc017c52c484efb32729729baf854c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 4 May 2021 22:07:32 +0200 -Subject: [PATCH 2/2] dnf/rpm/miscutils.py: do not hardcode /usr/bin/rpmkeys - -Some build systems (e.g. Yocto) place a specially configured -rpmkeys executable elsewhere and set up PATH accordingly; -it's better to always take it from there. - -Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/1763] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - dnf/rpm/miscutils.py | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py -index 7e33d4c42..fcd956db9 100644 ---- a/dnf/rpm/miscutils.py -+++ b/dnf/rpm/miscutils.py -@@ -30,11 +30,9 @@ logger = logging.getLogger('dnf') - - - def _verifyPkgUsingRpmkeys(package, installroot): -- rpmkeys_binary = '/usr/bin/rpmkeys' -- if not os.path.isfile(rpmkeys_binary): -- rpmkeys_binary = which("rpmkeys") -- logger.info(_('Using rpmkeys executable from {path} to verify signature for package: {package}.').format( -- path=rpmkeys_binary, package=package)) -+ rpmkeys_binary = which("rpmkeys") -+ logger.info(_('Using rpmkeys executable from {path} to verify signature for package: {package}.').format( -+ path=rpmkeys_binary, package=package)) - - if not os.path.isfile(rpmkeys_binary): - logger.critical(_('Cannot find rpmkeys executable to verify signatures.')) --- -2.31.1 -
meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +4 -4
@@ -1,4 +1,4 @@ -From 6be13143a54c79085d400d5bd4c7a6e1cb6ffaf5 Mon Sep 17 00:00:00 2001 +From ceb1043c4f3de095e36908232320b74a4128a94e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 30 Dec 2016 18:29:07 +0200 Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python
@@ -11,15 +11,15 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 38cf4fbf..6c5debd8 100644 +index 9e2e9e9e..2056089d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ ELSE () MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) ENDIF() --EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) -+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") ADD_SUBDIRECTORY (dnf)
meta/recipes-devtools/dnf/dnf_4.8.0.bb renamed from meta/recipes-devtools/dnf/dnf_4.7.0.bb +1 -3
@@ -16,11 +16,9 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0030-Run-python-scripts-using-env.patch \ file://0001-set-python-path-for-completion_helper.patch \ file://0001-dnf-write-the-log-lock-to-root.patch \ - file://0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch \ - file://0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch \ " -SRCREV = "395541fbf8f87f81cdca7567f22be1182e55bea7" +SRCREV = "e7b29753dce94769d30f92e671f55863985d24f0" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 6/19 vulkan-samples: update to latest revision
In reply to Alexander Kanavin--- meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "04278ed5f0f9847ae6897509eb56d7b21b4e8cde" +SRCREV = "47c5237be21209afc945e43d03ae409fa80a0155" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 7/19 bind: upgrade 9.16.16 -> 9.16.18
In reply to Alexander Kanavin---
.../0001-avoid-start-failure-with-bind-user.patch | 0
...0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0
...bind-ensure-searching-for-json-headers-searches-sysr.patch | 0
.../bind/{bind-9.16.16 => bind-9.16.18}/bind9 | 0
.../bind/{bind-9.16.16 => bind-9.16.18}/conf.patch | 0
.../bind/{bind-9.16.16 => bind-9.16.18}/generate-rndc-key.sh | 0
.../init.d-add-support-for-read-only-rootfs.patch | 0
.../make-etc-initd-bind-stop-work.patch | 0
.../bind/{bind-9.16.16 => bind-9.16.18}/named.service | 0
.../bind/{bind_9.16.16.bb => bind_9.16.18.bb} | 4 +---
10 files changed, 1 insertion(+), 3 deletions(-)
rename meta/recipes-connectivity/bind/{bind-9.16.16 => bind-9.16.18}/0001-avoid-start-failure-with-bind-user.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.16 => bind-9.16.18}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.16 => bind-9.16.18}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.16 => bind-9.16.18}/bind9 (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.16 => bind-9.16.18}/conf.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.16 => bind-9.16.18}/generate-rndc-key.sh (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.16 => bind-9.16.18}/init.d-add-support-for-read-only-rootfs.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.16 => bind-9.16.18}/make-etc-initd-bind-stop-work.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.16 => bind-9.16.18}/named.service (100%)
rename meta/recipes-connectivity/bind/{bind_9.16.16.bb => bind_9.16.18.bb} (96%)meta/recipes-connectivity/bind/bind-9.16.18/0001-avoid-start-failure-with-bind-user.patch renamed from meta/recipes-connectivity/bind/bind-9.16.16/0001-avoid-start-failure-with-bind-user.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.18/0001-named-lwresd-V-and-start-log-hide-build-options.patch renamed from meta/recipes-connectivity/bind/bind-9.16.16/0001-named-lwresd-V-and-start-log-hide-build-options.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.18/bind-ensure-searching-for-json-headers-searches-sysr.patch renamed from meta/recipes-connectivity/bind/bind-9.16.16/bind-ensure-searching-for-json-headers-searches-sysr.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.18/bind9 renamed from meta/recipes-connectivity/bind/bind-9.16.16/bind9 +0 -0
meta/recipes-connectivity/bind/bind-9.16.18/conf.patch renamed from meta/recipes-connectivity/bind/bind-9.16.16/conf.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.18/generate-rndc-key.sh renamed from meta/recipes-connectivity/bind/bind-9.16.16/generate-rndc-key.sh +0 -0
meta/recipes-connectivity/bind/bind-9.16.18/init.d-add-support-for-read-only-rootfs.patch renamed from meta/recipes-connectivity/bind/bind-9.16.16/init.d-add-support-for-read-only-rootfs.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.18/make-etc-initd-bind-stop-work.patch renamed from meta/recipes-connectivity/bind/bind-9.16.16/make-etc-initd-bind-stop-work.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.18/named.service renamed from meta/recipes-connectivity/bind/bind-9.16.16/named.service +0 -0
meta/recipes-connectivity/bind/bind_9.16.18.bb renamed from meta/recipes-connectivity/bind/bind_9.16.16.bb +1 -3
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "6c913902adf878e7dc5e229cea94faefc9d40f44775a30213edd08860f761d7b" +SRC_URI[sha256sum] = "3c6263a4364eb5dce233f9f22b90acfa1ec2488d534f91d21663d0ac25ce5e65" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4
@@ -62,8 +62,6 @@ SYSTEMD_SERVICE_${PN} = "named.service" do_install_append() { - rmdir "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" install -d -o bind "${D}${localstatedir}/cache/bind" install -d "${D}${sysconfdir}/bind" install -d "${D}${sysconfdir}/init.d"
Signature · 1 line
2.31.1
PATCH 8/19 bluez5: upgrade 5.58 -> 5.59
In reply to Alexander Kanavin---
meta/recipes-connectivity/bluez5/bluez5.inc | 2 +-
....am-add-missing-mkdir-for-ell-shared.patch | 25 -------------------
.../bluez5/{bluez5_5.58.bb => bluez5_5.59.bb} | 2 +-
3 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch
rename meta/recipes-connectivity/bluez5/{bluez5_5.58.bb => bluez5_5.59.bb} (95%)meta/recipes-connectivity/bluez5/bluez5.inc +1 -1
@@ -45,6 +45,7 @@ PACKAGECONFIG[deprecated] = "--enable-deprecated,--disable-deprecated" PACKAGECONFIG[mesh] = "--enable-mesh --enable-external-ell,--disable-mesh, json-c ell" PACKAGECONFIG[btpclient] = "--enable-btpclient --enable-external-ell,--disable-btpclient, ell" PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" +PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,python3-docutils-native" SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://init \
@@ -53,7 +54,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ file://0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch \ - file://0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch \ " S = "${WORKDIR}/bluez-${PV}"
meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From d341ba650af1b7068d9ad034732b4f41b91bb2c1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Sun, 25 Apr 2021 18:56:41 +0200 -Subject: [PATCH] Makefile.am: add missing mkdir for ell/shared - -This addresses build errors out of source tree. - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <[email protected]> ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index be5d5c7..72ad425 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -623,6 +623,7 @@ lib/bluetooth/%.h: lib/%.h - $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@ - - ell/shared: Makefile -+ $(AM_V_at)$(MKDIR_P) ell - $(AM_V_GEN)for f in $(ell_shared) ; do \ - if [ ! -f $$f ] ; then \ - $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
meta/recipes-connectivity/bluez5/bluez5_5.59.bb renamed from meta/recipes-connectivity/bluez5/bluez5_5.58.bb +1 -1
@@ -1,6 +1,6 @@ require bluez5.inc -SRC_URI[sha256sum] = "c8065e75a5eb67236849ef68a354b1700540305a8c88ef0a0fd6288f19daf1f1" +SRC_URI[sha256sum] = "046b95b386d0bfb2a16311fe799d517ee7735045512d89902c4ed701db477316" # These issues have kernel fixes rather than bluez fixes so exclude here CVE_CHECK_WHITELIST += "CVE-2020-12352 CVE-2020-24490"
Signature · 1 line
2.31.1
PATCH 9/19 dejagnu: upgrade 1.6.2 -> 1.6.3
In reply to Alexander Kanavin---
.../dejagnu/{dejagnu_1.6.2.bb => dejagnu_1.6.3.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-devtools/dejagnu/{dejagnu_1.6.2.bb => dejagnu_1.6.3.bb} (78%)meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb renamed from meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb +1 -2
@@ -13,7 +13,6 @@ inherit autotools SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "e1b07516533f351b3aba3423fafeffd6" -SRC_URI[sha256sum] = "0d0671e1b45189c5fc8ade4b3b01635fb9eeab45cf54f57db23e4c4c1a17d261" +SRC_URI[sha256sum] = "87daefacd7958b4a69f88c6856dbd1634261963c414079d0c371f589cd66a2e3" BBCLASSEXTEND = "native"
Signature · 1 line
2.31.1
PATCH 10/19 gdbm: upgrade 1.19 -> 1.20
In reply to Alexander Kanavin---
meta/recipes-support/gdbm/{gdbm_1.19.bb => gdbm_1.20.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-support/gdbm/{gdbm_1.19.bb => gdbm_1.20.bb} (90%)meta/recipes-support/gdbm/gdbm_1.20.bb renamed from meta/recipes-support/gdbm/gdbm_1.19.bb +1 -2
@@ -13,8 +13,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://ptest.patch \ " -SRC_URI[md5sum] = "aeb29c6a90350a4c959cd1df38cd0a7e" -SRC_URI[sha256sum] = "37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc" +SRC_URI[sha256sum] = "3aeac05648b3482a10a2da986b9f3a380a29ad650be80b9817a435fb8114a292" inherit autotools gettext texinfo lib_package ptest
Signature · 1 line
2.31.1
Re: [OE-core] [PATCH 10/19] gdbm: upgrade 1.19 -> 1.20
A ptest failed in perl with this upgrade in:
gdbm_firstkey: Item not found at ../../t/lib/dbmt_common.pl line 52. Compilation failed in require at t/gdbm.t line 6.
This might be related?
Ross
Quoted 30 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/gdbm/{gdbm_1.19.bb => gdbm_1.20.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta/recipes-support/gdbm/{gdbm_1.19.bb => gdbm_1.20.bb} (90%)meta/recipes-support/gdbm/gdbm_1.20.bb renamed from meta/recipes-support/gdbm/gdbm_1.19.bb +1
-3@@ -13,8 +13,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://ptest.patch \ " -SRC_URI[md5sum] = "aeb29c6a90350a4c959cd1df38cd0a7e" -SRC_URI[sha256sum] = "37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc" +SRC_URI[sha256sum] = "3aeac05648b3482a10a2da986b9f3a380a29ad650be80b9817a435fb8114a292" inherit autotools gettext texinfo lib_package ptest --2.31.1
Re: [OE-core] [PATCH 10/19] gdbm: upgrade 1.19 -> 1.20
Yes, I think so. This can be left out then.
Alex
Quoted 45 lines · Ross Burton
A ptest failed in perl with this upgrade in:
gdbm_firstkey: Item not found at../../t/lib/dbmt_common.plline 52. Compilation failed in require at t/gdbm.t line 6.This might be related?
Ross
Review
Quoted 8 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/gdbm/{gdbm_1.19.bb => gdbm_1.20.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta/recipes-support/gdbm/{gdbm_1.19.bb => gdbm_1.20.bb} (90%)(quoted diff) +0
-0b/meta/recipes-support/gdbm/gdbm_1.20.bb
meta/recipes-support/gdbm/gdbm_1.20.bb SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ · line 17
Quoted 12 lines
similarity index 90%
rename from meta/recipes-support/gdbm/gdbm_1.19.bb rename to meta/recipes-support/gdbm/gdbm_1.20.bb indexcd2617b130..51f9d17e49100644meta/recipes-support/gdbm/gdbm_1.20.bb renamed from meta/recipes-support/gdbm/gdbm_1.19.bb +0
-2@@ -13,8 +13,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://ptest.patch \ " -SRC_URI[md5sum] = "aeb29c6a90350a4c959cd1df38cd0a7e" -SRC_URI[sha256sum] ="
37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc"meta/recipes-support/gdbm/gdbm_1.20.bb SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ · line 16
Quoted 1 line
meta/recipes-support/gdbm/gdbm_1.20.bb renamed from meta/recipes-support/gdbm/gdbm_1.19.bb +1
-0+SRC_URI[sha256sum] ="
3aeac05648b3482a10a2da986b9f3a380a29ad650be80b9817a435fb8114a292"Quoted 9 lines
meta/recipes-support/gdbm/gdbm_1.20.bb renamed from meta/recipes-support/gdbm/gdbm_1.19.bb +0
-1inherit autotools gettext texinfo lib_package ptest --2.31.1
PATCH 11/19 libdnf: upgrade 0.63.0 -> 0.63.1
In reply to Alexander Kanavin---
.../libdnf/{libdnf_0.63.0.bb => libdnf_0.63.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/libdnf/{libdnf_0.63.0.bb => libdnf_0.63.1.bb} (97%)meta/recipes-devtools/libdnf/libdnf_0.63.1.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.63.0.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ file://0001-drop-FindPythonInstDir.cmake.patch \ " -SRCREV = "669a5c691acba91693d238d6262ac99a440aa9b3" +SRCREV = "8e451380bf84bd76e3925cbae2a06bb0e56f5cd9" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.31.1
PATCH 12/19 libpcre: upgrade 8.44 -> 8.45
In reply to Alexander KanavinLicense-Update: copyright years
---
.../libpcre/{libpcre_8.44.bb => libpcre_8.45.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-support/libpcre/{libpcre_8.44.bb => libpcre_8.45.bb} (92%)meta/recipes-support/libpcre/libpcre_8.45.bb renamed from meta/recipes-support/libpcre/libpcre_8.44.bb +2 -3
@@ -6,14 +6,13 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" +LIC_FILES_CHKSUM = "file://LICENCE;md5=b5d5d1a69a24ea2718263f1ff85a1c58" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://run-ptest \ file://Makefile \ " -SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" -SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" +SRC_URI[sha256sum] = "4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8" CVE_PRODUCT = "pcre"
Signature · 1 line
2.31.1
PATCH 13/19 libxi: upgrade 1.7.10 -> 1.7.99.2
In reply to Alexander Kanavin---
.../xorg-lib/{libxi_1.7.10.bb => libxi_1.7.99.2.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxi_1.7.10.bb => libxi_1.7.99.2.bb} (82%)meta/recipes-graphics/xorg-lib/libxi_1.7.99.2.bb renamed from meta/recipes-graphics/xorg-lib/libxi_1.7.10.bb +1 -2
@@ -17,7 +17,6 @@ PE = "1" XORG_PN = "libXi" -SRC_URI[md5sum] = "62c4af0839072024b4b1c8cbe84216c7" -SRC_URI[sha256sum] = "36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061" +SRC_URI[sha256sum] = "2ce90ebcb7fa0c3ed671924f1268b8f4c500fff62e1284699fc413e182a7896b" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.31.1
PATCH 14/19 mtools: upgrade 4.0.29 -> 4.0.31
In reply to Alexander Kanavin---
.../mtools/mtools/disable-hardcoded-configs.patch | 6 +++---
.../mtools/{mtools_4.0.29.bb => mtools_4.0.31.bb} | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/mtools/{mtools_4.0.29.bb => mtools_4.0.31.bb} (93%)meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +3 -3
@@ -1,4 +1,4 @@ -From 9590860ba35cbd524cec51bdd009f0c63a7dd417 Mon Sep 17 00:00:00 2001 +From 589a05f9377e3899082ced46c1736f90c0a4dc9b Mon Sep 17 00:00:00 2001 From: Ed Bartosh <[email protected]> Date: Tue, 13 Jun 2017 14:55:52 +0300 Subject: [PATCH] Disabled reading host configs.
@@ -12,10 +12,10 @@ Signed-off-by: Ed Bartosh <[email protected]> 1 file changed, 8 deletions(-) diff --git a/config.c b/config.c -index 415755f..b61a49d 100644 +index f91004b..b72f8ea 100644 --- a/config.c +++ b/config.c -@@ -774,14 +774,6 @@ void read_config(void) +@@ -827,14 +827,6 @@ void read_config(void) memcpy(devices, const_devices, nr_const_devices*sizeof(struct device));
meta/recipes-devtools/mtools/mtools_4.0.31.bb renamed from meta/recipes-devtools/mtools/mtools_4.0.29.bb +1 -1
@@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_libc-glibc = "\ glibc-gconv-ibm866 \ glibc-gconv-ibm869 \ " -SRC_URI[sha256sum] = "c6b50b4603e7afe54ba0109094669373028db9af743f5c541bca4b7664aefec7" +SRC_URI[sha256sum] = "538999277f8f2fa901f3898855d1b0ccb184666457fefddb70001cac612dd586" SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://mtools-makeinfo.patch \
Signature · 1 line
2.31.1
PATCH 15/19 python3-git: upgrade 3.1.17 -> 3.1.18
In reply to Alexander Kanavin---
.../python/{python3-git_3.1.17.bb => python3-git_3.1.18.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-git_3.1.17.bb => python3-git_3.1.18.bb} (92%)meta/recipes-devtools/python/python3-git_3.1.18.bb renamed from meta/recipes-devtools/python/python3-git_3.1.17.bb +1 -1
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "GitPython" inherit pypi setuptools3 -SRC_URI[sha256sum] = "ee24bdc93dce357630764db659edaf6b8d664d4ff5447ccfeedd2dc5c253f41e" +SRC_URI[sha256sum] = "b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b" DEPENDS += " ${PYTHON_PN}-gitdb"
Signature · 1 line
2.31.1
PATCH 16/19 sqlite3: upgrade 3.35.5 -> 3.36.0
In reply to Alexander Kanavin---
.../sqlite/{sqlite3_3.35.5.bb => sqlite3_3.36.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/sqlite/{sqlite3_3.35.5.bb => sqlite3_3.36.0.bb} (83%)meta/recipes-support/sqlite/sqlite3_3.36.0.bb renamed from meta/recipes-support/sqlite/sqlite3_3.35.5.bb +1 -1
@@ -4,7 +4,7 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" SRC_URI = "http://www.sqlite.org/2021/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[sha256sum] = "f52b72a5c319c3e516ed7a92e123139a6e87af08a2dc43d7757724f6132e6db0" +SRC_URI[sha256sum] = "bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3" # -19242 is only an issue in specific development branch commits CVE_CHECK_WHITELIST += "CVE-2019-19242"
Signature · 1 line
2.31.1
PATCH 17/19 vte: upgrade 0.64.1 -> 0.64.2
In reply to Alexander Kanavin---
meta/recipes-support/vte/{vte_0.64.1.bb => vte_0.64.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/vte/{vte_0.64.1.bb => vte_0.64.2.bb} (95%)meta/recipes-support/vte/vte_0.64.2.bb renamed from meta/recipes-support/vte/vte_0.64.1.bb +1 -1
@@ -20,7 +20,7 @@ inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-intros # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" -SRC_URI[archive.sha256sum] = "12fb41a9ff8e03c5f1711b46560910a4b9b3102aec3e9e7609ceef4dfa98aa2a" +SRC_URI[archive.sha256sum] = "2b3c820b65a667c1d8859ba20478be626d1519cc3159dac25f703330c6d07e18" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
Signature · 1 line
2.31.1
PATCH 18/19 x264: upgrade to latest revision
In reply to Alexander Kanavin--- meta/recipes-multimedia/x264/x264_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/x264/x264_git.bb +1 -1
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "55d517bc4569272a2c9a367a4106c234aba2ffbc" +SRCREV = "5db6aa6cab1b146e07b60cc1736a01f21da01154" PV = "r3039+git${SRCPV}"
Signature · 1 line
2.31.1
PATCH 19/19 python3: apply test skipping patch unconditionally
In reply to Alexander KanavinTesting IMAGE_FEATURES from component recipes cannot possibly work; adjusting the test to soft-fail if needed items are not available is not trivial, so let's just skip unconditionally for now.
--- meta/recipes-devtools/python/python3_3.9.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3_3.9.5.bb +1 -1
@@ -31,7 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \ file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \ - ${@bb.utils.contains('IMAGE_FEATURES', 'tools-sdk', '', 'file://0001-test_ctypes.test_find-skip-without-tools-sdk.patch', d)} \ + file://0001-test_ctypes.test_find-skip-without-tools-sdk.patch \ " SRC_URI_append_class-native = " \
Signature · 1 line
2.31.1