Skip to contentSkip to conversation

Review request

PATCH New Anuj Mittal 1 participant 27 messages Nov 9, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Review request

Next set of changes for honister. Please review. No issues seen while testing except for an intermittent qemu shutdown failure.

Thanks,

Anuj

The following changes since commit 3cbe3e6f932151800793854ad5d3569dc6f36ab1:

qemu.inc: Remove empty egg-info directories before running meson (2021-11-03 00:40:35 +0800)

are available in the Git repository at:

git://push.openembedded.org/openembedded-core-contrib anujm/honister

Alexander Kanavin (2):
linux-firmware: upgrade 20210919 -> 20211027
libpcre/libpcre2: correct SRC_URI

Andres Beltran (1):
create-spdx: Set the Organization field via a variable

Bruce Ashfield (4):
linux-yocto/5.14: update to v5.14.15 linux-yocto/5.10: update to v5.10.76 linux-yocto-rt/5.10: update to -rt54
strace: fix build against 5.15 kernel/kernel-headers

Jose Quaresma (1):
sstate: another fix for touching files inside pseudo

Kai Kang (1):
squashfs-tools: fix CVE-2021-41072

Khem Raj (1):
kernel-devsrc: Add vdso.lds and other build files for riscv64 as well

Manuel Leonhardt (2):
sstate: Account for reserved characters when shortening sstate
filenames
dpkg: Install dkpg-perl scripts to versioned perl directory

Peter Kjellerstedt (2):
libx11: Update LICENSE to better reflect reality
libx11-compose-data: Update LICENSE to better reflect reality

Richard Purdie (8):
opkg: Fix poor operator combination choice
linunistring: Add missing gperf-native dependency
pseudo: Add fcntl64 wrapper
meta: Add explict branch to git SRC_URIs
meta/scripts: Manual git url branch additions scripts/convert-srcuri: Update SRC_URI conversion script to handle
github url changes
recipes: Update github.com urls to use https go-helloworld/glide: Fix urls

Ross Burton (1):
meson: set objcopy in the cross and native toolchain files

Tom Hochstein (3):
wayland: Fix wayland-tools packaging nativesdk-packagegroup-sdk-host.bb: Update host tools for wayland bitbake.conf: Use wayland distro feature for native builds

 .../devtool/devtool-upgrade-test2_git.bb      |   2 +-
 .../devtool-upgrade-test2_git.bb.upgraded     |   2 +-
 .../git-submodule-test/git-submodule-test.bb  |   2 +-
 meta/classes/create-spdx.bbclass              |  10 +-
 meta/classes/devupstream.bbclass              |   2 +-
 meta/classes/meson.bbclass                    |   2 +
 meta/classes/sstate.bbclass                   |  14 +-
 meta/conf/bitbake.conf                        |   6 +-
 .../distro/include/default-distrovars.inc     |   2 +-
 meta/lib/oeqa/selftest/cases/devtool.py       |   4 +-
 meta/lib/oeqa/selftest/cases/fetch.py         |   2 +-
 meta/lib/oeqa/selftest/cases/recipetool.py    |   6 +-
 meta/lib/oeqa/selftest/cases/sstatetests.py   |   2 +-
 meta/recipes-bsp/efibootmgr/efibootmgr_17.bb  |   2 +-
 meta/recipes-bsp/efivar/efivar_37.bb          |   2 +-
 meta/recipes-bsp/opensbi/opensbi_0.9.bb       |   2 +-
 meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb  |   2 +-
 meta/recipes-bsp/u-boot/u-boot-common.inc     |   2 +-
 .../connman/connman-gnome_0.7.bb              |   2 +-
 .../libnss-mdns/libnss-mdns_0.15.1.bb         |   2 +-
 .../libuv/libuv_1.42.0.bb                     |   2 +-
 .../mobile-broadband-provider-info_git.bb     |   2 +-
 meta/recipes-core/dbus-wait/dbus-wait_git.bb  |   2 +-
 meta/recipes-core/fts/fts_1.2.7.bb            |   2 +-
 .../glibc/cross-localedef-native_2.34.bb      |   2 +-
 meta/recipes-core/glibc/glibc-version.inc     |   2 +-
 meta/recipes-core/ifupdown/ifupdown_0.8.36.bb |   2 +-
 .../initscripts/init-system-helpers_1.60.bb   |   2 +-
 meta/recipes-core/libxcrypt/libxcrypt.inc     |   2 +-
 meta/recipes-core/musl/libucontext_git.bb     |   2 +-
 meta/recipes-core/musl/musl-obstack.bb        |   2 +-
 meta/recipes-core/musl/musl-utils.bb          |   2 +-
 meta/recipes-core/musl/musl_git.bb            |   2 +-
 meta/recipes-core/ncurses/ncurses.inc         |   2 +-
 .../nativesdk-packagegroup-sdk-host.bb        |   2 +-
 meta/recipes-core/psplash/psplash_git.bb      |   2 +-
 meta/recipes-core/systemd/systemd.inc         |   2 +-
 .../update-rc.d/update-rc.d_0.8.bb            |   2 +-
 .../bootchart2/bootchart2_0.14.9.bb           |   2 +-
 .../btrfs-tools/btrfs-tools_5.13.1.bb         |   2 +-
 .../createrepo-c/createrepo-c_0.17.4.bb       |   2 +-
 meta/recipes-devtools/distcc/distcc_3.4.bb    |   2 +-
 meta/recipes-devtools/dnf/dnf_4.8.0.bb        |   2 +-
 meta/recipes-devtools/dpkg/dpkg.inc           |   4 +-
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc |   2 +-
 .../erofs-utils/erofs-utils_1.3.bb            |   2 +-
 meta/recipes-devtools/file/file_5.40.bb       |   2 +-
 meta/recipes-devtools/glide/glide_0.13.3.bb   |   2 +-
 .../gnu-config/gnu-config_git.bb              |   2 +-
 .../libcomps/libcomps_0.1.17.bb               |   2 +-
 meta/recipes-devtools/libdnf/libdnf_0.63.1.bb |   2 +-
 .../librepo/librepo_1.14.1.bb                 |   2 +-
 meta/recipes-devtools/llvm/llvm_git.bb        |   2 +-
 meta/recipes-devtools/mtd/mtd-utils_git.bb    |   2 +-
 meta/recipes-devtools/ninja/ninja_1.10.2.bb   |   2 +-
 meta/recipes-devtools/opkg/opkg_0.4.5.bb      |   2 +-
 .../patchelf/patchelf_0.13.bb                 |   2 +-
 meta/recipes-devtools/pseudo/pseudo_git.bb    |   2 +-
 meta/recipes-devtools/rpm/rpm_4.16.1.3.bb     |   2 +-
 .../CVE-2021-41072-requisite-1.patch          | 135 ++++++++
 .../CVE-2021-41072-requisite-2.patch          | 108 ++++++
 .../CVE-2021-41072-requisite-3.patch          | 326 ++++++++++++++++++
 .../squashfs-tools/CVE-2021-41072.patch       | 325 +++++++++++++++++
 .../squashfs-tools/squashfs-tools_git.bb      |   6 +-
 ...1-Avoid-relying-on-presence-of-ipx.h.patch | 151 ++++++++
 meta/recipes-devtools/strace/strace_5.14.bb   |   1 +
 .../systemd-bootchart_234.bb                  |   2 +-
 .../tcf-agent/tcf-agent_git.bb                |   2 +-
 meta/recipes-devtools/unfs3/unfs3_git.bb      |   2 +-
 .../rust-hello-world/rust-hello-world_git.bb  |   2 +-
 meta/recipes-extended/bzip2/bzip2_1.0.8.bb    |   2 +-
 .../go-examples/go-helloworld_0.1.bb          |   2 +-
 .../iputils/iputils_20210722.bb               |   2 +-
 .../recipes-extended/libaio/libaio_0.3.112.bb |   2 +-
 meta/recipes-extended/libnsl/libnsl2_git.bb   |   2 +-
 .../recipes-extended/libnss-nis/libnss-nis.bb |   2 +-
 .../libsolv/libsolv_0.7.19.bb                 |   2 +-
 meta/recipes-extended/ltp/ltp_20210524.bb     |   2 +-
 .../net-tools/net-tools_2.10.bb               |   2 +-
 meta/recipes-extended/procps/procps_3.3.17.bb |   2 +-
 meta/recipes-extended/psmisc/psmisc_23.4.bb   |   2 +-
 .../rpcsvc-proto/rpcsvc-proto.bb              |   2 +-
 .../stress-ng/stress-ng_0.13.00.bb            |   2 +-
 .../sysklogd/sysklogd_2.2.3.bb                |   2 +-
 .../xinetd/xinetd_2.3.15.4.bb                 |   2 +-
 meta/recipes-extended/zstd/zstd_1.5.0.bb      |   2 +-
 meta/recipes-gnome/libportal/libportal_0.4.bb |   2 +-
 .../glslang/glslang_11.5.0.bb                 |   2 +-
 .../igt-gpu-tools/igt-gpu-tools_git.bb        |   2 +-
 .../libfakekey/libfakekey_git.bb              |   2 +-
 .../libmatchbox/libmatchbox_1.12.bb           |   2 +-
 .../libva/libva-utils_2.12.0.bb               |   2 +-
 .../matchbox-wm/matchbox-wm_1.2.2.bb          |   2 +-
 .../spir/spirv-headers_1.5.4.bb               |   2 +-
 .../spir/spirv-tools_2021.2.bb                |   2 +-
 .../vulkan/vulkan-headers_1.2.182.0.bb        |   2 +-
 .../vulkan/vulkan-loader_1.2.182.0.bb         |   2 +-
 .../vulkan/vulkan-samples_git.bb              |   2 +-
 .../vulkan/vulkan-tools_1.2.182.0.bb          |   2 +-
 .../wayland/wayland_1.19.0.bb                 |   6 +-
 .../xinput-calibrator_git.bb                  |   2 +-
 .../xorg-driver/xf86-video-intel_git.bb       |   2 +-
 .../xorg-lib/libx11-compose-data_1.6.8.bb     |   2 +-
 .../recipes-graphics/xorg-lib/libx11_1.7.2.bb |   2 +-
 meta/recipes-kernel/blktrace/blktrace_git.bb  |   2 +-
 meta/recipes-kernel/cryptodev/cryptodev.inc   |   2 +-
 meta/recipes-kernel/dtc/dtc.inc               |   2 +-
 .../kern-tools/kern-tools-native_git.bb       |   2 +-
 meta/recipes-kernel/kmod/kmod.inc             |   2 +-
 ...20210919.bb => linux-firmware_20211027.bb} |   4 +-
 meta/recipes-kernel/linux/kernel-devsrc.bb    |  10 +-
 .../linux/linux-yocto-rt_5.10.bb              |   6 +-
 .../linux/linux-yocto-rt_5.14.bb              |   6 +-
 .../linux/linux-yocto-tiny_5.10.bb            |   8 +-
 .../linux/linux-yocto-tiny_5.14.bb            |   8 +-
 meta/recipes-kernel/linux/linux-yocto_5.10.bb |  24 +-
 meta/recipes-kernel/linux/linux-yocto_5.14.bb |  26 +-
 meta/recipes-kernel/powertop/powertop_2.14.bb |   2 +-
 .../systemtap/systemtap_git.inc               |   2 +-
 meta/recipes-multimedia/x264/x264_git.bb      |   2 +-
 meta/recipes-sato/l3afpad/l3afpad_git.bb      |   2 +-
 .../matchbox-config-gtk_0.2.bb                |   2 +-
 .../matchbox-desktop/matchbox-desktop_2.2.bb  |   2 +-
 .../matchbox-panel-2/matchbox-panel-2_2.11.bb |   2 +-
 .../matchbox-terminal_0.2.bb                  |   2 +-
 .../matchbox-theme-sato_0.2.bb                |   2 +-
 .../sato-screenshot/sato-screenshot_0.3.bb    |   2 +-
 .../settings-daemon/settings-daemon_0.0.2.bb  |   2 +-
 .../bmap-tools/bmap-tools_3.6.bb              |   2 +-
 .../boost/boost-build-native_4.4.1.bb         |   2 +-
 .../ca-certificates_20211016.bb               |   2 +-
 .../dos2unix/dos2unix_7.4.2.bb                |   2 +-
 .../gnome-desktop-testing_2021.1.bb           |   2 +-
 meta/recipes-support/libgit2/libgit2_1.1.1.bb |   2 +-
 .../libjitterentropy_3.1.0.bb                 |   2 +-
 .../recipes-support/libpcre/libpcre2_10.37.bb |   4 +-
 meta/recipes-support/libpcre/libpcre_8.45.bb  |   2 +-
 .../libseccomp/libseccomp_2.5.1.bb            |   2 +-
 .../libunistring/libunistring_0.9.10.bb       |   1 +
 meta/recipes-support/lz4/lz4_1.9.3.bb         |   2 +-
 meta/recipes-support/numactl/numactl_git.bb   |   2 +-
 .../recipes-support/p11-kit/p11-kit_0.24.0.bb |   2 +-
 .../ptest-runner/ptest-runner_2.4.2.bb        |   2 +-
 .../rng-tools/rng-tools_6.14.bb               |   2 +-
 .../shared-mime-info/shared-mime-info_git.bb  |   2 +-
 meta/recipes-support/vim/vim.inc              |   2 +-
 meta/recipes-support/xxhash/xxhash_0.8.0.bb   |   2 +-
 scripts/contrib/convert-srcuri.py             |  77 +++++
 scripts/lib/recipetool/create.py              |   3 +
 149 files changed, 1334 insertions(+), 191 deletions(-)
 create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072-requisite-1.patch
 create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072-requisite-2.patch
 create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072-requisite-3.patch
 create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch
 create mode 100644 meta/recipes-devtools/strace/strace/0001-Avoid-relying-on-presence-of-ipx.h.patch
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20210919.bb => linux-firmware_20211027.bb} (99%)
 create mode 100755 scripts/contrib/convert-srcuri.py
Signature · 1 line
2.31.1
#1 lore raw

PATCH 1/26 squashfs-tools: fix CVE-2021-41072

From: Kai Kang <[email protected]>

Backport patch to fix CVE-2021-41072. And 3 more ancestor commits are backported too, otherwise it fails to compile.

CVE: CVE-2021-41072

Ref:
* https://nvd.nist.gov/vuln/detail/CVE-2021-41072

---
 .../CVE-2021-41072-requisite-1.patch          | 135 ++++++++
 .../CVE-2021-41072-requisite-2.patch          | 108 ++++++
 .../CVE-2021-41072-requisite-3.patch          | 326 ++++++++++++++++++
 .../squashfs-tools/CVE-2021-41072.patch       | 325 +++++++++++++++++
 .../squashfs-tools/squashfs-tools_git.bb      |   4 +
 5 files changed, 898 insertions(+)
 create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072-requisite-1.patch
 create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072-requisite-2.patch
 create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072-requisite-3.patch
 create mode 100644 meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch
meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072-requisite-1.patch new file +135 -0
new file mode 100644
index 0000000000..d01b5c6871
@@ -0,0 +1,135 @@
+The commit is required by the fix for CVE-2021-41072.
+
+Upstream-Status: Backport [https://github.com/plougher/squashfs-tools/commit/80b8441]
+
+Signed-off-by: Kai Kang <[email protected]>
+
+From 80b8441a37fcf8bf07dacf24d9d6c6459a0f6e36 Mon Sep 17 00:00:00 2001
+From: Phillip Lougher <[email protected]>
+Date: Sun, 12 Sep 2021 19:58:19 +0100
+Subject: [PATCH] unsquashfs: use squashfs_closedir() to delete directory
+
+Signed-off-by: Phillip Lougher <[email protected]>
+---
+ squashfs-tools/unsquash-1.c    |  3 +--
+ squashfs-tools/unsquash-1234.c | 11 +++++++++--
+ squashfs-tools/unsquash-2.c    |  3 +--
+ squashfs-tools/unsquash-3.c    |  3 +--
+ squashfs-tools/unsquash-4.c    |  3 +--
+ squashfs-tools/unsquashfs.c    |  7 -------
+ squashfs-tools/unsquashfs.h    |  1 +
+ 7 files changed, 14 insertions(+), 17 deletions(-)
+
+diff --git a/squashfs-tools/unsquash-1.c b/squashfs-tools/unsquash-1.c
+index acba821..7598499 100644
+--- a/squashfs-tools/unsquash-1.c
++++ b/squashfs-tools/unsquash-1.c
+@@ -373,8 +373,7 @@ static struct dir *squashfs_opendir(unsigned int block_start, unsigned int offse
+ 	return dir;
+ 
+ corrupted:
+-	free(dir->dirs);
+-	free(dir);
++	squashfs_closedir(dir);
+ 	return NULL;
+ }
+ 
+diff --git a/squashfs-tools/unsquash-1234.c b/squashfs-tools/unsquash-1234.c
+index c2d4f42..0c8dfbb 100644
+--- a/squashfs-tools/unsquash-1234.c
++++ b/squashfs-tools/unsquash-1234.c
+@@ -25,8 +25,8 @@
+  * unsquash-4.
+  */
+ 
+-#define TRUE 1
+-#define FALSE 0
++#include "unsquashfs.h"
++
+ /*
+  * Check name for validity, name should not
+  *  - be ".", "./", or
+@@ -56,3 +56,10 @@ int check_name(char *name, int size)
+ 
+ 	return TRUE;
+ }
++
++
++void squashfs_closedir(struct dir *dir)
++{
++	free(dir->dirs);
++	free(dir);
++}
+diff --git a/squashfs-tools/unsquash-2.c b/squashfs-tools/unsquash-2.c
+index 0746b3d..86f62ba 100644
+--- a/squashfs-tools/unsquash-2.c
++++ b/squashfs-tools/unsquash-2.c
+@@ -465,8 +465,7 @@ static struct dir *squashfs_opendir(unsigned int block_start, unsigned int offse
+ 	return dir;
+ 
+ corrupted:
+-	free(dir->dirs);
+-	free(dir);
++	squashfs_closedir(dir);
+ 	return NULL;
+ }
+ 
+diff --git a/squashfs-tools/unsquash-3.c b/squashfs-tools/unsquash-3.c
+index 094caaa..c04aa9e 100644
+--- a/squashfs-tools/unsquash-3.c
++++ b/squashfs-tools/unsquash-3.c
+@@ -499,8 +499,7 @@ static struct dir *squashfs_opendir(unsigned int block_start, unsigned int offse
+ 	return dir;
+ 
+ corrupted:
+-	free(dir->dirs);
+-	free(dir);
++	squashfs_closedir(dir);
+ 	return NULL;
+ }
+ 
+diff --git a/squashfs-tools/unsquash-4.c b/squashfs-tools/unsquash-4.c
+index 3a1b9e1..ff62dcc 100644
+--- a/squashfs-tools/unsquash-4.c
++++ b/squashfs-tools/unsquash-4.c
+@@ -436,8 +436,7 @@ static struct dir *squashfs_opendir(unsigned int block_start, unsigned int offse
+ 	return dir;
+ 
+ corrupted:
+-	free(dir->dirs);
+-	free(dir);
++	squashfs_closedir(dir);
+ 	return NULL;
+ }
+ 
+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
+index 7b590bd..04be53c 100644
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -1350,13 +1350,6 @@ unsigned int *offset, unsigned int *type)
+ }
+ 
+ 
+-void squashfs_closedir(struct dir *dir)
+-{
+-	free(dir->dirs);
+-	free(dir);
+-}
+-
+-
+ char *get_component(char *target, char **targname)
+ {
+ 	char *start;
+diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h
+index 2e9201c..5ecb2ab 100644
+--- a/squashfs-tools/unsquashfs.h
++++ b/squashfs-tools/unsquashfs.h
+@@ -291,4 +291,5 @@ extern long long *alloc_index_table(int);
+ 
+ /* unsquash-1234.c */
+ extern int check_name(char *, int);
++extern void squashfs_closedir(struct dir *);
+ #endif
+-- 
+2.17.1
+
meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072-requisite-2.patch new file +108 -0

108 lines not on this page · raw message

meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072-requisite-3.patch new file +326 -0

326 lines not on this page · raw message

meta/recipes-devtools/squashfs-tools/squashfs-tools/CVE-2021-41072.patch new file +325 -0

325 lines not on this page · raw message

meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +4 -0
index c78f446711..115e995eef 100644
@@ -11,6 +11,10 @@ PV = "4.5"
 SRCREV = "0496d7c3de3e09da37ba492081c86159806ebb07"
 SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
            file://0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch \
+           file://CVE-2021-41072-requisite-1.patch;striplevel=2 \
+           file://CVE-2021-41072-requisite-2.patch;striplevel=2 \
+           file://CVE-2021-41072-requisite-3.patch;striplevel=2 \
+           file://CVE-2021-41072.patch;striplevel=2 \
            "
 
 S = "${WORKDIR}/git/squashfs-tools"
Signature · 1 line
2.31.1
#2 lore raw

PATCH 2/26 sstate: Account for reserved characters when shortening sstate filenames

In reply to Anuj Mittal

From: Manuel Leonhardt <[email protected]>

Previously, when shortening sstate filenames, the reserved characters for .siginfo were not considered, when siginfo=False, resulting in differently shortend filenames for the sstate and siginfo files. With this change, the filenames of the truncated sstate and siginfo files have the same basename, just as is already the case for untruncated filenames.

Making sure that the .siginfo files always have the filename of the corresponding sstate file plus its .siginfo suffix, also when being truncated, makes it easier to manage the sstate cache and an sstate mirror outside of Bitbake/Yocto.

Cc Richard Purdie <[email protected]>
(cherry picked from commit c2e0e43b7123cf5149833e0072c8edaea3629112)
---
 meta/classes/sstate.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/sstate.bbclass +1 -1
index 240ae111ee..1f37383598 100644
@@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d):
         components = spec.split(":")
         # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information
         # 7 is for the separators
