devtool/upgrade: rename RECIPE_UPDATE_EXTRA_TASKS -> RECIPE_UPGRADE_EXTRA_TASKS
PATCH 1/4 devtool/upgrade: rename RECIPE_UPDATE_EXTRA_TASKS -> RECIPE_UPGRADE_EXTRA_TASKS
From: Alexander Kanavin <[email protected]>
'UPDATE' as a name is somewhat unfortunate as the variable is intended only for the 'devtool upgrade' operation and devtool also has an 'update-recipe' operation.
--- meta/classes-recipe/cargo-update-recipe-crates.bbclass | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- scripts/lib/devtool/upgrade.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-)
meta/classes-recipe/cargo-update-recipe-crates.bbclass +1 -1
@@ -18,7 +18,7 @@ do_update_crates[depends] = "python3-native:do_populate_sysroot" do_update_crates[nostamp] = "1" do_update_crates[doc] = "Update the recipe by reading Cargo.lock and write in ${THISDIR}/${BPN}-crates.inc" -RECIPE_UPDATE_EXTRA_TASKS += "do_update_crates" +RECIPE_UPGRADE_EXTRA_TASKS += "do_update_crates" # The directory where to search for Cargo.lock files CARGO_LOCK_SRC_DIR ??= "${S}"
meta/lib/oeqa/selftest/cases/devtool.py +1 -1
@@ -2017,7 +2017,7 @@ class DevtoolUpgradeTests(DevtoolBase): newlines = f.readlines() self.assertEqual(desiredlines, newlines) - def test_devtool_upgrade_recipe_update_extra_tasks(self): + def test_devtool_upgrade_recipe_upgrade_extra_tasks(self): # Check preconditions self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') self.track_for_cleanup(self.workspacedir)
scripts/lib/devtool/upgrade.py +5 -5
@@ -534,14 +534,14 @@ def _generate_license_diff(old_licenses, new_licenses): diff = diff + line return diff -def _run_recipe_update_extra_tasks(pn, rd, tinfoil): +def _run_recipe_upgrade_extra_tasks(pn, rd, tinfoil): tasks = [] - for task in (rd.getVar('RECIPE_UPDATE_EXTRA_TASKS') or '').split(): - logger.info('Running extra recipe update task: %s' % task) + for task in (rd.getVar('RECIPE_UPGRADE_EXTRA_TASKS') or '').split(): + logger.info('Running extra recipe upgrade task: %s' % task) res = tinfoil.build_targets(pn, task, handle_events=True) if not res: - raise DevtoolError('Running extra recipe update task %s for %s failed' % (task, pn)) + raise DevtoolError('Running extra recipe upgrade task %s for %s failed' % (task, pn)) def upgrade(args, config, basepath, workspace): """Entry point for the devtool 'upgrade' subcommand"""
@@ -618,7 +618,7 @@ def upgrade(args, config, basepath, workspace): copied, config.workspace_path, rd) standard._add_md5(config, pn, af) - _run_recipe_update_extra_tasks(pn, rd, tinfoil) + _run_recipe_upgrade_extra_tasks(pn, rd, tinfoil) update_unlockedsigs(basepath, workspace, args.fixed_setup, [pn])
Signature · 1 line
2.39.2
PATCH 2/4 python3-jinja2: fix upstream version check
From: Alexander Kanavin <[email protected]>
--- meta/recipes-devtools/python/python3-jinja2_3.1.4.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/python/python3-jinja2_3.1.4.bb +1 -0
@@ -13,6 +13,7 @@ CVE_PRODUCT = "jinja2 jinja" CLEANBROKEN = "1" inherit pypi python_flit_core ptest +UPSTREAM_CHECK_PYPI_PACKAGE = "Jinja2" SRC_URI += " \ file://run-ptest \
Signature · 1 line
2.39.2
PATCH 3/4 ca-certificates: get sources from debian tarballs
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
git repo no longer has tags for recent versions which means we had missed several of them, and wouldn't be able to get notifications about any future releases.
--- .../ca-certificates/ca-certificates_20240203.bb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
meta/recipes-support/ca-certificates/ca-certificates_20240203.bb +3 -14
@@ -14,26 +14,15 @@ DEPENDS:class-nativesdk = "openssl-native" # Need rehash from openssl and run-parts from debianutils PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" -# Since there is no TAG in the git repository, the SRCREV was determined -# through comparison of the git repository and the data on the following -# package informatin pages: -# -# * https://packages.debian.org/trixie/ca-certificates -# * https://packages.ubuntu.com/noble/ca-certificates -# -SRCREV = "ee6e0484031314090a11c04ee82689acb73d7ad8" - -SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https;branch=master \ +SRC_URI[sha256sum] = "3286d3fc42c4d11b7086711a85f865b44065ce05cf1fb5376b2abed07622a9c6" +SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/${BPN}_${PV}.tar.xz \ file://0002-update-ca-certificates-use-SYSROOT.patch \ file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ file://default-sysroot.patch \ file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ file://0001-Revert-mozilla-certdata2pem.py-print-a-warning-for-e.patch \ " -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+)" - -S = "${WORKDIR}/git" - +S = "${WORKDIR}/ca-certificates" inherit allarch EXTRA_OEMAKE = "\
Signature · 1 line
2.39.2
PATCH 4/4 pulseaudio, desktop-file-utils: correct freedesktop.org -> www.freedesktop.org SRC_URI
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Server's https certificate isn't valid for freedesktop.org without www prefix.
--- .../desktop-file-utils/desktop-file-utils_0.27.bb | 2 +- meta/recipes-multimedia/pulseaudio/pulseaudio_17.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.27.bb +1 -1
@@ -7,7 +7,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/validator.c;beginline=4;endline=27;md5=281e1114ee6c486a1a0a4295986b9416" -SRC_URI = "http://freedesktop.org/software/${BPN}/releases/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/releases/${BP}.tar.xz" SRC_URI[sha256sum] = "a0817df39ce385b6621880407c56f1f298168c040c2032cedf88d5b76affe836" DEPENDS = "glib-2.0"
meta/recipes-multimedia/pulseaudio/pulseaudio_17.0.bb +1 -1
@@ -1,6 +1,6 @@ require pulseaudio.inc -SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ +SRC_URI = "http://www.freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-client-conf-Add-allow-autospawn-for-root.patch \ file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ file://volatiles.04_pulse \
Signature · 1 line
2.39.2