-        avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) // 3
+        avail = (limit - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) // 3
         components[2] = components[2][:avail]
         components[3] = components[3][:avail]
         components[4] = components[4][:avail]
Signature · 1 line
2.31.1
#3 lore raw

PATCH 3/26 dpkg: Install dkpg-perl scripts to versioned perl directory

In reply to Anuj Mittal

From: Manuel Leonhardt <[email protected]>

Install dpkg-perl scripts to versioned perl directory, otherwise the following traceback happens when running, e.g. dpkg-architecture on the target:

Can't locate Dpkg.pm in @INC (you may need to install the Dpkg module)
(@INC contains: /usr/lib/perl5/site_perl/5.30.1/aarch64-linux /usr/lib/perl5/site_perl/5.30.1 /usr/lib/perl5/vendor_perl/5.30.1/aarch64-linux /usr/lib/perl5/vendor_perl/5.30.1 /usr/lib/perl5/5.30.1/aarch64-linux
/usr/lib/perl5/5.30.1 .) at /usr/bin/dpkg-architecture line 25.

Cc Richard Purdie <[email protected]>
(cherry picked from commit bdd4757ae057c7b3bfe27353fa25c4d7807a86ce)
---
 meta/recipes-devtools/dpkg/dpkg.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/dpkg/dpkg.inc +2 -2
index b6807b004f..74074cfdd7 100644
@@ -15,7 +15,7 @@ inherit autotools gettext perlnative pkgconfig perl-version update-alternatives
 
 PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl"
 
-export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}"
+export PERL_LIBDIR = "${libdir}/perl5/${@get_perl_version(d)}"
 PERL_LIBDIR:class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}"
 
 EXTRA_OECONF = "\
@@ -66,7 +66,7 @@ FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}
 RPROVIDES:update-alternatives-dpkg += "update-alternatives"
 
 PACKAGES += "${PN}-perl"
-FILES:${PN}-perl = "${libdir}/perl/${@get_perl_version(d)}"
+FILES:${PN}-perl = "${libdir}/perl5/${@get_perl_version(d)}"
 
 RDEPENDS:${PN}-perl += "perl-module-carp perl-module-constant \
                         perl-module-cwd perl-module-digest \
Signature · 1 line
2.31.1
#4 lore raw

PATCH 4/26 linux-firmware: upgrade 20210919 -> 20211027

In reply to Anuj Mittal

From: Alexander Kanavin <[email protected]>

License-Update: additional firmwares listed

(cherry picked from commit 1ca3fb1c7f11e04bf8d8bf59901ddd60178cb13c)
---
 ...{linux-firmware_20210919.bb => linux-firmware_20211027.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20210919.bb => linux-firmware_20211027.bb} (99%)
meta/recipes-kernel/linux-firmware/linux-firmware_20211027.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20210919.bb +2 -2
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20210919.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20211027.bb
index 48c01d99fe..97d42e98e2 100644
@@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \
                     file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
                     file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \
-                    file://WHENCE;md5=76f012f7e9b2260d34eccf5726374f08 \
+                    file://WHENCE;md5=d627873bd934d7c52b2c8191304a8eb7 \
                     "
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -205,7 +205,7 @@ PE = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "2fb22a5d7d23bf1f5800ab8152b39a00a445fbf4923de5a01b59d3f6253f0a9f"
+SRC_URI[sha256sum] = "bc2657dd8eb82386a9a7ec6df9ccf31c32c7e9073c05d37786c1edc273f9440a"
 
 inherit allarch
 
Signature · 1 line
2.31.1
#5 lore raw

PATCH 5/26 opkg: Fix poor operator combination choice

In reply to Anuj Mittal

From: Richard Purdie <[email protected]>

Combining :append with += rarely makes sense. Improve it to use the standard format (and tweak the implied spacing).

(cherry picked from commit 768766dc007ebe9b4bc38d425584be03fbdb98c1)
---
 meta/recipes-devtools/opkg/opkg_0.4.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/opkg/opkg_0.4.5.bb +1 -1
index ef18ccf63a..8152fa0658 100644
@@ -60,7 +60,7 @@ do_install_ptest () {
 	sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile
 }
 
-WARN_QA:append += "openssl-deprecation"
+WARN_QA:append = " openssl-deprecation"
 QAPKGTEST[openssl-deprecation] = "package_qa_check_openssl_deprecation"
 def package_qa_check_openssl_deprecation (package, d, messages):
     sane = True
Signature · 1 line
2.31.1
#6 lore raw

PATCH 6/26 linux-yocto/5.14: update to v5.14.15

In reply to Anuj Mittal

From: Bruce Ashfield <[email protected]>

Updating linux-yocto/5.14 to the latest korg -stable release that comprises the following commits:

b46092c7497e Linux 5.14.15
96e4ea34f6d7 pinctrl: stm32: use valid pin identifier in stm32_pinctrl_resume() 4850e9e3c6a3 ARM: 9122/1: select HAVE_FUTEX_CMPXCHG
80344938e468 e1000e: Separate TGP board type from SPT
0c4e87ba11eb net: mdiobus: Fix memory leak in __mdiobus_register
2f4356963624 bpf, test, cgroup: Use sk_{alloc,free} for test cases
4e5d794a2743 s390/pci: fix zpci_zdev_put() on reserve
e27170d5f2fc s390/pci: cleanup resources only if necessary
2be38f02ec89 scsi: core: Fix shost->cmd_per_lun calculation in scsi_add_host_with_dma() ff261f9aa654 autofs: fix wait name hash calculation in autofs_wait()
1009f098dfbe drm/kmb: Limit supported mode to 1080p
217d42e8b835 drm/kmb: Enable alpha blended second plane
c1ad040dbea8 net/mlx5: Lag, change multipath and bonding to be mutually exclusive d2ec7d208d8e net/mlx5: Lag, move lag destruction to a workqueue
42b6431f1c17 net: hns3: fix for miscalculation of rx unused desc
f1972f14f16e sched/scs: Reset the shadow stack when idle_task_exit
c4813d308517 mm/thp: decrease nr_thps in file's mapping on THP split
a7fbb56e6c94 scsi: qla2xxx: Fix a memory leak in an error path of qla2x00_process_els() c8c1b2183fb8 scsi: mpi3mr: Fix duplicate device entries when scanning through sysfs ce527668277c scsi: storvsc: Fix validation for unsolicited incoming packets 08d82a9b65e7 scsi: iscsi: Fix set_param() handling
6408a4c8da2f ASoC: codec: wcd938x: Add irq config support
9eb2aaede632 Input: snvs_pwrkey - add clk handling
9dd0389d77b9 perf/x86/msr: Add Sapphire Rapids CPU support
11d6811cbde0 libperf tests: Fix test_stat_cpu
65eec1fb58c1 libperf test evsel: Fix build error on !x86 architectures
b6062308c510 spi-mux: Fix false-positive lockdep splats
722ef19a161c spi: Fix deadlock when adding SPI controllers on SPI buses 785d69099ef4 ALSA: hda: avoid write to STATESTS if controller is in reset 3972b03ed085 platform/x86: intel_scu_ipc: Update timeout value in comment 6659008140b4 platform/x86: intel_scu_ipc: Increase virtual timeout to 10s f5966ba53013 isdn: mISDN: Fix sleeping function called from invalid context ef24577a52ba ARM: dts: spear3xx: Fix gmac node
834cc3fc2b99 net: stmmac: add support for dwmac 3.40a
0c878175dd2f btrfs: deal with errors when checking if a dir entry exists during log replay 051995bd0f42 ALSA: hda: intel: Allow repeatedly probing on codec configuration errors 9906da162dc8 objtool: Update section header before relocations
e73e72be194e objtool: Check for gelf_update_rel[a] failures
515e03331255 bitfield: build kunit tests without structleak plugin
3f66b6e01c82 thunderbolt: build kunit tests without structleak plugin
d9f94a8ec35a device property: build kunit tests without structleak plugin 2c793a67d71b iio/test-format: build kunit tests without structleak plugin 930f561aae28 gcc-plugins/structleak: add makefile var for disabling structleak 1d1af4da1c44 drm/msm/a6xx: Serialize GMU communication
bbdd158b40b6 kunit: fix reference count leak in kfree_at_end
dfcc47a1fe36 KVM: MMU: Reset mmu->pkru_mask to avoid stale data
e647d75565ab net: hns3: fix the max tx size according to user manual
b0e6db0656dd drm: mxsfb: Fix NULL pointer dereference crash on unload
56a3d9637b77 KVM: SEV-ES: Set guest_state_protected after VMSA update
d469678d6b50 net: bridge: mcast: use multicast_membership_interval for IGMPv3 8f20259f186e selftests: netfilter: remove stray bash debug line
057aef8df940 netfilter: Kconfig: use 'default y' instead of 'm' for bool config option cc20226e218a isdn: cpai: check ctr->cnr to avoid array index out of bound 6197eb050cfa nfc: nci: fix the UAF of rf_conn_info object
fb82d4dbee95 KVM: x86: remove unnecessary arguments from complete_emulator_pio_in 66e46fe3f276 KVM: x86: split the two parts of emulator_pio_in
9887c1668ada KVM: x86: check for interrupts before deciding whether to exit the fast path 169577c8840e KVM: x86: leave vcpu->arch.pio.count alone in emulator_pio_in_out 62a1a254ed83 KVM: SEV-ES: reduce ghcb_sa_len to 32 bits
3f54362dc7d7 KVM: SEV-ES: go over the sev_pio_data buffer in multiple passes if needed 4988e000b3a8 KVM: SEV-ES: fix length of string I/O
727286b23f93 KVM: SEV-ES: keep INS functions together
98c55c508df0 KVM: SEV-ES: clean up kvm_sev_es_ins/outs
abcae3cd6272 KVM: SEV-ES: rename guest_ins_data to sev_pio_data
6697ceb9f6cd KVM: SEV: Flush cache on non-coherent systems before RECEIVE_UPDATE_DATA 495bd03b6ba5 KVM: nVMX: promptly process interrupts delivered while in guest mode dc94b8b3f28a mm, slub: fix incorrect memcg slab count for bulk free
159d8cfbd042 mm, slub: fix potential use-after-free in slab_debugfs_fops 42b81946e3ac mm, slub: fix potential memoryleak in kmem_cache_open()
ec93d4a439c3 mm, slub: fix mismatch between reconstructed freelist depth and cnt 65ede7bd9713 powerpc/idle: Don't corrupt back chain when going idle
5a8c22e7fb66 KVM: PPC: Book3S HV: Make idle_kvm_start_guest() return 0 if it went to guest 6d077c37c464 KVM: PPC: Book3S HV: Fix stack handling in idle_kvm_start_guest() e8735e2e306f ucounts: Fix signal ucount refcounting
1eb825343d63 ucounts: Proper error handling in set_cred_ucounts
f7f7e4dbc41c ucounts: Pair inc_rlimit_ucounts with dec_rlimit_ucoutns in commit_creds 32880dcecb51 ucounts: Move get_ucounts from cred_alloc_blank to key_change_session_keyring 04b938ff2d2c net: dsa: mt7530: correct ds->num_ports
4e9e46a70020 audit: fix possible null-pointer dereference in audit_filter_rules b1a34f86b41f blk-cgroup: blk_cgroup_bio_start() should use irq-safe operations on blkg->iostat_cpu 152f35191d12 ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working a60ce083dcbf ASoC: DAPM: Fix missing kctl change notifications
9da68a107d07 ALSA: hda/realtek: Add quirk for Clevo PC50HS
896fc3ab9fc1 ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset b77ba1e02345 mm/secretmem: fix NULL page->mapping dereference in page_is_secretmem() abe046ddf311 vfs: check fd has read access in kernel_read_file_from_fd() 3681e4772c78 elfcore: correct reference to CONFIG_UML
9ee4e9ae98f1 mm/mempolicy: do not allow illegal MPOL_F_NUMA_BALANCING | MPOL_LOCAL in mbind() 149958ecd062 userfaultfd: fix a race between writeprotect and exit_mmap() 6de91691768c mm/userfaultfd: selftests: fix memory corruption with thp enabled 0e677ea5b739 ocfs2: mount fails with buffer overflow in strlen
fa9b6b6c953e ocfs2: fix data corruption after conversion from inline format 909c8482d8ac tracing: Have all levels of checks prevent recursion
54dc25f4e31e ceph: fix handling of "meta" errors
0ff7b35631ac ceph: skip existing superblocks that are blocklisted or shut down when mounting d832133cf228 can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes 03ec23e55e3e can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length 6e8811707e2d can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv fb545be86c53 can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer 013e7890663d can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg() a76abedd2be3 can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible() 1d12d110a820 can: isotp: isotp_sendmsg(): fix return error on FC timeout on TX path 0e5afdc2315b can: peak_pci: peak_pci_remove(): fix UAF
44c353a14375 can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification e18b9f4d62c1 can: rcar_can: fix suspend/resume
113f7a1f3421 net: enetc: make sure all traffic classes can send large frames 284c68cae7e0 net: enetc: fix ethtool counter name for PM0_TERR
eff55ddd240f drm/kmb: Enable ADV bridge after modeset
c0179dbae96d drm/kmb: Corrected typo in handle_lcd_irq
566ec004ed8b drm/kmb: Disable change of plane parameters
2317b45fb3d2 drm/kmb: Remove clearing DPHY regs
97cfc4b28c4d drm/kmb: Work around for higher system clock
4dbf3d658540 drm/panel: ilitek-ili9881c: Fix sync for Feixin K101-IM2BYL02 panel 3b194affe445 net/mlx5e: IPsec: Fix work queue entry ethernet segment checksum flags ea7a4d6132ce net/mlx5e: IPsec: Fix a misuse of the software parser's fields e867502bc4f6 ice: Add missing E810 device ids
9b76c3fedb24 igc: Update I226_K device ID
3300633367b6 e1000e: Fix packet loss on Tiger Lake and later
95c0a0c5ec88 ptp: Fix possible memory leak in ptp_clock_register()
d487413c020f net: stmmac: Fix E2E delay mechanism
9b5a29f0acef net: hns3: disable sriov before unload hclge layer
82a136c15a77 net: hns3: fix vf reset workqueue cannot exit
9ee9191d3384 net: hns3: schedule the polling again when allocation fails 6446be7c9090 net: hns3: add limit ets dwrr bandwidth cannot be 0
dddafeda454a net: hns3: reset DWRR of unused tc to zero
93fa0277ea4e net: hns3: Add configuration of TM QCN error event
3ea0b497a7a2 powerpc/smp: do not decrement idle task preempt count in CPU offline 0666c4cd67b1 net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()' 9ef9a287aab5 NIOS2: irqflags: rename a redefined register name
8b523da74a22 net/sched: act_ct: Fix byte count on fragmented packets
872b836a183d net: dsa: lantiq_gswip: fix register definition
57deb5ffd8f6 hamradio: baycom_epp: fix build for UML
c74f3c127e6c ipv6: When forwarding count rx stats on the orig netdev
1dda424ef5c4 tcp: md5: Fix overlap between vrf and non-vrf keys
9c281a1006f4 lan78xx: select CRC32
5220cad0e69e sctp: fix transport encap_port update in sctp_vtag_verify
ddffcd23d325 netfilter: ipvs: make global sysctl readonly in non-init netns cd3d0282dd3d netfilter: ip6t_rt: fix rt0_hdr parsing in rt_mt6
aabf95dddb45 ice: Print the api_patch as part of the fw.mgmt.api
75ebc3b08bbd ice: fix getting UDP tunnel entry
777682e59840 ice: Avoid crash from unnecessary IDA free
31b4517293bf ice: Fix failure to re-add LAN/RDMA Tx queues
18b4fcfeab6d ASoC: wm8960: Fix clock configuration on slave mode
2b7d598b9651 dma-debug: fix sg checks in debug_dma_map_sg()
90c7c58aa2bd netfilter: nf_tables: skip netdev events generated on netns removal cae7cab804c9 netfilter: xt_IDLETIMER: fix panic that occurs when timer_type has garbage value 78325fcb17f3 KVM: arm64: Release mmap_lock when using VM_SHARED with MTE b372264c66ef KVM: arm64: Fix host stage-2 PGD refcount
649c2e76632d ASoC: cs4341: Add SPI device ID table
efdcc26785de ASoC: pcm179x: Add missing entries SPI to device ID table
242ce1c51b69 ASoC: fsl_xcvr: Fix channel swap issue with ARC
41551810285e ASoC: pcm512x: Mend accesses to the I2S_1 and I2S_2 registers c8ecd221db9a powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC 663e89b7f4cc powerpc/security: Add a helper to query stf_barrier type
23d127cf5e66 powerpc/bpf: Validate branch ranges
e680ab91a034 powerpc/lib: Add helper to check if offset is within conditional branch range 6fe5d304ca49 NFSD: Keep existing listeners on portlist error
9ad89fcde18c xtensa: xtfpga: Try software restart before simulating CPU reset 8287678c20b2 xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF
2602e9cc283a drm/amdgpu: init iommu after amdkfd device init
68771262aab3 drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI
537a7189df57 r8152: avoid to resubmit rx immediately
7d8cdaffc518 xen/x86: prevent PVH type from getting clobbered
28d084adc22d block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output
96a37f6acb6a ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default 470585caf603 arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address
79e3dc32f14f sh: pgtable-3level: fix cast to pointer from integer of different size d3f4c51c2a7f parisc: math-emu: Fix fall-through warnings
4248f37f6cfc block/mq-deadline: Move dd_queued() to fix defined but not used warning

(cherry picked from commit 5c2c7e54bf17d28fe8b918ee8f053748b2b13e01)
---
 .../linux/linux-yocto-rt_5.14.bb              |  6 ++---
 .../linux/linux-yocto-tiny_5.14.bb            |  8 +++---
 meta/recipes-kernel/linux/linux-yocto_5.14.bb | 26 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb +3 -3
index e5dc3c30c4..05f5df71b9 100644
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "725e45fd0b3b344905a44398b1d7ba64b76c6af2"
-SRCREV_meta ?= "11430e73de6cbc577b69ab4844250346146eb3cf"
+SRCREV_machine ?= "dcf40cf2b562e9b6ec814a9ca1912aab881de0e0"
+SRCREV_meta ?= "edb4dc09c55f317085688e3a5f6438ced46bc77d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.14.14"
+LINUX_VERSION ?= "5.14.15"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb +4 -4
index 0da8ae5e69..f752b61d2b 100644
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.14.14"
+LINUX_VERSION ?= "5.14.15"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine:qemuarm ?= "bdbb56b345a04855091cbf667c70d761f417ddff"
-SRCREV_machine ?= "28c011f5b095822798d2a8320f104abc0fc216cd"
-SRCREV_meta ?= "11430e73de6cbc577b69ab4844250346146eb3cf"
+SRCREV_machine:qemuarm ?= "70f10165ff7c856cbf0512231ef9b6533efe1d1d"
+SRCREV_machine ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
+SRCREV_meta ?= "edb4dc09c55f317085688e3a5f6438ced46bc77d"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.14.bb +13 -13
index ed20557183..f719966a7b 100644
@@ -13,17 +13,17 @@ KBRANCH:qemux86  ?= "v5.14/standard/base"
 KBRANCH:qemux86-64 ?= "v5.14/standard/base"
 KBRANCH:qemumips64 ?= "v5.14/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "3e04a89e8e89fe2f799cd201f6994ff515ca95c1"
-SRCREV_machine:qemuarm64 ?= "28c011f5b095822798d2a8320f104abc0fc216cd"
-SRCREV_machine:qemumips ?= "566b7915f715e00e4ebb2a4121239de4cb1f33b5"
-SRCREV_machine:qemuppc ?= "28c011f5b095822798d2a8320f104abc0fc216cd"
-SRCREV_machine:qemuriscv64 ?= "28c011f5b095822798d2a8320f104abc0fc216cd"
-SRCREV_machine:qemuriscv32 ?= "28c011f5b095822798d2a8320f104abc0fc216cd"
-SRCREV_machine:qemux86 ?= "28c011f5b095822798d2a8320f104abc0fc216cd"
-SRCREV_machine:qemux86-64 ?= "28c011f5b095822798d2a8320f104abc0fc216cd"
-SRCREV_machine:qemumips64 ?= "13d9e1b6481efec1e72733134e83b981e0adf6bb"
-SRCREV_machine ?= "28c011f5b095822798d2a8320f104abc0fc216cd"
-SRCREV_meta ?= "11430e73de6cbc577b69ab4844250346146eb3cf"
+SRCREV_machine:qemuarm ?= "8b3f9104862f9486f4a6fb526e4d9cc9dc2217cb"
+SRCREV_machine:qemuarm64 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
+SRCREV_machine:qemumips ?= "fab0cfca42f3509a5570b437f2a2df216927c055"
+SRCREV_machine:qemuppc ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
+SRCREV_machine:qemuriscv64 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
+SRCREV_machine:qemuriscv32 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
+SRCREV_machine:qemux86 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
+SRCREV_machine:qemux86-64 ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
+SRCREV_machine:qemumips64 ?= "baf66f78949c175483eea2a5d0e7221a997d8e44"
+SRCREV_machine ?= "f04b30fc1551e290fc169b2e2f2c799a0569aec5"
+SRCREV_meta ?= "edb4dc09c55f317085688e3a5f6438ced46bc77d"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same
@@ -31,7 +31,7 @@ SRCREV_meta ?= "11430e73de6cbc577b69ab4844250346146eb3cf"
 # normal PREFERRED_VERSION settings.
 BBCLASSEXTEND = "devupstream:target"
 DEFAULT_PREFERENCE:class-devupstream = "-1"
-SRCREV_machine:class-devupstream ?= "fe024e004fa31dc64d18440c006b02cd8d722a03"
+SRCREV_machine:class-devupstream ?= "b46092c7497e5aaede15b10f162e32d6473f1862"
 PN:class-devupstream = "linux-yocto-upstream"
 KBRANCH:class-devupstream = "v5.14/base"
 
@@ -42,7 +42,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.14.14"
+LINUX_VERSION ?= "5.14.15"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.31.1
#7 lore raw

PATCH 7/26 linux-yocto/5.10: update to v5.10.76

In reply to Anuj Mittal

From: Bruce Ashfield <[email protected]>

Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits:

378e85d1aeb5 Linux 5.10.76
cfa79faf7e1f pinctrl: stm32: use valid pin identifier in stm32_pinctrl_resume() c56c801391c3 ARM: 9122/1: select HAVE_FUTEX_CMPXCHG
d088db8637bb selftests: bpf: fix backported ASSERT_FALSE
3a845fa00fd7 e1000e: Separate TGP board type from SPT
021b6d11e590 tracing: Have all levels of checks prevent recursion
3a0dc2e35a5d net: mdiobus: Fix memory leak in __mdiobus_register
cfe9266213c4 bpf, test, cgroup: Use sk_{alloc,free} for test cases
188907c25218 s390/pci: fix zpci_zdev_put() on reserve
f18b90e9366f can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg() 2304dfb548a4 scsi: core: Fix shost->cmd_per_lun calculation in scsi_add_host_with_dma() c58654f344dd net: hns3: fix for miscalculation of rx unused desc
96fe5061291d sched/scs: Reset the shadow stack when idle_task_exit
96f0aebf29be scsi: qla2xxx: Fix a memory leak in an error path of qla2x00_process_els() 90c8e8c0829b scsi: iscsi: Fix set_param() handling
0eb254479685 Input: snvs_pwrkey - add clk handling
ea9c1f5d8a3a perf/x86/msr: Add Sapphire Rapids CPU support
7a5a1f09c8b4 libperf tests: Fix test_stat_cpu
e56a3e7ae353 ALSA: hda: avoid write to STATESTS if controller is in reset 85c8d8c1609d platform/x86: intel_scu_ipc: Update timeout value in comment 9f591cbdbed3 isdn: mISDN: Fix sleeping function called from invalid context ab4f542b515b ARM: dts: spear3xx: Fix gmac node
15d3ad79885b net: stmmac: add support for dwmac 3.40a
f9d16a428489 btrfs: deal with errors when checking if a dir entry exists during log replay 369db2a91d5c ALSA: hda: intel: Allow repeatedly probing on codec configuration errors 81d8e70cdce4 gcc-plugins/structleak: add makefile var for disabling structleak 69078a94365a net: hns3: fix the max tx size according to user manual
f40c2281d2c0 drm: mxsfb: Fix NULL pointer dereference crash on unload
96835b68d7b3 net: bridge: mcast: use multicast_membership_interval for IGMPv3 0e033cb40761 selftests: netfilter: remove stray bash debug line
f8a6541345c2 netfilter: Kconfig: use 'default y' instead of 'm' for bool config option 7f221ccbee4e isdn: cpai: check ctr->cnr to avoid array index out of bound 77c0ef979e32 nfc: nci: fix the UAF of rf_conn_info object
8f042315fcc4 KVM: nVMX: promptly process interrupts delivered while in guest mode b41fd8f5d2ad mm, slub: fix incorrect memcg slab count for bulk free
568f906340b4 mm, slub: fix potential memoryleak in kmem_cache_open()
48843dd23c7b mm, slub: fix mismatch between reconstructed freelist depth and cnt c5c2a80368e9 powerpc/idle: Don't corrupt back chain when going idle
197ec50b2df1 KVM: PPC: Book3S HV: Make idle_kvm_start_guest() return 0 if it went to guest fbd724c49bea KVM: PPC: Book3S HV: Fix stack handling in idle_kvm_start_guest() 9258f58432c5 powerpc64/idle: Fix SP offsets when saving GPRs
3e16d9d525a7 net: dsa: mt7530: correct ds->num_ports
16802fa4c33e audit: fix possible null-pointer dereference in audit_filter_rules 0d867a359979 ASoC: DAPM: Fix missing kctl change notifications
a2606acf418e ALSA: hda/realtek: Add quirk for Clevo PC50HS
6411397b6d7a ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset b721500c979b vfs: check fd has read access in kernel_read_file_from_fd() 895ceeff31b1 elfcore: correct reference to CONFIG_UML
3cda4bfffd4f userfaultfd: fix a race between writeprotect and exit_mmap() 93be0eeea14c ocfs2: mount fails with buffer overflow in strlen
f1b98569e81c ocfs2: fix data corruption after conversion from inline format 1727e8688d2e ceph: fix handling of "meta" errors
603d4bcc0fcd ceph: skip existing superblocks that are blocklisted or shut down when mounting d48db508f911 can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes 5abc9b9d3ca5 can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length 864e77771a24 can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv ecfccb1c58c9 can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer 053bc12df0d6 can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible() 0917fb04069a can: isotp: isotp_sendmsg(): fix return error on FC timeout on TX path 28f28e4bc3a5 can: peak_pci: peak_pci_remove(): fix UAF
9697ad6395f9 can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification 4758e92e75ca can: rcar_can: fix suspend/resume
4a0928c3ebca net: enetc: fix ethtool counter name for PM0_TERR
00ad7a015409 drm/panel: ilitek-ili9881c: Fix sync for Feixin K101-IM2BYL02 panel eccd00728b1a ice: Add missing E810 device ids
6418508a3ac2 e1000e: Fix packet loss on Tiger Lake and later
29f1bdcaa3dd net: stmmac: Fix E2E delay mechanism
d36b15e3e7b5 net: hns3: disable sriov before unload hclge layer
6a72e1d78a2f net: hns3: fix vf reset workqueue cannot exit
32b860d364d2 net: hns3: schedule the polling again when allocation fails 96c013f40c9b net: hns3: add limit ets dwrr bandwidth cannot be 0
21f61d10435c net: hns3: reset DWRR of unused tc to zero
53770a411559 powerpc/smp: do not decrement idle task preempt count in CPU offline 81dbd898fb7b NIOS2: irqflags: rename a redefined register name
6edf99b000d6 net: dsa: lantiq_gswip: fix register definition
ef97219d5fec ipv6: When forwarding count rx stats on the orig netdev
38d984e5e845 tcp: md5: Fix overlap between vrf and non-vrf keys
c28bea6b876f lan78xx: select CRC32
9c8943812dac netfilter: ipvs: make global sysctl readonly in non-init netns 911e01990c70 netfilter: ip6t_rt: fix rt0_hdr parsing in rt_mt6
69ea08c1b539 ice: fix getting UDP tunnel entry
842fce43190c ASoC: wm8960: Fix clock configuration on slave mode
39afed394cc6 dma-debug: fix sg checks in debug_dma_map_sg()
2a670c323055 netfilter: xt_IDLETIMER: fix panic that occurs when timer_type has garbage value 0f4308a164a9 NFSD: Keep existing listeners on portlist error
546c04c85791 xtensa: xtfpga: Try software restart before simulating CPU reset bfef5d826276 xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF
d8284c981c1c drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI
101e1bcb1147 xen/x86: prevent PVH type from getting clobbered
a6285b1b2212 block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output
85c1827eeee7 ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default 5489c1bed5b8 arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address
f59da9f7efa7 io_uring: fix splice_fd_in checks backport typo
b6f32897af19 xhci: add quirk for host controllers that don't update endpoint DCS b3b7f831a49b parisc: math-emu: Fix fall-through warnings

(cherry picked from commit 61f8f7d18417334e3b13e4447f318107372dcfe0)
---
 .../linux/linux-yocto-rt_5.10.bb              |  6 ++---
 .../linux/linux-yocto-tiny_5.10.bb            |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +3 -3
index 2795887b92..34bb95e4fc 100644
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "1d0eb980c3f825c193b07e925090a1a3dd752dbc"
-SRCREV_meta ?= "9ff1e75562075e35b5c8649b0a1aece50d8531b7"
+SRCREV_machine ?= "f7d2419be110c618b74cbaddaafbabf4a886b91b"
+SRCREV_meta ?= "e1979ceb171bc91ef2cb71cfcde548a101dab687"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.10.75"
+LINUX_VERSION ?= "5.10.76"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +4 -4
index 94d0473098..e898bc1325 100644
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.10.75"
+LINUX_VERSION ?= "5.10.76"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine:qemuarm ?= "773ad5db722c1cbac17a944ab2fd4f1d9d72c55d"
-SRCREV_machine ?= "b1ee56b4baf8a85fa02965b76dbc4ba7de898540"
-SRCREV_meta ?= "9ff1e75562075e35b5c8649b0a1aece50d8531b7"
+SRCREV_machine:qemuarm ?= "4575e0b8282d99c79dac96a77c03685d66fb0a08"
+SRCREV_machine ?= "da50565d028a2d87eabc7a53ee73a53f82f10f39"
+SRCREV_meta ?= "e1979ceb171bc91ef2cb71cfcde548a101dab687"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.10.bb +12 -12
index e7f8cc188f..b4f9faf0f3 100644
@@ -13,17 +13,17 @@ KBRANCH:qemux86  ?= "v5.10/standard/base"
 KBRANCH:qemux86-64 ?= "v5.10/standard/base"
 KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "eaf94169288a0cdaa7f919e81b9cde11637328a0"
-SRCREV_machine:qemuarm64 ?= "0a2409ae4ca5c3efc6633891d807c189f8c2e6ec"
-SRCREV_machine:qemumips ?= "73ca3b526488435d4f2a404642078b3b111879af"
-SRCREV_machine:qemuppc ?= "14edaae440f2835071ffacced9f240cdd8cf7094"
-SRCREV_machine:qemuriscv64 ?= "97699547a2625645320510db2237e8619a7954ef"
-SRCREV_machine:qemuriscv32 ?= "97699547a2625645320510db2237e8619a7954ef"
-SRCREV_machine:qemux86 ?= "97699547a2625645320510db2237e8619a7954ef"
-SRCREV_machine:qemux86-64 ?= "97699547a2625645320510db2237e8619a7954ef"
-SRCREV_machine:qemumips64 ?= "9e86c3417c2c6a61a52664ebcfdd541f6af7e099"
-SRCREV_machine ?= "97699547a2625645320510db2237e8619a7954ef"
-SRCREV_meta ?= "9ff1e75562075e35b5c8649b0a1aece50d8531b7"
+SRCREV_machine:qemuarm ?= "da5f8508e569eb5d64a2efe5a5c4aa138c8f2738"
+SRCREV_machine:qemuarm64 ?= "a473fe3ad480df6565134d42a95826e71ae77a1a"
+SRCREV_machine:qemumips ?= "317762b8a9da49cd12eb51e879b6eba2b7c3a4a4"
+SRCREV_machine:qemuppc ?= "8a3eb888460464e612b79ab983c99cf868f82780"
+SRCREV_machine:qemuriscv64 ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
+SRCREV_machine:qemuriscv32 ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
+SRCREV_machine:qemux86 ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
+SRCREV_machine:qemux86-64 ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
+SRCREV_machine:qemumips64 ?= "efe59773d3289e7b34d99684547968849a2e6aa9"
+SRCREV_machine ?= "be6faea8fdece878f8cebfda0969df78df07fbf8"
+SRCREV_meta ?= "e1979ceb171bc91ef2cb71cfcde548a101dab687"
 
 # remap qemuarm to qemuarma15 for the 5.8 kernel
 # KMACHINE:qemuarm ?= "qemuarma15"
@@ -32,7 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.75"
+LINUX_VERSION ?= "5.10.76"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.31.1
#8 lore raw

PATCH 8/26 linux-yocto-rt/5.10: update to -rt54

In reply to Anuj Mittal

From: Bruce Ashfield <[email protected]>

Integrating the following commit(s) to linux-yocto-rt/5.10:

    f01089784fd6 Linux 5.10.73-rt54
    f34df8f3c666 Linux 5.10.65-rt53
    271c5e6e4064 Linux 5.10.59-rt52
    1a4bba4bc32c locking/rwsem-rt: Remove might_sleep() in __up_read()
    ff591a2bdcfb Linux 5.10.59-rt51
    8d185ac23c11 Linux 5.10.58-rt50
    2c0fd44153f5 Linux 5.10.56-rt49
    8b083d3c993c printk: Enhance the condition check of msleep in pr_flush()
    448cd29e3bc9 Linux 5.10.56-rt48
(cherry picked from commit 7c7dc8f38cf1e874a7722389c95d895e10855d9a)
---
 meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +1 -1
index 34bb95e4fc..c210667350 100644
@@ -11,7 +11,7 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "f7d2419be110c618b74cbaddaafbabf4a886b91b"
+SRCREV_machine ?= "f01089784fd6234111851aad756297e0f258276c"
 SRCREV_meta ?= "e1979ceb171bc91ef2cb71cfcde548a101dab687"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
Signature · 1 line
2.31.1
#9 lore raw

PATCH 9/26 strace: fix build against 5.15 kernel/kernel-headers

In reply to Anuj Mittal

From: Bruce Ashfield <[email protected]>

kernel 5.15 removed ipx.h from the uapi, but strace hasn't adjusted its tests to the removal.

There is a WIP patch on the esyr/5.15 branch that solves the problem, so we grab it here, adjust for context and fix our build problem.

When strace updates to 5.15, and we can bump our version and drop this patch.

Upstream-Status: Backport [commit cca828197c0e16c2599129114]

(cherry picked from commit a8c4ba727251e53494a4aec483fcc51982e6fb75)
---
 ...1-Avoid-relying-on-presence-of-ipx.h.patch | 151 ++++++++++++++++++
 meta/recipes-devtools/strace/strace_5.14.bb   |   1 +
 2 files changed, 152 insertions(+)
 create mode 100644 meta/recipes-devtools/strace/strace/0001-Avoid-relying-on-presence-of-ipx.h.patch
meta/recipes-devtools/strace/strace/0001-Avoid-relying-on-presence-of-ipx.h.patch new file +151 -0
new file mode 100644
index 0000000000..6df673fa95
@@ -0,0 +1,151 @@
+From 197f712ea96c12dcabc9fe98889a425d61ad6a60 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <[email protected]>
+Date: Wed, 3 Nov 2021 00:48:59 +0100
+Subject: [PATCH] Avoid relying on presence of ipx.h
+
+After Linux has broken UAPI in commit v5.15-rc1~157^2~207, it is well
+possible that neither kernel nor libc (such as musl, for example)
+provide IPX-related header.  Avoid relying on its presence
+in the strace's code and conditionalise the relevant checks in the tests.
+
+* configure.ac (AC_CHECK_HEADERS): Add linux/ipx.h.
+* src/net.c: Remove <netipx/ipx.h>/<linux/ipx.h> includes.
+* src/sockaddr.c: Likewise.
+(IPX_NODE_LEN): New macro constant.
+(struct sockaddr_ipx): New type definition.
+* src/xlat/sock_ipx_options.in (IPX_TYPE): Provide a fallback value.
+* tests/net-sockaddr.c [!HAVE_LINUX_IPX_H]: Do not include
+<linux/ipx.h>.
+[!HAVE_LINUX_IPX_H && HAVE_NETIPX_IPX_H]: Include <netipx/ipx.h>.
+[!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)]: Do not define
+check_ipx.
+[!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)] (main): Do not call
+check_ipx.
+
+Closes: https://github.com/strace/strace/issues/201
+
+Upstream-Status: backport [commit cca828197c0e1 branch esyr/5.15]
+
+[bva: changed context to apply to a released strace 5.14 tarball]
+Signed-off-by: Bruce Ashfield <[email protected]>
+
+---
+ configure.ac                 |  1 +
+ src/net.c                    |  5 -----
+ src/sockaddr.c               | 16 ++++++++++------
+ src/xlat/sock_ipx_options.in |  2 +-
+ tests/net-sockaddr.c         | 10 +++++++++-
+ 5 files changed, 21 insertions(+), 13 deletions(-)
+
+Index: strace-5.14/configure.ac
+===================================================================
+--- strace-5.14.orig/configure.ac
++++ strace-5.14/configure.ac
+@@ -423,6 +423,7 @@
+ 	elf.h
+ 	gcov.h
+ 	iconv.h
++	linux/ipx.h
+ 	mqueue.h
+ 	netinet/sctp.h
+ 	netipx/ipx.h
+Index: strace-5.14/src/net.c
+===================================================================
+--- strace-5.14.orig/src/net.c
++++ strace-5.14/src/net.c
+@@ -28,11 +28,6 @@
+ #include <arpa/inet.h>
+ #include <net/if.h>
+ #include <asm/types.h>
+-#ifdef HAVE_NETIPX_IPX_H
+-# include <netipx/ipx.h>
+-#else
+-# include <linux/ipx.h>
+-#endif
+ 
+ #include <linux/ip_vs.h>
+ #include "netlink.h"
+Index: strace-5.14/src/sockaddr.c
+===================================================================
+--- strace-5.14.orig/src/sockaddr.c
++++ strace-5.14/src/sockaddr.c
+@@ -24,12 +24,6 @@
+ #include <linux/if_ether.h>
+ #include <linux/x25.h>
+ 
+-#ifdef HAVE_NETIPX_IPX_H
+-# include <netipx/ipx.h>
+-#else
+-# include <linux/ipx.h>
+-#endif
+-
+ #include "xlat/addrfams.h"
+ #include "xlat/arp_hardware_types.h"
+ #include "xlat/ethernet_protocols.h"
+@@ -45,6 +39,16 @@
+ const size_t arp_hardware_types_size = ARRAY_SIZE(arp_hardware_types) - 1;
+ const size_t ethernet_protocols_size = ARRAY_SIZE(ethernet_protocols) - 1;
+ 
++#define IPX_NODE_LEN	6
++struct sockaddr_ipx {
++	uint16_t sipx_family;
++	uint16_t sipx_port;
++	uint32_t sipx_network;
++	unsigned char sipx_node[IPX_NODE_LEN];
++	uint8_t sipx_type;
++	unsigned char sipx_zero;
++};
++
+ static void
+ print_sockaddr_data_un(struct tcb *tcp, const void *const buf, const int addrlen)
+ {
+Index: strace-5.14/src/xlat/sock_ipx_options.in
+===================================================================
+--- strace-5.14.orig/src/xlat/sock_ipx_options.in
++++ strace-5.14/src/xlat/sock_ipx_options.in
+@@ -1 +1 @@
+-IPX_TYPE
++IPX_TYPE	1
+Index: strace-5.14/tests/net-sockaddr.c
+===================================================================
+--- strace-5.14.orig/tests/net-sockaddr.c
++++ strace-5.14/tests/net-sockaddr.c
+@@ -24,7 +24,11 @@
+ #include <linux/if_ether.h>
+ #include <linux/if_packet.h>
+ #include <linux/x25.h>
+-#include <linux/ipx.h>
++#if defined HAVE_LINUX_IPX_H
++# include <linux/ipx.h>
++#elif defined HAVE_NETIPX_IPX_H
++# include <netipx/ipx.h>
++#endif
+ #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+ # include <bluetooth/bluetooth.h>
+ # include <bluetooth/hci.h>
+@@ -269,6 +273,7 @@
+ 	printf("connect(-1, %p, %u) = %d EBADF (%m)\n", in6, len, ret);
+ }
+ 
++#if defined HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H
+ static void
+ check_ipx(void)
+ {
+@@ -295,6 +300,7 @@
+ 	       c_ipx.sipx_node[4], c_ipx.sipx_node[5],
+ 	       c_ipx.sipx_type, len, ret);
+ }
++#endif /* HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H */
+ 
+ /* for a bit more compact AX.25 address definitions */
+ #define AX25_ADDR(c_, s_) \
+@@ -773,7 +779,9 @@
+ 	check_un();
+ 	check_in();
+ 	check_in6();
++#if defined HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H
+ 	check_ipx();
++#endif
+ 	check_ax25();
+ 	check_x25();
+ 	check_nl();
meta/recipes-devtools/strace/strace_5.14.bb +1 -0
index 02a4843edf..3229954b3f 100644
@@ -14,6 +14,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://ptest-spacesave.patch \
            file://uintptr_t.patch \
            file://0001-strace-fix-reproducibilty-issues.patch \
+           file://0001-Avoid-relying-on-presence-of-ipx.h.patch \
            "
 SRC_URI[sha256sum] = "901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73"
 
Signature · 1 line
2.31.1
#10 lore raw

PATCH 10/26 sstate: another fix for touching files inside pseudo

In reply to Anuj Mittal

From: Jose Quaresma <[email protected]>

This patch is a fixup for 676757f "sstate: fix touching files inside pseudo"

running the 'id' command inside the sstate_unpack_package function shows that this funcion run inside the pseudo:

uid=0(root) gid=0(root) groups=0(root)

The check for [ -w ${SSTATE_PKG} ] and [ -O ${SSTATE_PKG}.siginfo ] will always return true and the touch can fail when the real user don't have permission or in readonly filesystem.

As the documentation refers:
- the file test operator "-w" check if the file has write permission (for the user running the test).
- the file test operator "-O" check if you are owner of file

We can avoid this test running the touch and mask any return errors that we have.

(From OE-Core rev: 29fc85997ade490ae46ffca37ef8e1a56957c876)

(cherry picked from commit 5b9210d66c78bb3f79056e5586cea7b0edd714a9)
---
 meta/classes/sstate.bbclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta/classes/sstate.bbclass +6 -6
index 1f37383598..ba2c9fee35 100644
@@ -888,12 +888,12 @@ python sstate_report_unihash() {
 #
 sstate_unpack_package () {
 	tar -xvzf ${SSTATE_PKG}
-	# update .siginfo atime on local/NFS mirror
-	[ -O ${SSTATE_PKG}.siginfo ] && [ -w ${SSTATE_PKG}.siginfo ] && [ -h ${SSTATE_PKG}.siginfo ] && touch -a ${SSTATE_PKG}.siginfo
-	# Use "! -w ||" to return true for read only files
-	[ ! -w ${SSTATE_PKG} ] || touch --no-dereference ${SSTATE_PKG}
-	[ ! -w ${SSTATE_PKG}.sig ] || [ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig
-	[ ! -w ${SSTATE_PKG}.siginfo ] || [ ! -e ${SSTATE_PKG}.siginfo ] || touch --no-dereference ${SSTATE_PKG}.siginfo
+	# update .siginfo atime on local/NFS mirror if it is a symbolic link
+	[ ! -h ${SSTATE_PKG}.siginfo ] || touch -a ${SSTATE_PKG}.siginfo 2>/dev/null || true
+	# update each symbolic link instead of any referenced file
+	touch --no-dereference ${SSTATE_PKG} 2>/dev/null || true
+	[ ! -e ${SSTATE_PKG}.sig ] || touch --no-dereference ${SSTATE_PKG}.sig 2>/dev/null || true
+	[ ! -e ${SSTATE_PKG}.siginfo ] || touch --no-dereference ${SSTATE_PKG}.siginfo 2>/dev/null || true
 }
 
 BB_HASHCHECK_FUNCTION = "sstate_checkhashes"
Signature · 1 line
2.31.1
#11 lore raw

PATCH 11/26 create-spdx: Set the Organization field via a variable

In reply to Anuj Mittal

From: Andres Beltran <[email protected]>

Currently, the "Organization" field for SBOMs is hard-coded in create-spdx. Create a new variable SPDX_ORG to make this field more generic.

(cherry picked from commit f239814f3f5d9bd54de54b0f2a5081067336e32b)
---
 meta/classes/create-spdx.bbclass | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta/classes/create-spdx.bbclass +6 -4
index c35dbe1184..eb1d446f3f 100644
@@ -28,6 +28,8 @@ SPDX_NAMESPACE_PREFIX ??= "http://spdx.org/spdxdoc"
 
 SPDX_LICENSES ??= "${COREBASE}/meta/files/spdx-licenses.json"
 
+SPDX_ORG ??= "OpenEmbedded ()"
+
 do_image_complete[depends] = "virtual/kernel:do_create_spdx"
 
 def get_doc_namespace(d, doc):
@@ -415,7 +417,7 @@ python do_create_spdx() {
     doc.creationInfo.comment = "This document was created by analyzing recipe files during the build."
     doc.creationInfo.licenseListVersion = d.getVar("SPDX_LICENSE_DATA")["licenseListVersion"]
     doc.creationInfo.creators.append("Tool: OpenEmbedded Core create-spdx.bbclass")
-    doc.creationInfo.creators.append("Organization: OpenEmbedded ()")
+    doc.creationInfo.creators.append("Organization: %s" % d.getVar("SPDX_ORG"))
     doc.creationInfo.creators.append("Person: N/A ()")
 
     recipe = oe.spdx.SPDXPackage()
@@ -519,7 +521,7 @@ python do_create_spdx() {
             package_doc.creationInfo.comment = "This document was created by analyzing packages created during the build."
             package_doc.creationInfo.licenseListVersion = d.getVar("SPDX_LICENSE_DATA")["licenseListVersion"]
             package_doc.creationInfo.creators.append("Tool: OpenEmbedded Core create-spdx.bbclass")
-            package_doc.creationInfo.creators.append("Organization: OpenEmbedded ()")
+            package_doc.creationInfo.creators.append("Organization: %s" % d.getVar("SPDX_ORG"))
             package_doc.creationInfo.creators.append("Person: N/A ()")
             package_doc.externalDocumentRefs.append(recipe_ref)
 
@@ -653,7 +655,7 @@ python do_create_runtime_spdx() {
             runtime_doc.creationInfo.comment = "This document was created by analyzing package runtime dependencies."
             runtime_doc.creationInfo.licenseListVersion = d.getVar("SPDX_LICENSE_DATA")["licenseListVersion"]
             runtime_doc.creationInfo.creators.append("Tool: OpenEmbedded Core create-spdx.bbclass")
-            runtime_doc.creationInfo.creators.append("Organization: OpenEmbedded ()")
+            runtime_doc.creationInfo.creators.append("Organization: %s" % d.getVar("SPDX_ORG"))
             runtime_doc.creationInfo.creators.append("Person: N/A ()")
 
             package_ref = oe.spdx.SPDXExternalDocumentRef()
@@ -813,7 +815,7 @@ python image_combine_spdx() {
     doc.creationInfo.comment = "This document was created by analyzing the source of the Yocto recipe during the build."
     doc.creationInfo.licenseListVersion = d.getVar("SPDX_LICENSE_DATA")["licenseListVersion"]
     doc.creationInfo.creators.append("Tool: OpenEmbedded Core create-spdx.bbclass")
-    doc.creationInfo.creators.append("Organization: OpenEmbedded ()")
+    doc.creationInfo.creators.append("Organization: %s" % d.getVar("SPDX_ORG"))
     doc.creationInfo.creators.append("Person: N/A ()")
 
     image = oe.spdx.SPDXPackage()
Signature · 1 line
2.31.1
#12 lore raw

PATCH 12/26 meson: set objcopy in the cross and native toolchain files

In reply to Anuj Mittal

From: Ross Burton <[email protected]>

(cherry picked from commit 0a589998e717ae3865f0db5abe6005ab4eee86d9)
---
 meta/classes/meson.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/meson.bbclass +2 -0
index da58cb4bec..4ba70de3dc 100644
@@ -48,6 +48,7 @@ ar = ${@meson_array('AR', d)}
 nm = ${@meson_array('NM', d)}
 strip = ${@meson_array('STRIP', d)}
 readelf = ${@meson_array('READELF', d)}
+objcopy = ${@meson_array('OBJCOPY', d)}
 pkgconfig = 'pkg-config'
 llvm-config = 'llvm-config${LLVMVERSION}'
 cups-config = 'cups-config'
@@ -85,6 +86,7 @@ ar = ${@meson_array('BUILD_AR', d)}
 nm = ${@meson_array('BUILD_NM', d)}
 strip = ${@meson_array('BUILD_STRIP', d)}
 readelf = ${@meson_array('BUILD_READELF', d)}
+objcopy = ${@meson_array('BUILD_OBJCOPY', d)}
 pkgconfig = 'pkg-config-native'
 
 [built-in options]
Signature · 1 line
2.31.1
#13 lore raw

PATCH 13/26 kernel-devsrc: Add vdso.lds and other build files for riscv64 as well

In reply to Anuj Mittal

From: Khem Raj <[email protected]>

These additional bits are needed on riscv64 as well
Fixes
make[1]: *** No rule to make target 'arch/riscv/kernel/vdso/vdso.lds', needed by 'arch/riscv/kernel/vdso/vdso.so.dbg'. Stop.
make: *** [arch/riscv/Makefile:114: vdso_prepare] Error 2

Cc Bruce Ashfield <[email protected]>
(cherry picked from commit 446972600ed51ca75a2a4e579cdc3e6dd2e05195)
---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/kernel-devsrc.bb +8 -2
index d39573965f..f22fac5bd6 100644
@@ -109,8 +109,8 @@ do_install() {
 	    fi
 	fi
 
-	if [ "${ARCH}" = "arm64" ]; then
-	    cp -a --parents arch/arm64/kernel/vdso/vdso.lds $kerneldir/build/
+	if [ "${ARCH}" = "arm64" -o "${ARCH}" = "riscv" ]; then
+	    cp -a --parents arch/${ARCH}/kernel/vdso/vdso.lds $kerneldir/build/
 	fi
 	if [ "${ARCH}" = "powerpc" ]; then
 	    cp -a --parents arch/powerpc/kernel/vdso32/vdso32.lds $kerneldir/build 2>/dev/null || :
@@ -185,6 +185,12 @@ do_install() {
 	    cp -a --parents arch/${ARCH}/kernel/vdso32/* $kerneldir/build/ 2>/dev/null || :
 	    cp -a --parents arch/${ARCH}/kernel/vdso64/* $kerneldir/build/ 2>/dev/null || :
 	fi
+	if [ "${ARCH}" = "riscv" ]; then
+            cp -a --parents arch/riscv/kernel/vdso/*gettimeofday.* $kerneldir/build/
+            cp -a --parents arch/riscv/kernel/vdso/note.S $kerneldir/build/
+            cp -a --parents arch/riscv/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/
+	    cp -a --parents arch/riscv/kernel/vdso/* $kerneldir/build/ 2>/dev/null || :
+	fi
 
 	# include the machine specific headers for ARM variants, if available.
 	if [ "${ARCH}" = "arm" ]; then
Signature · 1 line
2.31.1
#14 lore raw

PATCH 14/26 libpcre/libpcre2: correct SRC_URI

In reply to Anuj Mittal

From: Alexander Kanavin <[email protected]>

http://ftp.pcre.org is down, take sources according to links on
http://www.pcre.org

(cherry picked from commit 81ba0ba3e8d9c08b8dc69c24fb1d91446739229b)
---
 meta/recipes-support/libpcre/libpcre2_10.37.bb | 4 +++-
 meta/recipes-support/libpcre/libpcre_8.45.bb   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-support/libpcre/libpcre2_10.37.bb +3 -1
index e0ead59da6..ccedf688d7 100644
@@ -10,7 +10,9 @@ SECTION = "devel"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=6b3022283c9a79238d521848ea9dcb4d"
 
-SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2"
+SRC_URI = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PV}/pcre2-${PV}.tar.bz2"
+
+UPSTREAM_CHECK_URI = "https://github.com/PhilipHazel/pcre2/releases"
 
 SRC_URI[sha256sum] = "4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270"
 
meta/recipes-support/libpcre/libpcre_8.45.bb +1 -1
index 76b20f5f08..46fedbae48 100644
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.pcre.org"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=b5d5d1a69a24ea2718263f1ff85a1c58"
-SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
            file://run-ptest \
            file://Makefile \
            "
Signature · 1 line
2.31.1
#15 lore raw

PATCH 15/26 libx11: Update LICENSE to better reflect reality

In reply to Anuj Mittal

From: Peter Kjellerstedt <[email protected]>

There are no traces of neither the BSD-2-Clause license nor the BSD-4-Clause license being used in the code. There is one occurrence of the BSD-1-Clause license. On the other hand, HPND and HPND-sell-variant are all over the place.

(cherry picked from commit 5cd90092e21ad245df40a60feed3598dd9c6b98b)
---
 meta/recipes-graphics/xorg-lib/libx11_1.7.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-lib/libx11_1.7.2.bb +1 -1
index 7ee2a9c16a..f429daaf47 100644
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c30
 PROVIDES = "virtual/libx11"
 
 XORG_PN = "libX11"
-LICENSE = "MIT & MIT-style & BSD-4-Clause & BSD-2-Clause"
+LICENSE = "MIT & MIT-style & BSD-1-Clause & HPND & HPND-sell-variant"
 LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
 DEPENDS += "xorgproto xtrans libxcb"
Signature · 1 line
2.31.1
#16 lore raw

PATCH 16/26 libx11-compose-data: Update LICENSE to better reflect reality

In reply to Anuj Mittal

From: Peter Kjellerstedt <[email protected]>

There are no traces of neither the BSD-2-Clause license nor the BSD-4-Clause license being used in the code. There is one occurrence of the BSD-1-Clause license. On the other hand, HPND and HPND-sell-variant are all over the place.

(cherry picked from commit b0f30792fd0ea41f1d1590dbe0452c956e018c82)
---
 meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb +1 -1
index e53ccc6aea..796980b7ca 100644
@@ -8,7 +8,7 @@ python () {
 
 require xorg-lib-common.inc
 
-LICENSE = "MIT & MIT-style & BSD-4-Clause & BSD-2-Clause"
+LICENSE = "MIT & MIT-style & BSD-1-Clause & HPND & HPND-sell-variant"
 LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
 SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
Signature · 1 line
2.31.1
#17 lore raw

PATCH 17/26 wayland: Fix wayland-tools packaging

In reply to Anuj Mittal

From: Tom Hochstein <[email protected]>

There are some packaging problems due to the wayland-tools packaging implementation. The wayland-tools package currently looks like this:

wayland-tools

└── usr
    ├── bin
    │   └── wayland-scanner
    └── share
        └── wayland
            ├── wayland.dtd
            ├── wayland-scanner.mk
            └── wayland.xml

The files wayland.dtd and wayland.xml belong in the main package, while wayland-scanner.mk belongs in wayland-dev.

Fix the wayland.dtd and wayland.xml packaging by prepending the wayland-tools package and dropping the main package FILES variable override. The file wayland-scanner.mk is included in the main package by default, and so must be explicitly added to wayland-dev.

(cherry picked from commit a31fbec45d24df5b74091940d0e0b2daf34d8492)
---
 meta/recipes-graphics/wayland/wayland_1.19.0.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-graphics/wayland/wayland_1.19.0.bb +3 -3
index d6e468497d..5f8b972f76 100644
@@ -52,10 +52,10 @@ sysroot_stage_all:append:class-target () {
 	cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/
 }
 
-PACKAGES += "${PN}-tools"
+PACKAGES =+ "${PN}-tools"
 
-FILES:${PN} = "${libdir}/*${SOLIBS}"
-FILES:${PN}-tools += "${bindir} ${datadir}/wayland"
+FILES:${PN}-tools = "${bindir}/wayland-scanner"
+FILES:${PN}-dev += "${datadir}/${BPN}/wayland-scanner.mk"
 
 BBCLASSEXTEND = "native nativesdk"
 
Signature · 1 line
2.31.1
#18 lore raw

PATCH 18/26 nativesdk-packagegroup-sdk-host.bb: Update host tools for wayland

In reply to Anuj Mittal

From: Tom Hochstein <[email protected]>

The wayland-scanner host tool required to build weston is moved to the wayland-tools package, so update the SDK host tools list accordingly.

Also, the weston build requires wayland-scanner.pc to find wayland-scanner, so add wayland-dev.

(cherry picked from commit 31ed91bdbb0ec05730fb98d7cc523bb46aca50e3)
---
 .../packagegroups/nativesdk-packagegroup-sdk-host.bb            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +1 -1
index 39e5002bb7..9166a0851f 100644
@@ -25,7 +25,7 @@ RDEPENDS:${PN} = "\
     nativesdk-makedevs \
     nativesdk-cmake \
     nativesdk-meson \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland-tools nativesdk-wayland-dev', '', d)} \
     nativesdk-sdk-provides-dummy \
     nativesdk-bison \
     nativesdk-flex \
Signature · 1 line
2.31.1
#19 lore raw

PATCH 19/26 bitbake.conf: Use wayland distro feature for native builds

In reply to Anuj Mittal

From: Tom Hochstein <[email protected]>

The wayland-scanner is missing from SDKs with weston, but the weston build requires wayland-scanner. Allow the distro feature in order to include the wayland-scanner packages via nativesdk-packagegroup-sdk-host.bb.

(cherry picked from commit 858cc6f257e22e39df83f4808ea27c6d12cd1b80)
---
 meta/conf/bitbake.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/conf/bitbake.conf +2 -2
index 9274322e3a..c2cb2f0d9d 100644
@@ -850,8 +850,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl wayland"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl wayland"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
Signature · 1 line
2.31.1
#20 lore raw

PATCH 20/26 linunistring: Add missing gperf-native dependency

In reply to Anuj Mittal

From: Richard Purdie <[email protected]>

(cherry picked from commit 73d3efbaeb2f412ab8d3491d2da3f3124fc009f3)
---
 meta/recipes-support/libunistring/libunistring_0.9.10.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-support/libunistring/libunistring_0.9.10.bb +1 -0
index 0a7b18ed08..589faacb05 100644
@@ -18,6 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
                     file://README;beginline=45;endline=65;md5=08287d16ba8d839faed8d2dc14d7d6a5 \
                     file://doc/libunistring.texi;md5=287fa6075f78a3c85c1a52b0a92547cd \
                    "
+DEPENDS = "gperf-native"
 
 SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
Signature · 1 line
2.31.1
#21 lore raw

PATCH 21/26 pseudo: Add fcntl64 wrapper

In reply to Anuj Mittal

From: Richard Purdie <[email protected]>

Add fcntl64 wrapper which hopefully fixes issues seen in findutils and the find command in the libtool removal code when built with LFS compile flags on Gentoo.

(cherry picked from commit f26867fe4daec7299f59a82ae4a0d70cceb3e082)
---
 meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/pseudo/pseudo_git.bb +1 -1
index 7acb1d64d5..f9e3b46910 100644
@@ -13,7 +13,7 @@ SRC_URI:append:class-nativesdk = " \
     file://older-glibc-symbols.patch"
 SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
 
-SRCREV = "0cda3ba5f94aed8d50652a99ee9c502975aa2926"
+SRCREV = "d34f2f6cedccf8488730001bcbde6bb7499f8814"
 S = "${WORKDIR}/git"
 PV = "1.9.0+git${SRCPV}"
 
Signature · 1 line
2.31.1
#22 lore raw

PATCH 22/26 meta: Add explict branch to git SRC_URIs

In reply to Anuj Mittal

From: Richard Purdie <[email protected]>

There is uncertainty about the default branch name in git going forward. To try and cover the different possible outcomes, add branch names to all
git:// and gitsm:// SRC_URI entries.

This update was made with the script added to contrib in this patch which aims to help others convert other layers.

(cherry picked from commit b51c405faf6f8c0365f7533bfaf470d79152a463)
---
 .../devtool/devtool-upgrade-test2_git.bb      |  2 +-
 .../devtool-upgrade-test2_git.bb.upgraded     |  2 +-
 .../git-submodule-test/git-submodule-test.bb  |  2 +-
 meta/classes/devupstream.bbclass              |  2 +-
 meta/conf/bitbake.conf                        |  2 +-
 meta/lib/oeqa/selftest/cases/fetch.py         |  2 +-
 meta/recipes-bsp/efibootmgr/efibootmgr_17.bb  |  2 +-
 meta/recipes-bsp/efivar/efivar_37.bb          |  2 +-
 meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb  |  2 +-
 meta/recipes-bsp/u-boot/u-boot-common.inc     |  2 +-
 .../connman/connman-gnome_0.7.bb              |  2 +-
 .../libnss-mdns/libnss-mdns_0.15.1.bb         |  2 +-
 .../mobile-broadband-provider-info_git.bb     |  2 +-
 meta/recipes-core/dbus-wait/dbus-wait_git.bb  |  2 +-
 meta/recipes-core/fts/fts_1.2.7.bb            |  2 +-
 meta/recipes-core/glibc/glibc-version.inc     |  2 +-
 meta/recipes-core/ifupdown/ifupdown_0.8.36.bb |  2 +-
 .../initscripts/init-system-helpers_1.60.bb   |  2 +-
 meta/recipes-core/musl/libucontext_git.bb     |  2 +-
 meta/recipes-core/musl/musl-obstack.bb        |  2 +-
 meta/recipes-core/musl/musl-utils.bb          |  2 +-
 meta/recipes-core/musl/musl_git.bb            |  2 +-
 meta/recipes-core/ncurses/ncurses.inc         |  2 +-
 meta/recipes-core/psplash/psplash_git.bb      |  2 +-
 .../update-rc.d/update-rc.d_0.8.bb            |  2 +-
 .../bootchart2/bootchart2_0.14.9.bb           |  2 +-
 .../btrfs-tools/btrfs-tools_5.13.1.bb         |  2 +-
 .../createrepo-c/createrepo-c_0.17.4.bb       |  2 +-
 meta/recipes-devtools/distcc/distcc_3.4.bb    |  2 +-
 meta/recipes-devtools/dnf/dnf_4.8.0.bb        |  2 +-
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc |  2 +-
 .../erofs-utils/erofs-utils_1.3.bb            |  2 +-
 meta/recipes-devtools/file/file_5.40.bb       |  2 +-
 meta/recipes-devtools/glide/glide_0.13.3.bb   |  2 +-
 .../gnu-config/gnu-config_git.bb              |  2 +-
 .../libcomps/libcomps_0.1.17.bb               |  2 +-
 .../librepo/librepo_1.14.1.bb                 |  2 +-
 meta/recipes-devtools/mtd/mtd-utils_git.bb    |  2 +-
 .../patchelf/patchelf_0.13.bb                 |  2 +-
 .../squashfs-tools/squashfs-tools_git.bb      |  2 +-
 .../systemd-bootchart_234.bb                  |  2 +-
 .../tcf-agent/tcf-agent_git.bb                |  2 +-
 meta/recipes-devtools/unfs3/unfs3_git.bb      |  2 +-
 .../rust-hello-world/rust-hello-world_git.bb  |  2 +-
 meta/recipes-extended/bzip2/bzip2_1.0.8.bb    |  2 +-
 .../go-examples/go-helloworld_0.1.bb          |  2 +-
 .../iputils/iputils_20210722.bb               |  2 +-
 .../recipes-extended/libaio/libaio_0.3.112.bb |  2 +-
 meta/recipes-extended/libnsl/libnsl2_git.bb   |  2 +-
 .../recipes-extended/libnss-nis/libnss-nis.bb |  2 +-
 .../libsolv/libsolv_0.7.19.bb                 |  2 +-
 meta/recipes-extended/ltp/ltp_20210524.bb     |  2 +-
 .../net-tools/net-tools_2.10.bb               |  2 +-
 meta/recipes-extended/procps/procps_3.3.17.bb |  2 +-
 meta/recipes-extended/psmisc/psmisc_23.4.bb   |  2 +-
 .../rpcsvc-proto/rpcsvc-proto.bb              |  2 +-
 .../stress-ng/stress-ng_0.13.00.bb            |  2 +-
 .../xinetd/xinetd_2.3.15.4.bb                 |  2 +-
 meta/recipes-gnome/libportal/libportal_0.4.bb |  2 +-
 .../glslang/glslang_11.5.0.bb                 |  2 +-
 .../igt-gpu-tools/igt-gpu-tools_git.bb        |  2 +-
 .../libfakekey/libfakekey_git.bb              |  2 +-
 .../libmatchbox/libmatchbox_1.12.bb           |  2 +-
 .../matchbox-wm/matchbox-wm_1.2.2.bb          |  2 +-
 .../spir/spirv-headers_1.5.4.bb               |  2 +-
 .../spir/spirv-tools_2021.2.bb                |  2 +-
 .../vulkan/vulkan-loader_1.2.182.0.bb         |  2 +-
 .../vulkan/vulkan-samples_git.bb              |  2 +-
 .../xorg-driver/xf86-video-intel_git.bb       |  2 +-
 meta/recipes-kernel/blktrace/blktrace_git.bb  |  2 +-
 meta/recipes-kernel/cryptodev/cryptodev.inc   |  2 +-
 meta/recipes-kernel/dtc/dtc.inc               |  2 +-
 .../kern-tools/kern-tools-native_git.bb       |  2 +-
 meta/recipes-kernel/kmod/kmod.inc             |  2 +-
 meta/recipes-kernel/powertop/powertop_2.14.bb |  2 +-
 .../systemtap/systemtap_git.inc               |  2 +-
 meta/recipes-sato/l3afpad/l3afpad_git.bb      |  2 +-
 .../matchbox-config-gtk_0.2.bb                |  2 +-
 .../matchbox-desktop/matchbox-desktop_2.2.bb  |  2 +-
 .../matchbox-panel-2/matchbox-panel-2_2.11.bb |  2 +-
 .../matchbox-terminal_0.2.bb                  |  2 +-
 .../matchbox-theme-sato_0.2.bb                |  2 +-
 .../sato-screenshot/sato-screenshot_0.3.bb    |  2 +-
 .../settings-daemon/settings-daemon_0.0.2.bb  |  2 +-
 .../bmap-tools/bmap-tools_3.6.bb              |  2 +-
 .../boost/boost-build-native_4.4.1.bb         |  2 +-
 .../ca-certificates_20211016.bb               |  2 +-
 .../dos2unix/dos2unix_7.4.2.bb                |  2 +-
 .../gnome-desktop-testing_2021.1.bb           |  2 +-
 .../libjitterentropy_3.1.0.bb                 |  2 +-
 meta/recipes-support/numactl/numactl_git.bb   |  2 +-
 .../recipes-support/p11-kit/p11-kit_0.24.0.bb |  2 +-
 .../ptest-runner/ptest-runner_2.4.2.bb        |  2 +-
 .../rng-tools/rng-tools_6.14.bb               |  2 +-
 .../shared-mime-info/shared-mime-info_git.bb  |  2 +-
 meta/recipes-support/vim/vim.inc              |  2 +-
 scripts/contrib/convert-srcuri.py             | 63 +++++++++++++++++++
 97 files changed, 159 insertions(+), 96 deletions(-)
 create mode 100755 scripts/contrib/convert-srcuri.py
meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb +1 -1
index 07b83276fb..8a27e3a791 100644
@@ -11,7 +11,7 @@ SRCREV = "1a3e1343761b30750bed70e0fd688f6d3c7b3717"
 PV = "0.1+git${SRCPV}"
 PR = "r2"
 
-SRC_URI = "git://git.yoctoproject.org/dbus-wait"
+SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master"
 UPSTREAM_CHECK_COMMITS = "1"
 RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded +1 -1
index 32ec4b14fa..fbe90d6c6b 100644
@@ -10,7 +10,7 @@ DEPENDS = "dbus"
 SRCREV = "6cc6077a36fe2648a5f993fe7c16c9632f946517"
 PV = "0.1+git${SRCPV}"
 
-SRC_URI = "git://git.yoctoproject.org/dbus-wait"
+SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master"
 UPSTREAM_CHECK_COMMITS = "1"
 RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb +1 -1
index 9429564df4..cc5d7eae5a 100644
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-SRC_URI = "gitsm://git.yoctoproject.org/git-submodule-test"
+SRC_URI = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master"
 SRCREV = "a2885dd7d25380d23627e7544b7bbb55014b16ee"
meta/classes/devupstream.bbclass +1 -1
index dc9a9472b1..facc46f3af 100644
@@ -4,7 +4,7 @@
 #
 # Usage:
 # BBCLASSEXTEND = "devupstream:target"
-# SRC_URI:class-devupstream = "git://git.example.com/example"
+# SRC_URI:class-devupstream = "git://git.example.com/example;branch=master"
 # SRCREV:class-devupstream = "abcdef"
 #
 # If the first entry in SRC_URI is a git: URL then S is rewritten to
meta/conf/bitbake.conf +1 -1
index c2cb2f0d9d..c3e0efcf89 100644
@@ -642,7 +642,7 @@ APACHE_MIRROR = "https://archive.apache.org/dist"
 CPAN_MIRROR = "https://search.cpan.org/CPAN"
 DEBIAN_MIRROR = "http://ftp.debian.org/debian/pool"
 GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles"
-GNOME_GIT = "git://gitlab.gnome.org/GNOME"
+GNOME_GIT = "git://gitlab.gnome.org/GNOME;branch=master"
 GNOME_MIRROR = "https://download.gnome.org/sources/"
 GNU_MIRROR = "https://ftp.gnu.org/gnu"
 GNUPG_MIRROR = "https://www.gnupg.org/ftp/gcrypt"
meta/lib/oeqa/selftest/cases/fetch.py +1 -1
index 9aa91e59c1..be14272e63 100644
@@ -99,7 +99,7 @@ class Dependencies(OESelftestTestCase):
 
             r = """
             LICENSE="CLOSED"
-            SRC_URI="git://example.com/repo"
+            SRC_URI="git://example.com/repo;branch=master"
             """
             f = self.write_recipe(textwrap.dedent(r), tempdir)
             d = tinfoil.parse_recipe_file(f)
meta/recipes-bsp/efibootmgr/efibootmgr_17.bb +1 -1
index 5d6f200a73..e9dfa0770e 100644
@@ -10,7 +10,7 @@ DEPENDS = "efivar popt"
 
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
-SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \
+SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https;branch=master \
            file://0001-remove-extra-decl.patch \
            file://97668ae0bce776a36ea2001dea63d376be8274ac.patch \
           "
meta/recipes-bsp/efivar/efivar_37.bb +1 -1
index b11f1539a2..6340020cef 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
 
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
-SRC_URI = "git://github.com/rhinstaller/efivar.git \
+SRC_URI = "git://github.com/rhinstaller/efivar.git;branch=master \
            file://determinism.patch \
            file://no-werror.patch"
 SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10"
meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb +1 -1
index ce14bc48aa..6906e5362d 100644
@@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c"
 SECTION = "libs"
 
-SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https"
+SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https;branch=master"
 SRCREV = "ba7564f5006d09bec51058cf4f5ac90d4dc18b3c"
 
 S = "${WORKDIR}/git"
meta/recipes-bsp/u-boot/u-boot-common.inc +1 -1
index 6b9253806f..2423e9ca14 100644
@@ -14,7 +14,7 @@ PE = "1"
 # repo during parse
 SRCREV = "840658b093976390e9537724f802281c9c8439f5"
 
-SRC_URI = "git://git.denx.de/u-boot.git \
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
           "
 
 S = "${WORKDIR}/git"
meta/recipes-connectivity/connman/connman-gnome_0.7.bb +1 -1
index 55c687968f..eb6d1f7181 100644
@@ -10,7 +10,7 @@ DEPENDS = "gtk+3 dbus-glib dbus-glib-native intltool-native gettext-native"
 
 # 0.7 tag
 SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"
-SRC_URI = "git://github.com/connectivity/connman-gnome.git \
+SRC_URI = "git://github.com/connectivity/connman-gnome.git;branch=master \
            file://0001-Removed-icon-from-connman-gnome-about-applet.patch \
            file://null_check_for_ipv4_config.patch \
            file://images/ \
meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.15.1.bb +1 -1
index e455a60bd5..cfe474d72e 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "avahi"
 
-SRC_URI = "git://github.com/lathiat/nss-mdns \
+SRC_URI = "git://github.com/lathiat/nss-mdns;branch=master \
            "
 
 SRCREV = "4b3cfe818bf72d99a02b8ca8b8813cb2d6b40633"
meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +1 -1
index 837490f15f..4246f4dcbd 100644
@@ -8,7 +8,7 @@ SRCREV = "11f2247eccd3c161b8fd9b41143862e9fb81193c"
 PV = "20210805"
 PE = "1"
 
-SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https"
+SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=master"
 S = "${WORKDIR}/git"
 
 inherit autotools
meta/recipes-core/dbus-wait/dbus-wait_git.bb +1 -1
index 677768d35a..b39f7523c0 100644
@@ -11,7 +11,7 @@ SRCREV = "6cc6077a36fe2648a5f993fe7c16c9632f946517"
 PV = "0.1+git${SRCPV}"
 PR = "r2"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
 UPSTREAM_CHECK_COMMITS = "1"
 
 S = "${WORKDIR}/git"
meta/recipes-core/fts/fts_1.2.7.bb +1 -1
index ea820cb0c3..f907a35a90 100644
@@ -10,7 +10,7 @@ SECTION = "libs"
 
 SRCREV = "0bde52df588e8969879a2cae51c3a4774ec62472"
 
-SRC_URI = "git://github.com/pullmoll/musl-fts.git"
+SRC_URI = "git://github.com/pullmoll/musl-fts.git;branch=master"
 
 S = "${WORKDIR}/git"
 
meta/recipes-core/glibc/glibc-version.inc +1 -1
index 281df7ecda..6dac7f0c7a 100644
@@ -3,6 +3,6 @@ PV = "2.34"
 SRCREV_glibc ?= "ae37d06c7d127817ba43850f0f898b793d42aea7"
 SRCREV_localedef ?= "95c0221703ad970a52445e9eaf91c4aff35eebef"
 
-GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
+GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;branch=master"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)"
meta/recipes-core/ifupdown/ifupdown_0.8.36.bb +1 -1
index 1d01701b8f..48a7b8fb13 100644
@@ -7,7 +7,7 @@ the file /etc/network/interfaces."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \
+SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=master \
            file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
            file://99_network \
            file://0001-Define-FNM_EXTMATCH-for-musl.patch \
meta/recipes-core/initscripts/init-system-helpers_1.60.bb +1 -1
index 165f37c070..46952e4685 100644
@@ -17,7 +17,7 @@ LICENSE = "BSD-3-Clause & GPLv2"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072"
 
 SRCREV = "dbd9197569c0935029acd5c9b02b84c68fd937ee"
-SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https"
+SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 
meta/recipes-core/musl/libucontext_git.bb +1 -1
index d8ae8242c5..1a8d1c4b21 100644
@@ -10,7 +10,7 @@ DEPENDS = ""
 
 PV = "1.1+${SRCPV}"
 SRCREV = "335ee864ef6f4a5d4b525453fd9dbfb3507cfecc"
-SRC_URI = "git://github.com/kaniini/libucontext \
+SRC_URI = "git://github.com/kaniini/libucontext;branch=master \
            file://0001-meson-Add-option-to-pass-cpu.patch \
            "
 
meta/recipes-core/musl/musl-obstack.bb +1 -1
index 3003935fe5..3748047496 100644
@@ -10,7 +10,7 @@ SECTION = "libs"
 
 PV = "1.1"
 SRCREV = "d2ad66b0df44a4b784956f7f7f2717131ddc05f4"
-SRC_URI = "git://github.com/pullmoll/musl-obstack"
+SRC_URI = "git://github.com/pullmoll/musl-obstack;branch=master"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
meta/recipes-core/musl/musl-utils.bb +1 -1
index 4f99d4324f..fa49d1da04 100644
@@ -11,7 +11,7 @@ SECTION = "utils"
 PV = "20170421"
 
 SRCREV = "fb5630138ccabbbc14a19d372096a04e42573c7d"
-SRC_URI = "git://github.com/boltlinux/musl-utils"
+SRC_URI = "git://github.com/boltlinux/musl-utils;branch=master"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
meta/recipes-core/musl/musl_git.bb +1 -1
index 06b0e060d0..a2f96f1dbe 100644
@@ -12,7 +12,7 @@ PV = "${BASEVER}+git${SRCPV}"
 
 # mirror is at git://github.com/kraj/musl.git
 
-SRC_URI = "git://git.musl-libc.org/musl \
+SRC_URI = "git://git.musl-libc.org/musl;branch=master \
            file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
            file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
           "
meta/recipes-core/ncurses/ncurses.inc +1 -1
index cbb12ca275..64cce329aa 100644
@@ -13,7 +13,7 @@ BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \
 inherit autotools binconfig-disabled multilib_header pkgconfig
 
 # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
-SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https"
+SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https;branch=master"
 
 EXTRA_AUTORECONF = "-I m4"
 
meta/recipes-core/psplash/psplash_git.bb +1 -1
index 1be7ece79d..6525378f4f 100644
@@ -10,7 +10,7 @@ SRCREV = "0a902f7cd875ccf018456451be369f05fa55f962"
 PV = "0.1+git${SRCPV}"
 PR = "r15"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN} \
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
            file://psplash-init \
            file://psplash-start.service \
            file://psplash-systemd.service \
meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +1 -1
index da716674c3..daee5c224b 100644
@@ -6,7 +6,7 @@ SECTION = "base"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=d40a07c27f535425934bb5001f2037d9"
 
-SRC_URI = "git://git.yoctoproject.org/update-rc.d"
+SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master"
 SRCREV = "8636cf478d426b568c1be11dbd9346f67e03adac"
 
 UPSTREAM_CHECK_COMMITS = "1"
meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +1 -1
index c24613b74e..6ef5298a3b 100644
@@ -90,7 +90,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
 
-SRC_URI = "git://github.com/xrmx/bootchart.git \
+SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master \
            file://bootchartd_stop.sh \
            file://0001-collector-Allocate-space-on-heap-for-chunks.patch \
            file://0001-bootchart2-support-usrmerge.patch \
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.1.bb +1 -1
index 5288978943..9b28528ad9 100644
@@ -16,7 +16,7 @@ SECTION = "base"
 DEPENDS = "lzo util-linux zlib"
 DEPENDS:append:class-target = " udev"
 
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \
            "
meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb +1 -1
index 500b508d72..68284a1190 100644
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/rpm-software-management/createrepo_c/wiki"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
+SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master \
            file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            "
 
meta/recipes-devtools/distcc/distcc_3.4.bb +1 -1
index 7adf8a8ff6..c1cce24d11 100644
@@ -15,7 +15,7 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
 
 RRECOMMENDS:${PN}-server = "avahi-daemon"
 
-SRC_URI = "git://github.com/distcc/distcc.git \
+SRC_URI = "git://github.com/distcc/distcc.git;branch=master \
            file://default \
            file://distcc \
            file://distcc.service \
meta/recipes-devtools/dnf/dnf_4.8.0.bb +1 -1
index f51d74797d..9929da6fa4 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \
                     "
 
-SRC_URI = "git://github.com/rpm-software-management/dnf.git \
+SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master \
            file://0001-Corretly-install-tmpfiles.d-configuration.patch \
            file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
            file://0005-Do-not-prepend-installroot-to-logdir.patch \
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +1 -1
index bcffa77db9..a030fa6fa8 100644
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
 SECTION = "base"
 DEPENDS = "util-linux attr autoconf-archive"
 
-SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git"
+SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master"
 S = "${WORKDIR}/git"
 
 inherit autotools gettext texinfo pkgconfig multilib_header update-alternatives ptest
meta/recipes-devtools/erofs-utils/erofs-utils_1.3.bb +1 -1
index d07d5c4360..77cce2fdaf 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94fa01670a2a8f2d3ab2de15004e0848"
 HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README"
 
 SRCREV = "2cd522105ea771ec30b269cd4c57e2265a4d6349"
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
 
meta/recipes-devtools/file/file_5.40.bb +1 -1
index 32b61f4f39..3c083be192 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd
 DEPENDS = "file-replacement-native"
 DEPENDS:class-native = "bzip2-replacement-native"
 
-SRC_URI = "git://github.com/file/file.git"
+SRC_URI = "git://github.com/file/file.git;branch=master"
 
 SRCREV = "f49fda6f52a9477d817dbd9c06afab02daf025f8"
 S = "${WORKDIR}/git"
meta/recipes-devtools/glide/glide_0.13.3.bb +1 -1
index e943dc1762..1a69445816 100644
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=54905cf894f8cc416a92f4fc350c35b2"
 
 GO_IMPORT = "github.com/Masterminds/glide"
-SRC_URI = "git://${GO_IMPORT}"
+SRC_URI = "git://${GO_IMPORT};branch=master"
 SRCREV = "8ed5b9292379d86c39592a7e6a58eb9c903877cf"
 
 inherit go
meta/recipes-devtools/gnu-config/gnu-config_git.bb +1 -1
index 34b425031f..794e39546c 100644
@@ -12,7 +12,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 SRCREV = "805517123cbfe33d17c989a18e78c5789fab0437"
 PV = "20210722+git${SRCPV}"
 
-SRC_URI = "git://git.savannah.gnu.org/config.git \
+SRC_URI = "git://git.savannah.gnu.org/config.git;branch=master \
            file://gnu-configize.in"
 S = "${WORKDIR}/git"
 UPSTREAM_CHECK_COMMITS = "1"
meta/recipes-devtools/libcomps/libcomps_0.1.17.bb +1 -1
index 502bc4688b..1a59fc1a7b 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "Libcomps is alternative for yum.comps library. It's written in pu
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/rpm-software-management/libcomps.git \
+SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master \
            file://0001-Add-crc32.c-to-sources-list.patch \
            file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            "
meta/recipes-devtools/librepo/librepo_1.14.1.bb +1 -1
index 8676452587..19a2bd612e 100644
@@ -5,7 +5,7 @@ DESCRIPTION = "${SUMMARY}"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://github.com/rpm-software-management/librepo.git \
+SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master \
            file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \
            file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
            "
meta/recipes-devtools/mtd/mtd-utils_git.bb +1 -1
index 057ae806a1..2004572375 100644
@@ -14,7 +14,7 @@ RDEPENDS:mtd-utils-tests += "bash"
 PV = "2.1.3"
 
 SRCREV = "42ea7cd48d2b3c306d59bb6c530d79f8c25bf9f5"
-SRC_URI = "git://git.infradead.org/mtd-utils.git \
+SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
            file://add-exclusion-to-mkfs-jffs2-git-2.patch \
            "
 
meta/recipes-devtools/patchelf/patchelf_0.13.bb +1 -1
index 1b0561b8ba..b24c74a149 100644
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/NixOS/patchelf"
 
 LICENSE = "GPLv3"
 
-SRC_URI = "git://github.com/NixOS/patchelf;protocol=https \
+SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \
            file://handle-read-only-files.patch \
            "
 SRCREV = "a949ff23315bbb5863627c4655fe216ecbf341a2"
meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +1 -1
index 115e995eef..6a19cba8f7 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 PV = "4.5"
 SRCREV = "0496d7c3de3e09da37ba492081c86159806ebb07"
-SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
+SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master \
            file://0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch \
            file://CVE-2021-41072-requisite-1.patch;striplevel=2 \
            file://CVE-2021-41072-requisite-2.patch;striplevel=2 \
meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb +1 -1
index 30dbbcc05c..71c2ba6d7c 100644
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2.1 & GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \
                     file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe"
 
-SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https \
+SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https;branch=master \
            file://0001-architecture-Recognise-RISCV-32-RISCV-64.patch \
            file://mips64.patch \
            file://no_lto.patch \
meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +1 -1
index e67eccc75c..d6d563d8e7 100644
@@ -10,7 +10,7 @@ SRCREV = "2735e3d6b7eccb05ab232825c618c837d27a5010"
 PV = "1.7.0+git${SRCPV}"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
-SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https \
+SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https;branch=master \
            file://fix_ranlib.patch \
            file://ldflags.patch \
            file://tcf-agent.init \
meta/recipes-devtools/unfs3/unfs3_git.bb +1 -1
index 2bc7a9230b..7a5d273851 100644
@@ -14,7 +14,7 @@ DEPENDS:append:class-nativesdk = " flex-nativesdk"
 ASNEEDED = ""
 
 S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https \
+SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \
            file://unfs3_parallel_build.patch \
            file://alternate_rpc_ports.patch \
            file://fix_pid_race_parent_writes_child_pid.patch \
meta/recipes-example/rust-hello-world/rust-hello-world_git.bb +1 -1
index 3ebd9cc661..1d91109b51 100644
@@ -1,6 +1,6 @@
 inherit cargo
 
-SRC_URI = "git://github.com/meta-rust/rust-hello-world.git;protocol=https"
+SRC_URI = "git://github.com/meta-rust/rust-hello-world.git;protocol=https;branch=master"
 SRCREV="e0fa23f1a3cb1eb1407165bd2fc36d2f6e6ad728"
 LIC_FILES_CHKSUM="file://COPYRIGHT;md5=e6b2207ac3740d2d01141c49208c2147"
 
meta/recipes-extended/bzip2/bzip2_1.0.8.bb +1 -1
index 296bc68d41..ab63012922 100644
@@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e
 "
 
 SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \
-           git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests \
+           git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master \
            file://configure.ac;subdir=${BP} \
            file://Makefile.am;subdir=${BP} \
            file://run-ptest \
meta/recipes-extended/go-examples/go-helloworld_0.1.bb +1 -1
index aeff482f3b..6e2687a083 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "https://golang.org/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-SRC_URI = "git://${GO_IMPORT}"
+SRC_URI = "git://${GO_IMPORT};branch=master"
 SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe"
 UPSTREAM_CHECK_COMMITS = "1"
 
meta/recipes-extended/iputils/iputils_20210722.bb +1 -1
index e1940b77b5..c92bc830bc 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390"
 
 DEPENDS = "gnutls"
 
-SRC_URI = "git://github.com/iputils/iputils \
+SRC_URI = "git://github.com/iputils/iputils;branch=master \
            file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
            file://0001-meson-Make-tests-optional.patch \
            "
meta/recipes-extended/libaio/libaio_0.3.112.bb +1 -1
index b3606474a5..3892f3244e 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "http://lse.sourceforge.net/io/aio.html"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
-SRC_URI = "git://pagure.io/libaio.git;protocol=https \
+SRC_URI = "git://pagure.io/libaio.git;protocol=https;branch=master \
            file://00_arches.patch \
            file://libaio_fix_for_mips_syscalls.patch \
            file://system-linkage.patch \
meta/recipes-extended/libnsl/libnsl2_git.bb +1 -1
index 53be67fe85..6194d90177 100644
@@ -14,7 +14,7 @@ PV = "2.0.0"
 
 SRCREV = "82245c0c58add79a8e34ab0917358217a70e5100"
 
-SRC_URI = "git://github.com/thkukuk/libnsl \
+SRC_URI = "git://github.com/thkukuk/libnsl;branch=master \
           "
 
 S = "${WORKDIR}/git"
meta/recipes-extended/libnss-nis/libnss-nis.bb +1 -1
index 34103428e9..bc2e292f40 100644
@@ -17,7 +17,7 @@ PV = "3.1+git${SRCPV}"
 
 SRCREV = "062f31999b35393abf7595cb89dfc9590d5a42ad"
 
-SRC_URI = "git://github.com/thkukuk/libnss_nis \
+SRC_URI = "git://github.com/thkukuk/libnss_nis;branch=master \
           "
 
 S = "${WORKDIR}/git"
meta/recipes-extended/libsolv/libsolv_0.7.19.bb +1 -1
index bb925073ed..768682f885 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
 
 DEPENDS = "expat zlib"
 
-SRC_URI = "git://github.com/openSUSE/libsolv.git \
+SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master \
 "
 
 SRCREV = "c773294be6b0a2425f344a8999f173fb00cfd16f"
meta/recipes-extended/ltp/ltp_20210524.bb +1 -1
index 20e2deffa5..b728dffc19 100644
@@ -29,7 +29,7 @@ CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
 SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd"
 
-SRC_URI = "git://github.com/linux-test-project/ltp.git \
+SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master \
            file://0001-Remove-OOM-tests-from-runtest-mm.patch \
            file://0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch \
            "
meta/recipes-extended/net-tools/net-tools_2.10.bb +1 -1
index 00caccd4b8..eb5881356c 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba"
 
 SRCREV = "80d7b95067f1f22fece9537dea6dff53081f4886"
-SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https \
+SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https;branch=master \
     file://net-tools-config.h \
     file://net-tools-config.make \
     file://Add_missing_headers.patch \
meta/recipes-extended/procps/procps_3.3.17.bb +1 -1
index 64a2d154b6..9366ec99aa 100644
@@ -12,7 +12,7 @@ DEPENDS = "ncurses"
 
 inherit autotools gettext pkgconfig update-alternatives
 
-SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \
+SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \
            file://sysctl.conf \
            file://0001-w.c-correct-musl-builds.patch \
            file://0002-proc-escape.c-add-missing-include.patch \
meta/recipes-extended/psmisc/psmisc_23.4.bb +1 -1
index 894443f4ef..89fe8a709c 100644
@@ -2,7 +2,7 @@ require psmisc.inc
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
-SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \
+SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \
            file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
            "
 SRCREV = "5fab6b7ab385080f1db725d6803136ec1841a15f"
meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb +1 -1
index 678632a814..81bd40bf61 100644
@@ -19,7 +19,7 @@ PV = "1.4.2"
 
 SRCREV = "6f54e54455c073d08a56ea627c6cd2355a40eb53"
 
-SRC_URI = "git://github.com/thkukuk/${BPN} \
+SRC_URI = "git://github.com/thkukuk/${BPN};branch=master \
            file://0001-Use-cross-compiled-rpcgen.patch \
           "
 
meta/recipes-extended/stress-ng/stress-ng_0.13.00.bb +1 -1
index 5889569e50..f01e7b2433 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https \
+SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
            file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
            file://0001-Makefile-do-not-write-the-timestamp-into-compressed-.patch \
            "
meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +1 -1
index da051c119f..e64494e54e 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=55c5fdf02cfcca3fc9621b6f2ceae10f"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
-SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https \
+SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \
            file://xinetd.init \
            file://xinetd.default \
            file://xinetd.service \
meta/recipes-gnome/libportal/libportal_0.4.bb +1 -1
index 03e681f58c..5817302688 100644
@@ -6,7 +6,7 @@ BUGTRACKER = "https://github.com/flatpak/libportal/issues"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https"
+SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master"
 SRCREV = "f68764e288ede516d902b131cc4fadded3804059"
 S = "${WORKDIR}/git"
 
meta/recipes-graphics/glslang/glslang_11.5.0.bb +1 -1
index 2f076e5684..4c33744e71 100644
@@ -9,7 +9,7 @@ LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exc
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229"
 
 SRCREV = "ae2a562936cc8504c9ef2757cceaff163147834f"
-SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https \
+SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \
            file://0001-generate-glslang-pkg-config.patch"
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
 S = "${WORKDIR}/git"
meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb +1 -1
index 1a00eca7d3..680561cac9 100644
@@ -12,7 +12,7 @@ inherit meson pkgconfig
 SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2"
 PV = "1.26"
 
-SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https"
+SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 
meta/recipes-graphics/libfakekey/libfakekey_git.bb +1 -1
index ab6f5ac9ed..33ea6fe5a9 100644
@@ -13,7 +13,7 @@ SECTION = "x11/wm"
 SRCREV = "7ad885912efb2131e80914e964d5e635b0d07b40"
 PV = "0.3+git${SRCPV}"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
 
 S = "${WORKDIR}/git"
 
meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb +1 -1
index 1a31677978..06bd682823 100644
@@ -17,7 +17,7 @@ DEPENDS = "virtual/libx11 libxext"
 
 #SRCREV for 1.12
 SRCREV = "e846ee434f8e23d9db38af13c523f791495e0e87"
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
 
 S = "${WORKDIR}/git"
 
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb +1 -1
index 95a0604aee..f452ea032a 100644
@@ -12,7 +12,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification ex
 
 # SRCREV tagged 1.2.2
 SRCREV = "27da947e7fbdf9659f7e5bd1e92af92af6c03970"
-SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \
+SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;branch=master \
            file://0001-Fix-build-with-gcc-10.patch \
            file://kbdconfig"
 
meta/recipes-graphics/spir/spirv-headers_1.5.4.bb +1 -1
index 7a43af5e6b..ea7e17305e 100644
@@ -8,7 +8,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
 SRCREV = "bcf55210f13a4fa3c3d0963b509ff1070e434c79"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
 S = "${WORKDIR}/git"
 PV .= "+git${SRCPV}"
meta/recipes-graphics/spir/spirv-tools_2021.2.bb +1 -1
index f55bd5194a..a22ceb6bfd 100644
@@ -8,7 +8,7 @@ LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "e198c6a785d388db68eb9166b43ac5e5208fd5cc"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git \
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master \
            file://0001-fix-strncpy-bound-error.patch \
           "
 UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb +1 -1
index a36fa1f844..eb16c547b7 100644
@@ -9,7 +9,7 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=master \
            "
 SRCREV = "1896143df69d439b0933c1bb485f5a4587bdf2dc"
 
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +1 -1
index c5ead19482..4827e3a22c 100644
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
 
-SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \
+SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master \
            file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \
            file://debugfix.patch \
            "
meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +1 -1
index 1d8077a600..21dc8880ec 100644
@@ -13,7 +13,7 @@ SRCREV = "f66d39544bb8339130c96d282a80f87ca1606caf"
 PV = "2.99.917+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \
+SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel;branch=master \
            file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \
            file://0001-i810-Avoid-duplicate-definition-of-I810PatternROP.patch \
 "
meta/recipes-kernel/blktrace/blktrace_git.bb +1 -1
index d00b1bd0be..b108676df4 100644
@@ -14,7 +14,7 @@ SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb"
 
 PV = "1.3.0+git${SRCPV}"
 
-SRC_URI = "git://git.kernel.dk/blktrace.git"
+SRC_URI = "git://git.kernel.dk/blktrace.git;branch=master"
 
 S = "${WORKDIR}/git"
 
meta/recipes-kernel/cryptodev/cryptodev.inc +1 -1
index ae2c308911..e4a7922ad1 100644
@@ -8,7 +8,7 @@ API is compatible with OpenBSD's cryptodev userspace API (/dev/crypto)."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \
+SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux;branch=master \
            "
 SRCREV = "e0c25e289d6baf1d83c2b9cb523d3bc237d0c0c9"
 
meta/recipes-kernel/dtc/dtc.inc +1 -1
index bfdc9f8639..b8a6b34f0c 100644
@@ -5,7 +5,7 @@ SECTION = "bootloader"
 LICENSE = "GPLv2 | BSD-2-Clause"
 DEPENDS = "flex-native bison-native"
 
-SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
+SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \
            file://make_install.patch \
            file://0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch \
            "
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1
index e967f485c1..ef035aed23 100644
@@ -14,7 +14,7 @@ PV = "0.2+git${SRCPV}"
 
 inherit native
 
-SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git"
+SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;branch=master"
 S = "${WORKDIR}/git"
 UPSTREAM_CHECK_COMMITS = "1"
 
meta/recipes-kernel/kmod/kmod.inc +1 -1
index c2d550acaf..d527887b78 100644
@@ -19,7 +19,7 @@ SRCREV = "b6ecfc916a17eab8f93be5b09f4e4f845aabd3d1"
 # Lookout for PV bump too when SRCREV is changed
 PV = "29"
 
-SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
+SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master \
            file://depmod-search.conf \
            file://avoid_parallel_tests.patch \
            "
meta/recipes-kernel/powertop/powertop_2.14.bb +1 -1
index c176cba388..4ec218d6de 100644
@@ -6,7 +6,7 @@ DEPENDS = "ncurses libnl pciutils autoconf-archive"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
-SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \
+SRC_URI = "git://github.com/fenrus75/powertop;protocol=https;branch=master \
     file://0001-wakeup_xxx.h-include-limits.h.patch \
 "
 SRCREV = "52f022f9bbe6e060fba11701d657a8d9762702ba"
meta/recipes-kernel/systemtap/systemtap_git.inc +1 -1
index b6ff98f0f2..25546f7cb2 100644
@@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRCREV = "7f6992539fb22c93c21ac30c94508bf655d496a7"
 PV = "4.5"
 
-SRC_URI = "git://sourceware.org/git/systemtap.git \
+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 \
meta/recipes-sato/l3afpad/l3afpad_git.bb +1 -1
index f19d03896b..034e19dc7a 100644
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 DEPENDS = "gtk+3 intltool-native gettext-native"
 
 PV = "0.8.18.1.11+git${SRCPV}"
-SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git"
+SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git;branch=master"
 SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff"
 
 S = "${WORKDIR}/git"
meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +1 -1
index d5fe9b5dce..8f3151bfc9 100644
@@ -11,7 +11,7 @@ RDEPENDS:${PN} = "settings-daemon"
 
 # SRCREV tagged 0.2
 SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa"
-SRC_URI = "git://git.yoctoproject.org/${BPN} \
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
            file://no-handed.patch"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb +1 -1
index 79ccb0391b..c85f0440b1 100644
@@ -13,7 +13,7 @@ SECTION = "x11/wm"
 
 # SRCREV tagged 2.2
 SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777"
-SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \
+SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master \
            file://vfolders/ \
            "
 
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb +1 -1
index c6de14e34e..49f9fdbb36 100644
@@ -23,7 +23,7 @@ RPROVIDES:${PN} = "matchbox-panel"
 RREPLACES:${PN} = "matchbox-panel"
 RCONFLICTS:${PN} = "matchbox-panel"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN} \
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
            file://0001-applets-systray-Allow-icons-to-be-smaller.patch \
            "
 
meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +1 -1
index 9f00281dde..e2e81c2905 100644
@@ -11,7 +11,7 @@ SECTION = "x11/utils"
 
 #SRCREV tagged 0.2
 SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5"
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"
meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb +1 -1
index 7a043d3447..bc4024736f 100644
@@ -2,7 +2,7 @@ require matchbox-theme-sato.inc
 
 # SRCREV tagged 0.2
 SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78"
-SRC_URI = "git://git.yoctoproject.org/matchbox-sato"
+SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"
meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb +1 -1
index b2913b4ed5..7fd9272bf4 100644
@@ -11,7 +11,7 @@ DEPENDS = "matchbox-panel-2 gtk+3"
 
 # SRCREV tagged 0.3
 SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756"
-SRC_URI = "git://git.yoctoproject.org/screenshot"
+SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"
meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +1 -1
index 742364f699..77ecd3fe9f 100644
@@ -9,7 +9,7 @@ SECTION = "x11"
 
 # SRCREV tagged 0.0.2
 SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2"
-SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \
+SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master \
            file://addsoundkeys.patch \
            file://70settings-daemon.sh \
            "
meta/recipes-support/bmap-tools/bmap-tools_3.6.bb +1 -1
index c830a92776..37cec13842 100644
@@ -9,7 +9,7 @@ SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/intel/${BPN}"
+SRC_URI = "git://github.com/intel/${BPN};branch=master"
 
 SRCREV = "c0673962a8ec1624b5189dc1d24f33fe4f06785a"
 S = "${WORKDIR}/git"
meta/recipes-support/boost/boost-build-native_4.4.1.bb +1 -1
index 2de05369a8..de566eeb82 100644
@@ -6,7 +6,7 @@ SECTION = "devel"
 LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
-SRC_URI = "git://github.com/boostorg/build;protocol=https"
+SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master"
 SRCREV = "76da80f33187a3d9e5336157cdfae12ce82e37eb"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+){2,}))"
meta/recipes-support/ca-certificates/ca-certificates_20211016.bb +1 -1
index 0bb192cf0d..dbee7dc616 100644
@@ -16,7 +16,7 @@ PACKAGE_WRITE_DEPS += "openssl-native debianutils-native"
 
 SRCREV = "07de54fdcc5806bde549e1edf60738c6bccf50e8"
 
-SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \
+SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https;branch=master \
            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 \
meta/recipes-support/dos2unix/dos2unix_7.4.2.bb +1 -1
index 15d097ebed..509a0a0ddc 100644
@@ -8,7 +8,7 @@ SECTION = "support"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=8a7c3499a1142df819e727253cd53a12"
 
-SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix"
+SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix;branch=master"
 UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P<pver>(\d+(\.\d+)+))"
 
 SRCREV = "72596f0ae21faa25a07a872d4843bc885475115d"
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb +1 -1
index 10200f539f..8cd27e9075 100644
@@ -9,7 +9,7 @@ LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9da2ffcf7707dc11151fe007f4"
 
-SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http \
+SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http;branch=master \
            file://0001-fix-non-literal-format-string-issue-with-clang.patch \
           "
 SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7"
meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb +1 -1
index d9fbb5e9d6..f740e4a729 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1c94a9d191202a5552f381a023551396 \
                     file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \
                     file://LICENSE.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \
                     "
-SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \
+SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master \
            file://0001-Makefile-restore-build-reproducibility.patch \
            "
 SRCREV = "409828cfccf4b3b07edc40a7840a821ce074e2c3"
meta/recipes-support/numactl/numactl_git.bb +1 -1
index 7b1b14d1d5..66e826304f 100644
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e
 SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d"
 PV = "2.0.14"
 
-SRC_URI = "git://github.com/numactl/numactl \
+SRC_URI = "git://github.com/numactl/numactl;branch=master \
            file://Fix-the-test-output-format.patch \
            file://Makefile \
            file://run-ptest \
meta/recipes-support/p11-kit/p11-kit_0.24.0.bb +1 -1
index 9cac87ed32..d8330f460c 100644
@@ -10,7 +10,7 @@ DEPENDS = "libtasn1 libtasn1-native libffi"
 
 DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
 
-SRC_URI = "git://github.com/p11-glue/p11-kit"
+SRC_URI = "git://github.com/p11-glue/p11-kit;branch=master"
 SRCREV = "34826623f58399b24c21f1788e2cdaea34521b7b"
 S = "${WORKDIR}/git"
 
meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb +1 -1
index 23ab48ba2b..72922d8453 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 SRCREV = "bcb82804daa8f725b6add259dcef2067e61a75aa"
 PV .= "+git${SRCPV}"
 
-SRC_URI = "git://git.yoctoproject.org/ptest-runner2 \
+SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master \
 "
 
 S = "${WORKDIR}/git"
meta/recipes-support/rng-tools/rng-tools_6.14.bb +1 -1
index 6b79a3b040..72d1e3f3db 100644
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "sysfsutils openssl"
 
-SRC_URI = "git://github.com/nhorman/rng-tools.git \
+SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master \
            file://init \
            file://default \
            file://rngd.service \
meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +1 -1
index b2b830cc1f..2dca36a7df 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native"
 
-SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https"
+SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master"
 SRCREV = "18e558fa1c8b90b86757ade09a4ba4d6a6cf8f70"
 PV = "2.1"
 S = "${WORKDIR}/git"
meta/recipes-support/vim/vim.inc +1 -1
index db1e9caf4d..616b38b28b 100644
@@ -11,7 +11,7 @@ RSUGGESTS:${PN} = "diffutils"
 LICENSE = "vim"
 LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a"
 
-SRC_URI = "git://github.com/vim/vim.git \
+SRC_URI = "git://github.com/vim/vim.git;branch=master \
            file://disable_acl_header_check.patch \
            file://vim-add-knob-whether-elf.h-are-checked.patch \
            file://0001-src-Makefile-improve-reproducibility.patch \
scripts/contrib/convert-srcuri.py new file +63 -0

63 lines not on this page · raw message

Signature · 1 line
2.31.1
#23 lore raw

PATCH 23/26 meta/scripts: Manual git url branch additions

In reply to Anuj Mittal

From: Richard Purdie <[email protected]>

Following the scripted conversion adding branches to git://
SRC_URI entries, add the remaining references, mainly in the selftests and recipetool.

(cherry picked from commit 5340c0d688036c1be6c938f05d8a8c1e3b49ec38)
---
 meta/conf/distro/include/default-distrovars.inc | 2 +-
 meta/lib/oeqa/selftest/cases/devtool.py         | 4 ++--
 meta/lib/oeqa/selftest/cases/recipetool.py      | 6 +++---
 meta/lib/oeqa/selftest/cases/sstatetests.py     | 2 +-
 scripts/lib/recipetool/create.py                | 3 +++
 5 files changed, 10 insertions(+), 7 deletions(-)
meta/conf/distro/include/default-distrovars.inc +1 -1
index f91df632d5..fb0f1097da 100644
@@ -53,5 +53,5 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}"
 # The CONNECTIVITY_CHECK_URIS are used to test whether we can succesfully
 # fetch from the network (and warn you if not). To disable the test set
 # the variable to be empty.
-# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master
+# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master;branch=master
 CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/"
meta/lib/oeqa/selftest/cases/devtool.py +2 -2
index f495e84c79..d2b31af80e 100644
@@ -340,7 +340,7 @@ class DevtoolAddTests(DevtoolBase):
         checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
         checkvars['S'] = '${WORKDIR}/git'
         checkvars['PV'] = '0.1+git${SRCPV}'
-        checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https'
+        checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https;branch=master'
         checkvars['SRCREV'] = srcrev
         checkvars['DEPENDS'] = set(['dbus'])
         self._test_recipe_contents(recipefile, checkvars, [])
@@ -904,7 +904,7 @@ class DevtoolUpdateTests(DevtoolBase):
         self._check_repo_status(os.path.dirname(recipefile), expected_status)
 
         result = runCmd('git diff %s' % os.path.basename(recipefile), cwd=os.path.dirname(recipefile))
-        addlines = ['SRCREV = ".*"', 'SRC_URI = "git://git.infradead.org/mtd-utils.git"']
+        addlines = ['SRCREV = ".*"', 'SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master"']
         srcurilines = src_uri.split()
         srcurilines[0] = 'SRC_URI = "' + srcurilines[0]
         srcurilines.append('"')
meta/lib/oeqa/selftest/cases/recipetool.py +3 -3
index c2a53815d0..8dc00ac10e 100644
@@ -357,7 +357,7 @@ class RecipetoolTests(RecipetoolBase):
         tempsrc = os.path.join(self.tempdir, 'srctree')
         os.makedirs(tempsrc)
         recipefile = os.path.join(self.tempdir, 'libmatchbox.bb')
-        srcuri = 'git://git.yoctoproject.org/libmatchbox'
+        srcuri = 'git://git.yoctoproject.org/libmatchbox;branch=master'
         result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc])
         self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output)
         checkvars = {}
@@ -447,7 +447,7 @@ class RecipetoolTests(RecipetoolBase):
         self.assertTrue(os.path.isfile(recipefile))
         checkvars = {}
         checkvars['LICENSE'] = set(['Apache-2.0'])
-        checkvars['SRC_URI'] = 'git://github.com/mesonbuild/meson;protocol=https'
+        checkvars['SRC_URI'] = 'git://github.com/mesonbuild/meson;protocol=https;branch=master'
         inherits = ['setuptools3']
         self._test_recipe_contents(recipefile, checkvars, inherits)
 
@@ -514,7 +514,7 @@ class RecipetoolTests(RecipetoolBase):
         self.assertTrue(os.path.isfile(recipefile))
         checkvars = {}
         checkvars['LICENSE'] = set(['GPLv2'])
-        checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/matchbox-terminal;protocol=http'
+        checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/matchbox-terminal;protocol=http;branch=master'
         inherits = ['pkgconfig', 'autotools']
         self._test_recipe_contents(recipefile, checkvars, inherits)
 
meta/lib/oeqa/selftest/cases/sstatetests.py +1 -1
index 874f439282..7e0ed0dac1 100644
@@ -39,7 +39,7 @@ class SStateTests(SStateBase):
 
         recipefile = os.path.join(tempdir, "recipes-test", "dbus-wait-test", 'dbus-wait-test_git.bb')
         os.makedirs(os.path.dirname(recipefile))
-        srcuri = 'git://' + srcdir + ';protocol=file'
+        srcuri = 'git://' + srcdir + ';protocol=file;branch=master'
         result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri])
         self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output)
 
scripts/lib/recipetool/create.py +3 -0
index 5cd72ea0a7..a6607b97c6 100644
@@ -389,6 +389,9 @@ def reformat_git_uri(uri):
                 parms.update({('protocol', 'ssh')})
         elif (scheme == "http" or scheme == 'https' or scheme == 'ssh') and not ('protocol' in parms):
             parms.update({('protocol', scheme)})
+        # We assume 'master' branch if not set
+        if not 'branch' in parms:
+            parms.update({('branch', 'master')})
         # Always append 'git://'
         fUrl = bb.fetch2.encodeurl(('git', host, path, user, pswd, parms))
         return fUrl
Signature · 1 line
2.31.1
#24 lore raw

PATCH 24/26 scripts/convert-srcuri: Update SRC_URI conversion script to handle github url changes

In reply to Anuj Mittal

From: Richard Purdie <[email protected]>

Github are dropping support for git:// protocol fetching. Update the script to learn about corner cases found in the previous conversion and support remapping the github urls as needed too.

(cherry picked from commit e59fe8279b209f67ff79b9d6dbb69389a64db236)
---
 scripts/contrib/convert-srcuri.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
scripts/contrib/convert-srcuri.py +15 -1
index 4bf9e3013d..5b362ea2e8 100755
@@ -19,19 +19,33 @@ if len(sys.argv) < 2:
     sys.exit(1)
 
 def processfile(fn):
+    def matchline(line):
+        if "MIRROR" in line or ".*" in line or "GNOME_GIT" in line:
+            return False
+        return True
     print("processing file '%s'" % fn)
     try:
+        if "distro_alias.inc" in fn or "linux-yocto-custom.bb" in fn:
+            return
         fh, abs_path = tempfile.mkstemp()
         modified = False
         with os.fdopen(fh, 'w') as new_file:
             with open(fn, "r") as old_file:
                 for line in old_file:
-                    if ("git://" in line or "gitsm://" in line) and "branch=" not in line and "MIRROR" not in line and ".*" not in line:
+                    if ("git://" in line or "gitsm://" in line) and "branch=" not in line and matchline(line):
                         if line.endswith('"\n'):
                             line = line.replace('"\n', ';branch=master"\n')
                         elif line.endswith(" \\\n"):
                             line = line.replace(' \\\n', ';branch=master \\\n')
                         modified = True
+                    if ("git://" in line or "gitsm://" in line) and "github.com" in line and "protocol=https" not in line and matchline(line):
+                        if "protocol=git" in line:
+                            line = line.replace('protocol=git', 'protocol=https')
+                        elif line.endswith('"\n'):
+                            line = line.replace('"\n', ';protocol=https"\n')
+                        elif line.endswith(" \\\n"):
+                            line = line.replace(' \\\n', ';protocol=https \\\n')
+                        modified = True
                     new_file.write(line)
         if modified:
             shutil.copymode(fn, abs_path)
Signature · 1 line
2.31.1
#25 lore raw

PATCH 25/26 recipes: Update github.com urls to use https

In reply to Anuj Mittal

From: Richard Purdie <[email protected]>

Github has announced there will be no more git:// fetching from their servers:

https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git

and they're about to start having brownout periods to encourage people to update. This runs the conversion script over OE-Core to update our urls to use https instead of git.

(cherry picked from commit b37b61e9a1e448a34957db9ae39285d21352552e)
---
 meta/recipes-bsp/efivar/efivar_37.bb                            | 2 +-
 meta/recipes-bsp/opensbi/opensbi_0.9.bb                         | 2 +-
 meta/recipes-connectivity/connman/connman-gnome_0.7.bb          | 2 +-
 meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.15.1.bb     | 2 +-
 meta/recipes-connectivity/libuv/libuv_1.42.0.bb                 | 2 +-
 meta/recipes-core/fts/fts_1.2.7.bb                              | 2 +-
 meta/recipes-core/glibc/cross-localedef-native_2.34.bb          | 2 +-
 meta/recipes-core/libxcrypt/libxcrypt.inc                       | 2 +-
 meta/recipes-core/musl/libucontext_git.bb                       | 2 +-
 meta/recipes-core/musl/musl-obstack.bb                          | 2 +-
 meta/recipes-core/musl/musl-utils.bb                            | 2 +-
 meta/recipes-core/systemd/systemd.inc                           | 2 +-
 meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb           | 2 +-
 meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb       | 2 +-
 meta/recipes-devtools/distcc/distcc_3.4.bb                      | 2 +-
 meta/recipes-devtools/dnf/dnf_4.8.0.bb                          | 2 +-
 meta/recipes-devtools/file/file_5.40.bb                         | 2 +-
 meta/recipes-devtools/libcomps/libcomps_0.1.17.bb               | 2 +-
 meta/recipes-devtools/libdnf/libdnf_0.63.1.bb                   | 2 +-
 meta/recipes-devtools/librepo/librepo_1.14.1.bb                 | 2 +-
 meta/recipes-devtools/llvm/llvm_git.bb                          | 2 +-
 meta/recipes-devtools/ninja/ninja_1.10.2.bb                     | 2 +-
 meta/recipes-devtools/rpm/rpm_4.16.1.3.bb                       | 2 +-
 meta/recipes-extended/iputils/iputils_20210722.bb               | 2 +-
 meta/recipes-extended/libnsl/libnsl2_git.bb                     | 2 +-
 meta/recipes-extended/libnss-nis/libnss-nis.bb                  | 2 +-
 meta/recipes-extended/libsolv/libsolv_0.7.19.bb                 | 2 +-
 meta/recipes-extended/ltp/ltp_20210524.bb                       | 2 +-
 meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb              | 2 +-
 meta/recipes-extended/sysklogd/sysklogd_2.2.3.bb                | 2 +-
 meta/recipes-extended/zstd/zstd_1.5.0.bb                        | 2 +-
 meta/recipes-graphics/libva/libva-utils_2.12.0.bb               | 2 +-
 meta/recipes-graphics/spir/spirv-tools_2021.2.bb                | 2 +-
 meta/recipes-graphics/vulkan/vulkan-headers_1.2.182.0.bb        | 2 +-
 meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb         | 2 +-
 meta/recipes-graphics/vulkan/vulkan-samples_git.bb              | 2 +-
 meta/recipes-graphics/vulkan/vulkan-tools_1.2.182.0.bb          | 2 +-
 .../recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 2 +-
 meta/recipes-kernel/cryptodev/cryptodev.inc                     | 2 +-
 meta/recipes-multimedia/x264/x264_git.bb                        | 2 +-
 meta/recipes-sato/l3afpad/l3afpad_git.bb                        | 2 +-
 meta/recipes-support/bmap-tools/bmap-tools_3.6.bb               | 2 +-
 meta/recipes-support/libgit2/libgit2_1.1.1.bb                   | 2 +-
 meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb | 2 +-
 meta/recipes-support/libseccomp/libseccomp_2.5.1.bb             | 2 +-
 meta/recipes-support/lz4/lz4_1.9.3.bb                           | 2 +-
 meta/recipes-support/numactl/numactl_git.bb                     | 2 +-
 meta/recipes-support/p11-kit/p11-kit_0.24.0.bb                  | 2 +-
 meta/recipes-support/rng-tools/rng-tools_6.14.bb                | 2 +-
 meta/recipes-support/vim/vim.inc                                | 2 +-
 meta/recipes-support/xxhash/xxhash_0.8.0.bb                     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)
meta/recipes-bsp/efivar/efivar_37.bb +1 -1
index 6340020cef..fc36913f30 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
 
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
-SRC_URI = "git://github.com/rhinstaller/efivar.git;branch=master \
+SRC_URI = "git://github.com/rhinstaller/efivar.git;branch=master;protocol=https \
            file://determinism.patch \
            file://no-werror.patch"
 SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10"
meta/recipes-bsp/opensbi/opensbi_0.9.bb +1 -1
index cb9f346dc0..1956fbf9ff 100644
@@ -9,7 +9,7 @@ require opensbi-payloads.inc
 inherit autotools-brokensep deploy
 
 SRCREV = "234ed8e427f4d92903123199f6590d144e0d9351"
-SRC_URI = "git://github.com/riscv/opensbi.git;branch=master \
+SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \
            file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
           "
 
meta/recipes-connectivity/connman/connman-gnome_0.7.bb +1 -1
index eb6d1f7181..7e1619aab2 100644
@@ -10,7 +10,7 @@ DEPENDS = "gtk+3 dbus-glib dbus-glib-native intltool-native gettext-native"
 
 # 0.7 tag
 SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"
-SRC_URI = "git://github.com/connectivity/connman-gnome.git;branch=master \
+SRC_URI = "git://github.com/connectivity/connman-gnome.git;branch=master;protocol=https \
            file://0001-Removed-icon-from-connman-gnome-about-applet.patch \
            file://null_check_for_ipv4_config.patch \
            file://images/ \
meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.15.1.bb +1 -1
index cfe474d72e..f5c87f7291 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "avahi"
 
-SRC_URI = "git://github.com/lathiat/nss-mdns;branch=master \
+SRC_URI = "git://github.com/lathiat/nss-mdns;branch=master;protocol=https \
            "
 
 SRCREV = "4b3cfe818bf72d99a02b8ca8b8813cb2d6b40633"
meta/recipes-connectivity/libuv/libuv_1.42.0.bb +1 -1
index 169bd6206b..2dfbb8b895 100644
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47"
 
 SRCREV = "6ce14710da7079eb248868171f6343bc409ea3a4"
-SRC_URI = "git://github.com/libuv/libuv;branch=v1.x"
+SRC_URI = "git://github.com/libuv/libuv;branch=v1.x;protocol=https"
 
 S = "${WORKDIR}/git"
 
meta/recipes-core/fts/fts_1.2.7.bb +1 -1
index f907a35a90..d3b0f31eda 100644
@@ -10,7 +10,7 @@ SECTION = "libs"
 
 SRCREV = "0bde52df588e8969879a2cae51c3a4774ec62472"
 
-SRC_URI = "git://github.com/pullmoll/musl-fts.git;branch=master"
+SRC_URI = "git://github.com/pullmoll/musl-fts.git;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
 
meta/recipes-core/glibc/cross-localedef-native_2.34.bb +1 -1
index 6100f3d4c4..482e53cf5d 100644
@@ -20,7 +20,7 @@ inherit native
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
 
 SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
-           git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
+           git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef;protocol=https \
            \
            file://0001-localedef-Add-hardlink-resolver-from-util-linux.patch \
            file://0002-localedef-fix-ups-hardlink-to-make-it-compile.patch \
meta/recipes-core/libxcrypt/libxcrypt.inc +1 -1
index 29b941d380..0411de3637 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=afed27a72ae2a8075978299eebaa1f5d \
 
 inherit autotools pkgconfig
 
-SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
 SRCREV = "b9116ef2245abb128a22a975d187b1272312a80c"
 SRCBRANCH ?= "develop"
 
meta/recipes-core/musl/libucontext_git.bb +1 -1
index 1a8d1c4b21..9061cf0b1b 100644
@@ -10,7 +10,7 @@ DEPENDS = ""
 
 PV = "1.1+${SRCPV}"
 SRCREV = "335ee864ef6f4a5d4b525453fd9dbfb3507cfecc"
-SRC_URI = "git://github.com/kaniini/libucontext;branch=master \
+SRC_URI = "git://github.com/kaniini/libucontext;branch=master;protocol=https \
            file://0001-meson-Add-option-to-pass-cpu.patch \
            "
 
meta/recipes-core/musl/musl-obstack.bb +1 -1
index 3748047496..74de48c2cd 100644
@@ -10,7 +10,7 @@ SECTION = "libs"
 
 PV = "1.1"
 SRCREV = "d2ad66b0df44a4b784956f7f7f2717131ddc05f4"
-SRC_URI = "git://github.com/pullmoll/musl-obstack;branch=master"
+SRC_URI = "git://github.com/pullmoll/musl-obstack;branch=master;protocol=https"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
meta/recipes-core/musl/musl-utils.bb +1 -1
index fa49d1da04..00d088d089 100644
@@ -11,7 +11,7 @@ SECTION = "utils"
 PV = "20170421"
 
 SRCREV = "fb5630138ccabbbc14a19d372096a04e42573c7d"
-SRC_URI = "git://github.com/boltlinux/musl-utils;branch=master"
+SRC_URI = "git://github.com/boltlinux/musl-utils;branch=master;protocol=https"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
meta/recipes-core/systemd/systemd.inc +1 -1
index 05341724f4..13b8b61af6 100644
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
 
 SRCREV = "090378dcb1de5ca66900503210e85d63075fa70a"
 SRCBRANCH = "v249-stable"
-SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \
+SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
 "
 
 S = "${WORKDIR}/git"
meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +1 -1
index 6ef5298a3b..59fcd8c78a 100644
@@ -90,7 +90,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
 
-SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master \
+SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \
            file://bootchartd_stop.sh \
            file://0001-collector-Allocate-space-on-heap-for-chunks.patch \
            file://0001-bootchart2-support-usrmerge.patch \
meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb +1 -1
index 68284a1190..7a9656bf86 100644
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/rpm-software-management/createrepo_c/wiki"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master \
+SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \
            file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            "
 
meta/recipes-devtools/distcc/distcc_3.4.bb +1 -1
index c1cce24d11..93983f6aee 100644
@@ -15,7 +15,7 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
 
 RRECOMMENDS:${PN}-server = "avahi-daemon"
 
-SRC_URI = "git://github.com/distcc/distcc.git;branch=master \
+SRC_URI = "git://github.com/distcc/distcc.git;branch=master;protocol=https \
            file://default \
            file://distcc \
            file://distcc.service \
meta/recipes-devtools/dnf/dnf_4.8.0.bb +1 -1
index 9929da6fa4..9070077270 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \
                     "
 
-SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master \
+SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protocol=https \
            file://0001-Corretly-install-tmpfiles.d-configuration.patch \
            file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
            file://0005-Do-not-prepend-installroot-to-logdir.patch \
meta/recipes-devtools/file/file_5.40.bb +1 -1
index 3c083be192..0360eb5ec7 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd
 DEPENDS = "file-replacement-native"
 DEPENDS:class-native = "bzip2-replacement-native"
 
-SRC_URI = "git://github.com/file/file.git;branch=master"
+SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https"
 
 SRCREV = "f49fda6f52a9477d817dbd9c06afab02daf025f8"
 S = "${WORKDIR}/git"
meta/recipes-devtools/libcomps/libcomps_0.1.17.bb +1 -1
index 1a59fc1a7b..09861d9c26 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "Libcomps is alternative for yum.comps library. It's written in pu
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master \
+SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \
            file://0001-Add-crc32.c-to-sources-list.patch \
            file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            "
meta/recipes-devtools/libdnf/libdnf_0.63.1.bb +1 -1
index 282c28e2c4..6294509d2e 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "This library provides a high level package-manager. It's core lib
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
+SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;protocol=https \
            file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \
            file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
            file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
meta/recipes-devtools/librepo/librepo_1.14.1.bb +1 -1
index 19a2bd612e..cdb5946905 100644
@@ -5,7 +5,7 @@ DESCRIPTION = "${SUMMARY}"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master \
+SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https \
            file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \
            file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
            "
meta/recipes-devtools/llvm/llvm_git.bb +1 -1
index 4167080653..d9efa53499 100644
@@ -28,7 +28,7 @@ LLVM_DIR = "llvm${LLVM_RELEASE}"
 
 BRANCH = "release/${MAJOR_VERSION}.x"
 SRCREV = "fed41342a82f5a3a9201819a82bf7a48313e296b"
-SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
+SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \
            file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \
            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 \
meta/recipes-devtools/ninja/ninja_1.10.2.bb +1 -1
index c908bcb738..7270321d6e 100644
@@ -8,7 +8,7 @@ DEPENDS = "re2c-native ninja-native"
 
 SRCREV = "e72d1d581c945c158ed68d9bc48911063022a2c6"
 
-SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release"
+SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
 
 S = "${WORKDIR}/git"
meta/recipes-devtools/rpm/rpm_4.16.1.3.bb +1 -1
index aa6b5ee8aa..cb15415d7f 100644
@@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f"
 
-SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \
+SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x;protocol=https \
            file://environment.d-rpm.sh \
            file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \
            file://0001-Do-not-read-config-files-from-HOME.patch \
meta/recipes-extended/iputils/iputils_20210722.bb +1 -1
index c92bc830bc..d81f787dd8 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390"
 
 DEPENDS = "gnutls"
 
-SRC_URI = "git://github.com/iputils/iputils;branch=master \
+SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
            file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
            file://0001-meson-Make-tests-optional.patch \
            "
meta/recipes-extended/libnsl/libnsl2_git.bb +1 -1
index 6194d90177..3f6ccbad70 100644
@@ -14,7 +14,7 @@ PV = "2.0.0"
 
 SRCREV = "82245c0c58add79a8e34ab0917358217a70e5100"
 
-SRC_URI = "git://github.com/thkukuk/libnsl;branch=master \
+SRC_URI = "git://github.com/thkukuk/libnsl;branch=master;protocol=https \
           "
 
 S = "${WORKDIR}/git"
meta/recipes-extended/libnss-nis/libnss-nis.bb +1 -1
index bc2e292f40..478e9e2be3 100644
@@ -17,7 +17,7 @@ PV = "3.1+git${SRCPV}"
 
 SRCREV = "062f31999b35393abf7595cb89dfc9590d5a42ad"
 
-SRC_URI = "git://github.com/thkukuk/libnss_nis;branch=master \
+SRC_URI = "git://github.com/thkukuk/libnss_nis;branch=master;protocol=https \
           "
 
 S = "${WORKDIR}/git"
meta/recipes-extended/libsolv/libsolv_0.7.19.bb +1 -1
index 768682f885..a3a4fc7896 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
 
 DEPENDS = "expat zlib"
 
-SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master \
+SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \
 "
 
 SRCREV = "c773294be6b0a2425f344a8999f173fb00cfd16f"
meta/recipes-extended/ltp/ltp_20210524.bb +1 -1
index b728dffc19..0636cb92cb 100644
@@ -29,7 +29,7 @@ CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
 SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd"
 
-SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master \
+SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \
            file://0001-Remove-OOM-tests-from-runtest-mm.patch \
            file://0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch \
            "
meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb +1 -1
index 81bd40bf61..c08e9d52c3 100644
@@ -19,7 +19,7 @@ PV = "1.4.2"
 
 SRCREV = "6f54e54455c073d08a56ea627c6cd2355a40eb53"
 
-SRC_URI = "git://github.com/thkukuk/${BPN};branch=master \
+SRC_URI = "git://github.com/thkukuk/${BPN};branch=master;protocol=https \
            file://0001-Use-cross-compiled-rpcgen.patch \
           "
 
meta/recipes-extended/sysklogd/sysklogd_2.2.3.bb +1 -1
index eca531d05d..f4ecb7d459 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \
 
 inherit update-rc.d update-alternatives systemd autotools
 
-SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
+SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1;protocol=https \
            file://sysklogd \
            "
 
meta/recipes-extended/zstd/zstd_1.5.0.bb +1 -1
index 978812fddb..51305d0562 100644
@@ -9,7 +9,7 @@ LICENSE = "BSD-3-Clause & GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \
                     file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
 
-SRC_URI = "git://github.com/facebook/zstd.git;branch=release \
+SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \
            file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \
            file://0001-MinGW-Build-Fixes.patch \
            "
meta/recipes-graphics/libva/libva-utils_2.12.0.bb +1 -1
index 096d80b68d..3550ad0c59 100644
@@ -14,7 +14,7 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
 
-SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.11-branch"
+SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.11-branch;protocol=https"
 SRCREV = "c0145a895ebe9b24cde5c441733f90482f1e3d71"
 S = "${WORKDIR}/git"
 
meta/recipes-graphics/spir/spirv-tools_2021.2.bb +1 -1
index a22ceb6bfd..314ab0c1a1 100644
@@ -8,7 +8,7 @@ LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "e198c6a785d388db68eb9166b43ac5e5208fd5cc"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master \
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https \
            file://0001-fix-strncpy-bound-error.patch \
           "
 UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
meta/recipes-graphics/vulkan/vulkan-headers_1.2.182.0.bb +1 -1
index 5ae56ec076..26f4f58b26 100644
@@ -9,7 +9,7 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
 
 SRCREV = "37164a5726f7e6113810f9557903a117498421cf"
 
meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb +1 -1
index eb16c547b7..41632f25ce 100644
@@ -9,7 +9,7 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=master \
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=master;protocol=https \
            "
 SRCREV = "1896143df69d439b0933c1bb485f5a4587bdf2dc"
 
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +1 -1
index 4827e3a22c..c1ffc7ecde 100644
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
 
-SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master \
+SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https \
            file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \
            file://debugfix.patch \
            "
meta/recipes-graphics/vulkan/vulkan-tools_1.2.182.0.bb +1 -1
index d0a298ecfc..b7966f6333 100644
@@ -6,7 +6,7 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.182"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.182;protocol=https"
 SRCREV = "9d3305731c3be8de05c9f223a79959d448506a37"
 
 S = "${WORKDIR}/git"
meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +1 -1
index 2553d89529..49c42bd68a 100644
@@ -12,7 +12,7 @@ inherit autotools pkgconfig features_check
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRCREV = "18ec53f1cada39f905614ebfaffed5c7754ecf46"
-SRC_URI = "git://github.com/kreijack/xinput_calibrator.git;branch=libinput \
+SRC_URI = "git://github.com/kreijack/xinput_calibrator.git;branch=libinput;protocol=https \
            file://30xinput_calibrate.sh \
            file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \
            file://0001-calibrator.hh-Include-string-to-get-std-string.patch \
meta/recipes-kernel/cryptodev/cryptodev.inc +1 -1
index e4a7922ad1..6ada0b0295 100644
@@ -8,7 +8,7 @@ API is compatible with OpenBSD's cryptodev userspace API (/dev/crypto)."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux;branch=master \
+SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux;branch=master;protocol=https \
            "
 SRCREV = "e0c25e289d6baf1d83c2b9cb523d3bc237d0c0c9"
 
meta/recipes-multimedia/x264/x264_git.bb +1 -1
index 9f23794df1..c49e935d1c 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "nasm-native"
 
-SRC_URI = "git://github.com/mirror/x264;branch=stable \
+SRC_URI = "git://github.com/mirror/x264;branch=stable;protocol=https \
            file://don-t-default-to-cortex-a9-with-neon.patch \
            file://Fix-X32-build-by-disabling-asm.patch \
            "
meta/recipes-sato/l3afpad/l3afpad_git.bb +1 -1
index 034e19dc7a..50f6da24f3 100644
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 DEPENDS = "gtk+3 intltool-native gettext-native"
 
 PV = "0.8.18.1.11+git${SRCPV}"
-SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git;branch=master"
+SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git;branch=master;protocol=https"
 SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff"
 
 S = "${WORKDIR}/git"
meta/recipes-support/bmap-tools/bmap-tools_3.6.bb +1 -1
index 37cec13842..c66ff3a7da 100644
@@ -9,7 +9,7 @@ SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/intel/${BPN};branch=master"
+SRC_URI = "git://github.com/intel/${BPN};branch=master;protocol=https"
 
 SRCREV = "c0673962a8ec1624b5189dc1d24f33fe4f06785a"
 S = "${WORKDIR}/git"
meta/recipes-support/libgit2/libgit2_1.1.1.bb +1 -1
index ae30a7a100..fcf80e4809 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e"
 
 DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2"
 
-SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.1"
+SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.1;protocol=https"
 SRCREV = "8a0dc6783c340e61a44c179c48f832165ad2053c"
 
 S = "${WORKDIR}/git"
meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb +1 -1
index f740e4a729..b5d816f864 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1c94a9d191202a5552f381a023551396 \
                     file://LICENSE.gplv2;md5=eb723b61539feef013de476e68b5c50a \
                     file://LICENSE.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \
                     "
-SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master \
+SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https \
            file://0001-Makefile-restore-build-reproducibility.patch \
            "
 SRCREV = "409828cfccf4b3b07edc40a7840a821ce074e2c3"
meta/recipes-support/libseccomp/libseccomp_2.5.1.bb +1 -1
index 74bface4a1..27954ca6b1 100644
@@ -10,7 +10,7 @@ DEPENDS += "gperf-native"
 PV .= "+git${SRCPV}"
 SRCREV = "5822e50c2920ce597d038077dea4a0eedf193f86"
 
-SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=main \
+SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=main;protocol=https \
            file://0001-configure.ac-Bump-version-to-2.5.99.patch \
            file://0001-arch-Add-riscv32-architecture-support.patch \
            file://0002-Regenerate-syscall-cvs-file-from-5.13-rc5-kernel.patch \
meta/recipes-support/lz4/lz4_1.9.3.bb +1 -1
index b22eea3156..a3c48bccfb 100644
@@ -12,7 +12,7 @@ PE = "1"
 
 SRCREV = "d44371841a2f1728a3f36839fd4b7e872d0927d3"
 
-SRC_URI = "git://github.com/lz4/lz4.git;branch=release \
+SRC_URI = "git://github.com/lz4/lz4.git;branch=release;protocol=https \
            file://CVE-2021-3520.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
meta/recipes-support/numactl/numactl_git.bb +1 -1
index 66e826304f..19f2293a51 100644
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e
 SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d"
 PV = "2.0.14"
 
-SRC_URI = "git://github.com/numactl/numactl;branch=master \
+SRC_URI = "git://github.com/numactl/numactl;branch=master;protocol=https \
            file://Fix-the-test-output-format.patch \
            file://Makefile \
            file://run-ptest \
meta/recipes-support/p11-kit/p11-kit_0.24.0.bb +1 -1
index d8330f460c..7fe3c37fde 100644
@@ -10,7 +10,7 @@ DEPENDS = "libtasn1 libtasn1-native libffi"
 
 DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
 
-SRC_URI = "git://github.com/p11-glue/p11-kit;branch=master"
+SRC_URI = "git://github.com/p11-glue/p11-kit;branch=master;protocol=https"
 SRCREV = "34826623f58399b24c21f1788e2cdaea34521b7b"
 S = "${WORKDIR}/git"
 
meta/recipes-support/rng-tools/rng-tools_6.14.bb +1 -1
index 72d1e3f3db..222d7cc630 100644
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "sysfsutils openssl"
 
-SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master \
+SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \
            file://init \
            file://default \
            file://rngd.service \
meta/recipes-support/vim/vim.inc +1 -1
index 616b38b28b..50e215d20f 100644
@@ -11,7 +11,7 @@ RSUGGESTS:${PN} = "diffutils"
 LICENSE = "vim"
 LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a"
 
-SRC_URI = "git://github.com/vim/vim.git;branch=master \
+SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://disable_acl_header_check.patch \
            file://vim-add-knob-whether-elf.h-are-checked.patch \
            file://0001-src-Makefile-improve-reproducibility.patch \
meta/recipes-support/xxhash/xxhash_0.8.0.bb +1 -1
index 4e48365a71..686fbea591 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.xxhash.com/"
 LICENSE = "BSD-2-Clause & GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb"
 
-SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=git \
+SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=https \
            file://0001-Makefile-escape-special-regex-characters-in-paths.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.31.1
#26 lore raw

PATCH 26/26 go-helloworld/glide: Fix urls

In reply to Anuj Mittal

From: Richard Purdie <[email protected]>

Handle github protocol changes not covered by the script due to variable indirection.

(cherry picked from commit 3bb1cb476dbad1037522970af9afd69691a7033c)
---
 meta/recipes-devtools/glide/glide_0.13.3.bb            | 2 +-
 meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/glide/glide_0.13.3.bb +1 -1
index 1a69445816..db703c2d21 100644
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=54905cf894f8cc416a92f4fc350c35b2"
 
 GO_IMPORT = "github.com/Masterminds/glide"
-SRC_URI = "git://${GO_IMPORT};branch=master"
+SRC_URI = "git://${GO_IMPORT};branch=master;protocol=https"
 SRCREV = "8ed5b9292379d86c39592a7e6a58eb9c903877cf"
 
 inherit go
meta/recipes-extended/go-examples/go-helloworld_0.1.bb +1 -1
index 6e2687a083..4e582edcf1 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "https://golang.org/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-SRC_URI = "git://${GO_IMPORT};branch=master"
+SRC_URI = "git://${GO_IMPORT};branch=master;protocol=https"
 SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe"
 UPSTREAM_CHECK_COMMITS = "1"
 
Signature · 1 line
2.31.1