* [hardknott][PATCH 00/14] Review request
@ 2021-11-16 3:24 Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 01/14] linunistring: Add missing gperf-native dependency Anuj Mittal
` (14 more replies)
0 siblings, 15 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
Please review these changes for hardknott. No issues seen while testing
on autobuilder.
Thanks,
Anuj
The following changes since commit 0ca080a23c2770a15138f702d4c879bbd90ca360:
build-appliance-image: Update to hardknott head revision (2021-11-04 11:58:28 +0000)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib anujm/hardknott
Alexander Kanavin (2):
linux-firmware: upgrade 20210919 -> 20211027
cross-canadian: correct the location of pkg-config files
Anuj Mittal (2):
meta: add explicit branch and protocol to SRC_URI
llvm: bump HASHEQUIV_HASH_VERSION
Bruce Ashfield (2):
linux-yocto/5.10: update to v5.10.76
linux-yocto-rt/5.10: update to -rt54
Chen Qi (1):
avahi: update CVE id fixed by local-ping.patch
Jose Quaresma (1):
sstate: another fix for touching files inside pseudo
Manuel Leonhardt (1):
sstate: Account for reserved characters when shortening sstate
filenames
Richard Purdie (5):
linunistring: Add missing gperf-native dependency
pseudo: Add in ability to flush database with shutdown request
pseudo: Add fcntl64 wrapper
scripts/convert-srcuri: Backport SRC_URI conversion script from master
branch
meta/scripts: Manual git url branch additions
.../devtool/devtool-upgrade-test2_git.bb | 2 +-
.../devtool-upgrade-test2_git.bb.upgraded | 2 +-
.../git-submodule-test/git-submodule-test.bb | 2 +-
meta/classes/cross-canadian.bbclass | 2 +-
meta/classes/devupstream.bbclass | 2 +-
meta/classes/sstate.bbclass | 14 ++--
.../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.1.bb | 2 +-
meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +-
.../avahi/files/local-ping.patch | 1 +
.../connman/connman-gnome_0.7.bb | 2 +-
.../libnss-mdns/libnss-mdns_0.14.1.bb | 2 +-
.../libuv/libuv_1.41.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.33.bb | 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 +-
meta/recipes-core/netbase/netbase_6.2.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.10.1.bb | 2 +-
.../createrepo-c/createrepo-c_0.17.0.bb | 2 +-
meta/recipes-devtools/distcc/distcc_3.3.5.bb | 2 +-
meta/recipes-devtools/dnf/dnf_4.6.0.bb | 2 +-
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
meta/recipes-devtools/file/file_5.39.bb | 2 +-
meta/recipes-devtools/glide/glide_0.13.3.bb | 2 +-
.../gnu-config/gnu-config_git.bb | 2 +-
.../libcomps/libcomps_0.1.15.bb | 2 +-
meta/recipes-devtools/libdnf/libdnf_0.58.0.bb | 2 +-
.../librepo/librepo_1.13.0.bb | 2 +-
meta/recipes-devtools/llvm/llvm_git.bb | 6 +-
meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 +-
meta/recipes-devtools/ninja/ninja_1.10.2.bb | 2 +-
.../patchelf/patchelf_0.12.bb | 2 +-
meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
meta/recipes-devtools/rpm/rpm_4.16.1.3.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 +-
meta/recipes-extended/bzip2/bzip2_1.0.8.bb | 2 +-
.../go-examples/go-helloworld_0.1.bb | 2 +-
.../iputils/iputils_s20200821.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.17.bb | 2 +-
meta/recipes-extended/ltp/ltp_20210121.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 +-
.../sysklogd/sysklogd_2.2.2.bb | 2 +-
.../xinetd/xinetd_2.3.15.4.bb | 2 +-
meta/recipes-extended/zstd/zstd_1.4.9.bb | 2 +-
meta/recipes-gnome/libhandy/libhandy_1.2.0.bb | 2 +-
meta/recipes-gnome/libportal/libportal_0.3.bb | 2 +-
.../glslang/glslang_11.2.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.10.0.bb | 2 +-
.../matchbox-wm/matchbox-wm_1.2.2.bb | 2 +-
meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 2 +-
meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
.../spir/spirv-headers_1.5.4.bb | 2 +-
.../spir/spirv-tools_2020.7.bb | 2 +-
.../virglrenderer/virglrenderer_0.8.2.bb | 2 +-
meta/recipes-graphics/vulkan/assimp_5.0.1.bb | 2 +-
.../vulkan/vulkan-headers_1.2.170.0.bb | 2 +-
.../vulkan/vulkan-loader_1.2.170.0.bb | 2 +-
.../vulkan/vulkan-samples_git.bb | 2 +-
.../vulkan/vulkan-tools_1.2.170.0.bb | 2 +-
.../xinput-calibrator_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 +-
...20210919.bb => linux-firmware_20211027.bb} | 4 +-
.../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 +++---
meta/recipes-kernel/powertop/powertop_2.13.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.3.0.bb | 2 +-
.../ca-certificates_20211016.bb | 2 +-
.../dos2unix/dos2unix_7.4.2.bb | 2 +-
.../gnome-desktop-testing_2018.1.bb | 2 +-
meta/recipes-support/libgit2/libgit2_1.1.0.bb | 2 +-
.../libjitterentropy_3.0.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 +-
.../p11-kit/p11-kit_0.23.22.bb | 2 +-
.../ptest-runner/ptest-runner_2.4.2.bb | 2 +-
.../rng-tools/rng-tools_6.11.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 +
131 files changed, 239 insertions(+), 153 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20210919.bb => linux-firmware_20211027.bb} (99%)
create mode 100755 scripts/contrib/convert-srcuri.py
--
2.33.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* [hardknott][PATCH 01/14] linunistring: Add missing gperf-native dependency
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 02/14] pseudo: Add in ability to flush database with shutdown request Anuj Mittal
` (13 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 73d3efbaeb2f412ab8d3491d2da3f3124fc009f3)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-support/libunistring/libunistring_0.9.10.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.10.bb b/meta/recipes-support/libunistring/libunistring_0.9.10.bb
index 0a7b18ed08..589faacb05 100644
--- a/meta/recipes-support/libunistring/libunistring_0.9.10.bb
+++ b/meta/recipes-support/libunistring/libunistring_0.9.10.bb
@@ -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 \
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 02/14] pseudo: Add in ability to flush database with shutdown request
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 01/14] linunistring: Add missing gperf-native dependency Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 03/14] pseudo: Add fcntl64 wrapper Anuj Mittal
` (12 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Pulls in:
pseudo_db: Flush DB if there is a shutdown request
fcntl: Add support for fcntl F_GETPIPE_SZ and F_SETPIPE_SZ (test fix)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0882095d608ce3abbcc9814517434c21ea549063)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index f36dfa589f..6779db16d2 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -13,7 +13,7 @@ SRC_URI:append:class-nativesdk = " \
file://older-glibc-symbols.patch"
SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
-SRCREV = "21ff2fb690efbe57e7dd867c39aff36ab72a6ac5"
+SRCREV = "0cda3ba5f94aed8d50652a99ee9c502975aa2926"
S = "${WORKDIR}/git"
PV = "1.9.0+git${SRCPV}"
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 03/14] pseudo: Add fcntl64 wrapper
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 01/14] linunistring: Add missing gperf-native dependency Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 02/14] pseudo: Add in ability to flush database with shutdown request Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 04/14] sstate: Account for reserved characters when shortening sstate filenames Anuj Mittal
` (11 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f26867fe4daec7299f59a82ae4a0d70cceb3e082)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 6779db16d2..1a5d230c69 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -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}"
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 04/14] sstate: Account for reserved characters when shortening sstate filenames
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (2 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 03/14] pseudo: Add fcntl64 wrapper Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 05/14] linux-firmware: upgrade 20210919 -> 20211027 Anuj Mittal
` (10 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Manuel Leonhardt <mleonhardt@arri.de>
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.
Signed-off-by: Manuel Leonhardt <mleonhardt@arri.de>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c2e0e43b7123cf5149833e0072c8edaea3629112)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/sstate.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 4bc80b6078..957762db5c 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -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]
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 05/14] linux-firmware: upgrade 20210919 -> 20211027
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (3 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 04/14] sstate: Account for reserved characters when shortening sstate filenames Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 06/14] linux-yocto/5.10: update to v5.10.76 Anuj Mittal
` (9 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
License-Update: additional firmwares listed
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1ca3fb1c7f11e04bf8d8bf59901ddd60178cb13c)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
...{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%)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20210919.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20211027.bb
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 03eb1a29f0..76aed9d443 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20210919.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20211027.bb
@@ -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
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 06/14] linux-yocto/5.10: update to v5.10.76
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (4 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 05/14] linux-firmware: upgrade 20210919 -> 20211027 Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 07/14] linux-yocto-rt/5.10: update to -rt54 Anuj Mittal
` (8 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
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
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 61f8f7d18417334e3b13e4447f318107372dcfe0)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
.../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(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 86ddc455d0..2acb6c26f4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -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"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 3bcbf3b549..89c4329fc7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -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}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 3128ab131c..2c33a04df1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -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"
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 07/14] linux-yocto-rt/5.10: update to -rt54
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (5 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 06/14] linux-yocto/5.10: update to v5.10.76 Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 08/14] sstate: another fix for touching files inside pseudo Anuj Mittal
` (7 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
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
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 7c7dc8f38cf1e874a7722389c95d895e10855d9a)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 2acb6c26f4..6975bd16ae 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -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 \
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 08/14] sstate: another fix for touching files inside pseudo
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (6 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 07/14] linux-yocto-rt/5.10: update to -rt54 Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 09/14] avahi: update CVE id fixed by local-ping.patch Anuj Mittal
` (6 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Jose Quaresma <quaresma.jose@gmail.com>
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)
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5b9210d66c78bb3f79056e5586cea7b0edd714a9)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/sstate.bbclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 957762db5c..da29225983 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -863,12 +863,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"
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 09/14] avahi: update CVE id fixed by local-ping.patch
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (7 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 08/14] sstate: another fix for touching files inside pseudo Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 10/14] scripts/convert-srcuri: Backport SRC_URI conversion script from master branch Anuj Mittal
` (5 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
CVE-2021-36217 is treated as a duplicate of CVE-2021-3502.
Update the local-ping.patch to mark it resolve both.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4d75d6c39f1faeb38191b55f1fa9311b63fcfb29)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-connectivity/avahi/files/local-ping.patch | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/avahi/files/local-ping.patch b/meta/recipes-connectivity/avahi/files/local-ping.patch
index 94116ad1f3..29c192d296 100644
--- a/meta/recipes-connectivity/avahi/files/local-ping.patch
+++ b/meta/recipes-connectivity/avahi/files/local-ping.patch
@@ -1,4 +1,5 @@
CVE: CVE-2021-36217
+CVE: CVE-2021-3502
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 10/14] scripts/convert-srcuri: Backport SRC_URI conversion script from master branch
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (8 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 09/14] avahi: update CVE id fixed by local-ping.patch Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 11/14] meta: add explicit branch and protocol to SRC_URI Anuj Mittal
` (4 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
This script handles two emerging issues:
1. 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.
2. Github are dropping support for git:// protocol fetching, so remap github
urls as needed. For more details see:
https://github.blog/2021-09-01-improving-git-protocol-security-github/
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
scripts/contrib/convert-srcuri.py | 77 +++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
create mode 100755 scripts/contrib/convert-srcuri.py
diff --git a/scripts/contrib/convert-srcuri.py b/scripts/contrib/convert-srcuri.py
new file mode 100755
index 0000000000..5b362ea2e8
--- /dev/null
+++ b/scripts/contrib/convert-srcuri.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+#
+# Conversion script to update SRC_URI to add branch to git urls
+#
+# Copyright (C) 2021 Richard Purdie
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+
+import re
+import os
+import sys
+import tempfile
+import shutil
+import mimetypes
+
+if len(sys.argv) < 2:
+ print("Please specify a directory to run the conversion script against.")
+ 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 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)
+ os.remove(fn)
+ shutil.move(abs_path, fn)
+ except UnicodeDecodeError:
+ pass
+
+ourname = os.path.basename(sys.argv[0])
+ourversion = "0.1"
+
+if os.path.isfile(sys.argv[1]):
+ processfile(sys.argv[1])
+ sys.exit(0)
+
+for targetdir in sys.argv[1:]:
+ print("processing directory '%s'" % targetdir)
+ for root, dirs, files in os.walk(targetdir):
+ for name in files:
+ if name == ourname:
+ continue
+ fn = os.path.join(root, name)
+ if os.path.islink(fn):
+ continue
+ if "/.git/" in fn or fn.endswith(".html") or fn.endswith(".patch") or fn.endswith(".m4") or fn.endswith(".diff"):
+ continue
+ processfile(fn)
+
+print("All files processed with version %s" % ourversion)
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 11/14] meta: add explicit branch and protocol to SRC_URI
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (9 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 10/14] scripts/convert-srcuri: Backport SRC_URI conversion script from master branch Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 12/14] meta/scripts: Manual git url branch additions Anuj Mittal
` (3 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
Add branch name explicitly to SRC_URI where it's not defined and switch
to using https protocol for Github projects.
The change was made using convert-srcuri script in scripts/contrib.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb | 2 +-
.../recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded | 2 +-
.../recipes-test/git-submodule-test/git-submodule-test.bb | 2 +-
meta/classes/devupstream.bbclass | 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/opensbi/opensbi_0.9.bb | 2 +-
meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb | 2 +-
meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +-
meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 2 +-
meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.14.1.bb | 2 +-
meta/recipes-connectivity/libuv/libuv_1.41.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 +-
meta/recipes-core/glibc/cross-localedef-native_2.33.bb | 2 +-
meta/recipes-core/ifupdown/ifupdown_0.8.36.bb | 2 +-
meta/recipes-core/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 +-
meta/recipes-core/netbase/netbase_6.2.bb | 2 +-
meta/recipes-core/psplash/psplash_git.bb | 2 +-
meta/recipes-core/systemd/systemd.inc | 2 +-
meta/recipes-core/update-rc.d/update-rc.d_0.8.bb | 2 +-
meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb | 2 +-
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb | 2 +-
meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb | 2 +-
meta/recipes-devtools/distcc/distcc_3.3.5.bb | 2 +-
meta/recipes-devtools/dnf/dnf_4.6.0.bb | 2 +-
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
meta/recipes-devtools/file/file_5.39.bb | 2 +-
meta/recipes-devtools/glide/glide_0.13.3.bb | 2 +-
meta/recipes-devtools/gnu-config/gnu-config_git.bb | 2 +-
meta/recipes-devtools/libcomps/libcomps_0.1.15.bb | 2 +-
meta/recipes-devtools/libdnf/libdnf_0.58.0.bb | 2 +-
meta/recipes-devtools/librepo/librepo_1.13.0.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/patchelf/patchelf_0.12.bb | 2 +-
meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | 2 +-
meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 2 +-
.../recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb | 2 +-
meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +-
meta/recipes-devtools/unfs3/unfs3_git.bb | 2 +-
meta/recipes-extended/bzip2/bzip2_1.0.8.bb | 2 +-
meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 2 +-
meta/recipes-extended/iputils/iputils_s20200821.bb | 2 +-
meta/recipes-extended/libaio/libaio_0.3.112.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.17.bb | 2 +-
meta/recipes-extended/ltp/ltp_20210121.bb | 2 +-
meta/recipes-extended/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 +-
meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb | 2 +-
meta/recipes-extended/sysklogd/sysklogd_2.2.2.bb | 2 +-
meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb | 2 +-
meta/recipes-extended/zstd/zstd_1.4.9.bb | 2 +-
meta/recipes-gnome/libhandy/libhandy_1.2.0.bb | 2 +-
meta/recipes-gnome/libportal/libportal_0.3.bb | 2 +-
meta/recipes-graphics/glslang/glslang_11.2.0.bb | 2 +-
meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb | 2 +-
meta/recipes-graphics/libfakekey/libfakekey_git.bb | 2 +-
meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb | 2 +-
meta/recipes-graphics/libva/libva-utils_2.10.0.bb | 2 +-
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb | 2 +-
meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 2 +-
meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
| 2 +-
meta/recipes-graphics/spir/spirv-tools_2020.7.bb | 2 +-
meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb | 2 +-
meta/recipes-graphics/vulkan/assimp_5.0.1.bb | 2 +-
| 2 +-
meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb | 2 +-
meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +-
meta/recipes-graphics/vulkan/vulkan-tools_1.2.170.0.bb | 2 +-
.../recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 2 +-
meta/recipes-graphics/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 +-
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
meta/recipes-kernel/kmod/kmod.inc | 2 +-
meta/recipes-kernel/powertop/powertop_2.13.bb | 2 +-
meta/recipes-kernel/systemtap/systemtap_git.inc | 2 +-
meta/recipes-multimedia/x264/x264_git.bb | 2 +-
meta/recipes-sato/l3afpad/l3afpad_git.bb | 2 +-
.../recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb | 2 +-
meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb | 2 +-
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb | 2 +-
meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb | 2 +-
.../recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb | 2 +-
meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb | 2 +-
meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb | 2 +-
meta/recipes-support/bmap-tools/bmap-tools_3.6.bb | 2 +-
meta/recipes-support/boost/boost-build-native_4.3.0.bb | 2 +-
.../recipes-support/ca-certificates/ca-certificates_20211016.bb | 2 +-
meta/recipes-support/dos2unix/dos2unix_7.4.2.bb | 2 +-
.../gnome-desktop-testing/gnome-desktop-testing_2018.1.bb | 2 +-
meta/recipes-support/libgit2/libgit2_1.1.0.bb | 2 +-
meta/recipes-support/libjitterentropy/libjitterentropy_3.0.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.23.22.bb | 2 +-
meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb | 2 +-
meta/recipes-support/rng-tools/rng-tools_6.11.bb | 2 +-
meta/recipes-support/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 +-
116 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
index 07b83276fb..8a27e3a791 100644
--- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
@@ -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"
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded
index 32ec4b14fa..fbe90d6c6b 100644
--- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded
@@ -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"
diff --git a/meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb b/meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb
index 9429564df4..cc5d7eae5a 100644
--- a/meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb
+++ b/meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb
@@ -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"
diff --git a/meta/classes/devupstream.bbclass b/meta/classes/devupstream.bbclass
index 7780c5482c..97e137cb40 100644
--- a/meta/classes/devupstream.bbclass
+++ b/meta/classes/devupstream.bbclass
@@ -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
diff --git a/meta/lib/oeqa/selftest/cases/fetch.py b/meta/lib/oeqa/selftest/cases/fetch.py
index cd15f65129..d2f0c38ef4 100644
--- a/meta/lib/oeqa/selftest/cases/fetch.py
+++ b/meta/lib/oeqa/selftest/cases/fetch.py
@@ -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)
diff --git a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
index 5d6f200a73..e9dfa0770e 100644
--- a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
+++ b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
@@ -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 \
"
diff --git a/meta/recipes-bsp/efivar/efivar_37.bb b/meta/recipes-bsp/efivar/efivar_37.bb
index 5bf121ff6e..fa1fe1ecdf 100644
--- a/meta/recipes-bsp/efivar/efivar_37.bb
+++ b/meta/recipes-bsp/efivar/efivar_37.bb
@@ -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;protocol=https \
file://determinism.patch \
file://no-werror.patch"
SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10"
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.9.bb b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
index cb1c3f2ebf..e01491c9b7 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
@@ -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 \
"
diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb b/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb
index 613e3161fb..8234b86162 100644
--- a/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb
+++ b/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb
@@ -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 = "824551ac77bab1d0f7ae34d7a7c77b155240e754"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index 993478a73b..17c6140216 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -14,7 +14,7 @@ PE = "1"
# repo during parse
SRCREV = "c4fddedc48f336eabc4ce3f74940e6aa372de18c"
-SRC_URI = "git://git.denx.de/u-boot.git \
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
file://0001-add-valid-fdt-check.patch \
file://CVE-2021-27097-1.patch \
file://CVE-2021-27097-2.patch \
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
index af986c4eab..e4eeb3c726 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
@@ -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;protocol=https \
file://0001-Removed-icon-from-connman-gnome-about-applet.patch \
file://null_check_for_ipv4_config.patch \
file://images/ \
diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.14.1.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.14.1.bb
index 9a83898e52..5213b28345 100644
--- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.14.1.bb
+++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.14.1.bb
@@ -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;protocol=https \
"
SRCREV = "41c9c5e78f287ed4b41ac438c1873fa71bfa70ae"
diff --git a/meta/recipes-connectivity/libuv/libuv_1.41.0.bb b/meta/recipes-connectivity/libuv/libuv_1.41.0.bb
index 4987331dc8..e15d338941 100644
--- a/meta/recipes-connectivity/libuv/libuv_1.41.0.bb
+++ b/meta/recipes-connectivity/libuv/libuv_1.41.0.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47"
SRCREV = "1dff88e5161cba5c59276d2070d2e304e4dcb242"
-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"
diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
index f170cf4650..b4cbc1a76c 100644
--- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
+++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
@@ -8,7 +8,7 @@ SRCREV = "90f3fe28aa25135b7e4a54a7816388913bfd4a2a"
PV = "20201225"
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
diff --git a/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/meta/recipes-core/dbus-wait/dbus-wait_git.bb
index 677768d35a..b39f7523c0 100644
--- a/meta/recipes-core/dbus-wait/dbus-wait_git.bb
+++ b/meta/recipes-core/dbus-wait/dbus-wait_git.bb
@@ -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"
diff --git a/meta/recipes-core/fts/fts_1.2.7.bb b/meta/recipes-core/fts/fts_1.2.7.bb
index ea820cb0c3..d3b0f31eda 100644
--- a/meta/recipes-core/fts/fts_1.2.7.bb
+++ b/meta/recipes-core/fts/fts_1.2.7.bb
@@ -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;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.33.bb b/meta/recipes-core/glibc/cross-localedef-native_2.33.bb
index ec59c6ba10..22d3f96c09 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.33.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.33.bb
@@ -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 \
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb
index 0daf50acab..afc3196620 100644
--- a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb
+++ b/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb
@@ -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 \
diff --git a/meta/recipes-core/initscripts/init-system-helpers_1.60.bb b/meta/recipes-core/initscripts/init-system-helpers_1.60.bb
index 33977e66c1..98f45e1355 100644
--- a/meta/recipes-core/initscripts/init-system-helpers_1.60.bb
+++ b/meta/recipes-core/initscripts/init-system-helpers_1.60.bb
@@ -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"
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
index b5ca863d54..8008ba2d38 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=bd5d9777dfe7076c4f2928f12fed226a \
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 \
file://0001-configure.ac-do-not-use-compute-symver-floor.patch \
"
SRCREV = "94d84f92ca123d851586016c4678eb1f21c19029"
diff --git a/meta/recipes-core/musl/libucontext_git.bb b/meta/recipes-core/musl/libucontext_git.bb
index 11affebb49..87946b7ec3 100644
--- a/meta/recipes-core/musl/libucontext_git.bb
+++ b/meta/recipes-core/musl/libucontext_git.bb
@@ -10,7 +10,7 @@ DEPENDS = ""
PV = "0.10+${SRCPV}"
SRCREV = "19fa1bbfc26efb92147b5e85cc0ca02a0e837561"
-SRC_URI = "git://github.com/kaniini/libucontext \
+SRC_URI = "git://github.com/kaniini/libucontext;branch=master;protocol=https \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/musl/musl-obstack.bb b/meta/recipes-core/musl/musl-obstack.bb
index 3003935fe5..74de48c2cd 100644
--- a/meta/recipes-core/musl/musl-obstack.bb
+++ b/meta/recipes-core/musl/musl-obstack.bb
@@ -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;protocol=https"
UPSTREAM_CHECK_COMMITS = "1"
diff --git a/meta/recipes-core/musl/musl-utils.bb b/meta/recipes-core/musl/musl-utils.bb
index dd0ce33061..c30509469c 100644
--- a/meta/recipes-core/musl/musl-utils.bb
+++ b/meta/recipes-core/musl/musl-utils.bb
@@ -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;protocol=https"
UPSTREAM_CHECK_COMMITS = "1"
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index e6f9e2441e..a241a2fbbd 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -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 \
"
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index ef59bc3b0a..9c74d2ec36 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -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"
diff --git a/meta/recipes-core/netbase/netbase_6.2.bb b/meta/recipes-core/netbase/netbase_6.2.bb
index c016d32dd3..ad7e9becde 100644
--- a/meta/recipes-core/netbase/netbase_6.2.bb
+++ b/meta/recipes-core/netbase/netbase_6.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
PE = "1"
-SRC_URI = "git://salsa.debian.org/md/netbase.git;protocol=https"
+SRC_URI = "git://salsa.debian.org/md/netbase.git;protocol=https;branch=master"
SRCREV = "1c892c96a078ef28ec1a94681b3a0da7a3d545f7"
inherit allarch
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index 59e1e3f194..e1236475fc 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -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 \
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 7d3b3064ba..b11ab112af 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
SRCREV = "17472dca0160cbe7b807ca648475fd70d0d62fe5"
SRCBRANCH = "v247-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"
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb
index da716674c3..daee5c224b 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb
+++ b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb
@@ -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"
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
index d5beaecd0e..02a286c396 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
@@ -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;protocol=https \
file://bootchartd_stop.sh \
file://0001-collector-Allocate-space-on-heap-for-chunks.patch \
file://0001-bootchart2-support-usrmerge.patch \
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb
index fca010d4ae..7f51c799cd 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.10.1.bb
@@ -15,7 +15,7 @@ DEPENDS_append_class-target = " udev"
RDEPENDS_${PN} = "libgcc"
SRCREV = "f2ffce38b9c1477a7350bfe165f0e34b9bde40f5"
-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 \
"
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb
index 7480affbc0..29f3866079 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb
@@ -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;protocol=https \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
"
diff --git a/meta/recipes-devtools/distcc/distcc_3.3.5.bb b/meta/recipes-devtools/distcc/distcc_3.3.5.bb
index 5c2644199e..defea99c95 100644
--- a/meta/recipes-devtools/distcc/distcc_3.3.5.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.3.5.bb
@@ -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;protocol=https \
file://default \
file://distcc \
file://distcc.service \
diff --git a/meta/recipes-devtools/dnf/dnf_4.6.0.bb b/meta/recipes-devtools/dnf/dnf_4.6.0.bb
index 6651e64352..f2cb6db89b 100644
--- a/meta/recipes-devtools/dnf/dnf_4.6.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.6.0.bb
@@ -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;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 \
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 2f113c5e8d..fb02b2006e 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -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
diff --git a/meta/recipes-devtools/file/file_5.39.bb b/meta/recipes-devtools/file/file_5.39.bb
index c0c7253688..234440e493 100644
--- a/meta/recipes-devtools/file/file_5.39.bb
+++ b/meta/recipes-devtools/file/file_5.39.bb
@@ -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;protocol=https \
file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch \
file://0001-Fix-close_on_exec-multithreaded-decompression-issue.patch"
diff --git a/meta/recipes-devtools/glide/glide_0.13.3.bb b/meta/recipes-devtools/glide/glide_0.13.3.bb
index 6eb87df7c3..1a5c760cb3 100644
--- a/meta/recipes-devtools/glide/glide_0.13.3.bb
+++ b/meta/recipes-devtools/glide/glide_0.13.3.bb
@@ -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;protocol=https"
SRCREV = "8ed5b9292379d86c39592a7e6a58eb9c903877cf"
inherit go
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index c41177c72b..ecbd60e72a 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -12,7 +12,7 @@ INHIBIT_DEFAULT_DEPS = "1"
SRCREV = "6faca61810d335c7837f320733fe8e15a1431fc2"
PV = "20210125+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"
diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb
index 58d2dee897..d9e712f74a 100644
--- a/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb
+++ b/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb
@@ -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;protocol=https \
file://0001-Add-crc32.c-to-sources-list.patch \
file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
"
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb
index dbe68d5a15..30b96bd81d 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb
@@ -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 \
diff --git a/meta/recipes-devtools/librepo/librepo_1.13.0.bb b/meta/recipes-devtools/librepo/librepo_1.13.0.bb
index 0a68e0ac4f..3f5919d0a2 100644
--- a/meta/recipes-devtools/librepo/librepo_1.13.0.bb
+++ b/meta/recipes-devtools/librepo/librepo_1.13.0.bb
@@ -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;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 \
"
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index db6694339c..3f53b477dd 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -30,7 +30,7 @@ LLVM_DIR = "llvm${LLVM_RELEASE}"
BRANCH = "release/${MAJOR_VERSION}.x"
SRCREV = "1fdec59bffc11ae37eb51a1b9869f0696bfd5312"
-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 \
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 105a68dad8..de7bdcd969 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -14,7 +14,7 @@ RDEPENDS_mtd-utils-tests += "bash"
PV = "2.1.2"
SRCREV = "7b986779342021bda87c04da3bf729718736d8ab"
-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 \
"
diff --git a/meta/recipes-devtools/ninja/ninja_1.10.2.bb b/meta/recipes-devtools/ninja/ninja_1.10.2.bb
index 2a39b2d216..79328583ee 100644
--- a/meta/recipes-devtools/ninja/ninja_1.10.2.bb
+++ b/meta/recipes-devtools/ninja/ninja_1.10.2.bb
@@ -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"
diff --git a/meta/recipes-devtools/patchelf/patchelf_0.12.bb b/meta/recipes-devtools/patchelf/patchelf_0.12.bb
index 7c97ea0789..390a8110da 100644
--- a/meta/recipes-devtools/patchelf/patchelf_0.12.bb
+++ b/meta/recipes-devtools/patchelf/patchelf_0.12.bb
@@ -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 \
file://6edec83653ce1b5fc201ff6db93b966394766814.patch \
file://alignmentfix.patch \
diff --git a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
index ea1cc38806..62da3d2095 100644
--- a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
@@ -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 \
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index 083e597b03..5d754b20b3 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
PV = "4.4"
SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
-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-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \
file://CVE-2021-40153.patch;striplevel=2 \
"
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb
index 905a0cbb72..44f0c8c8f2 100644
--- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb
+++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb
@@ -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 \
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index a143b09656..7f790c9dbb 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -10,7 +10,7 @@ SRCREV = "a022ef2f1acfd9209a1bf792dda14ae4b0d1b60f"
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 \
diff --git a/meta/recipes-devtools/unfs3/unfs3_git.bb b/meta/recipes-devtools/unfs3/unfs3_git.bb
index a21fb58397..bcaa4e2822 100644
--- a/meta/recipes-devtools/unfs3/unfs3_git.bb
+++ b/meta/recipes-devtools/unfs3/unfs3_git.bb
@@ -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 \
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
index 70eb67f1f2..d2f34449b3 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
@@ -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 \
diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
index c51f163e9b..3b738f82e7 100644
--- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
+++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
@@ -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;protocol=https"
SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe"
UPSTREAM_CHECK_COMMITS = "1"
diff --git a/meta/recipes-extended/iputils/iputils_s20200821.bb b/meta/recipes-extended/iputils/iputils_s20200821.bb
index e43abf2629..dd541d4d48 100644
--- a/meta/recipes-extended/iputils/iputils_s20200821.bb
+++ b/meta/recipes-extended/iputils/iputils_s20200821.bb
@@ -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;protocol=https \
file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
"
SRCREV = "23c3782ae0c7f9c6ae59dbed8ad9204f8758542b"
diff --git a/meta/recipes-extended/libaio/libaio_0.3.112.bb b/meta/recipes-extended/libaio/libaio_0.3.112.bb
index b3606474a5..3892f3244e 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.112.bb
+++ b/meta/recipes-extended/libaio/libaio_0.3.112.bb
@@ -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 \
diff --git a/meta/recipes-extended/libnsl/libnsl2_git.bb b/meta/recipes-extended/libnsl/libnsl2_git.bb
index badb71d977..0690d4cd3b 100644
--- a/meta/recipes-extended/libnsl/libnsl2_git.bb
+++ b/meta/recipes-extended/libnsl/libnsl2_git.bb
@@ -14,7 +14,7 @@ PV = "1.3.0"
SRCREV = "fbad7b36acaa89a54023930af70805649f962999"
-SRC_URI = "git://github.com/thkukuk/libnsl \
+SRC_URI = "git://github.com/thkukuk/libnsl;branch=master;protocol=https \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-extended/libnss-nis/libnss-nis.bb b/meta/recipes-extended/libnss-nis/libnss-nis.bb
index a1d914e871..984cc98fc2 100644
--- a/meta/recipes-extended/libnss-nis/libnss-nis.bb
+++ b/meta/recipes-extended/libnss-nis/libnss-nis.bb
@@ -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;protocol=https \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.17.bb b/meta/recipes-extended/libsolv/libsolv_0.7.17.bb
index fa6e8a3c4d..2b5da4d932 100644
--- a/meta/recipes-extended/libsolv/libsolv_0.7.17.bb
+++ b/meta/recipes-extended/libsolv/libsolv_0.7.17.bb
@@ -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;protocol=https \
"
SRCREV = "4bc791c0d235eb14bfe4c5da607206bfdfa6983d"
diff --git a/meta/recipes-extended/ltp/ltp_20210121.bb b/meta/recipes-extended/ltp/ltp_20210121.bb
index 17adbf43f0..e816244f8c 100644
--- a/meta/recipes-extended/ltp/ltp_20210121.bb
+++ b/meta/recipes-extended/ltp/ltp_20210121.bb
@@ -33,7 +33,7 @@ SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb"
PR = "r4"
HASHEQUIV_HASH_VERSION .= ".4"
-SRC_URI = "git://github.com/linux-test-project/ltp.git \
+SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \
file://0001-build-Add-option-to-select-libc-implementation.patch \
file://0007-Fix-test_proc_kill-hanging.patch \
file://0001-Add-more-musl-exclusions.patch \
diff --git a/meta/recipes-extended/net-tools/net-tools_2.10.bb b/meta/recipes-extended/net-tools/net-tools_2.10.bb
index de4a715971..2dafe96356 100644
--- a/meta/recipes-extended/net-tools/net-tools_2.10.bb
+++ b/meta/recipes-extended/net-tools/net-tools_2.10.bb
@@ -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 \
diff --git a/meta/recipes-extended/procps/procps_3.3.17.bb b/meta/recipes-extended/procps/procps_3.3.17.bb
index c74a901d9a..9fd3db196d 100644
--- a/meta/recipes-extended/procps/procps_3.3.17.bb
+++ b/meta/recipes-extended/procps/procps_3.3.17.bb
@@ -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 \
diff --git a/meta/recipes-extended/psmisc/psmisc_23.4.bb b/meta/recipes-extended/psmisc/psmisc_23.4.bb
index 894443f4ef..89fe8a709c 100644
--- a/meta/recipes-extended/psmisc/psmisc_23.4.bb
+++ b/meta/recipes-extended/psmisc/psmisc_23.4.bb
@@ -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"
diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb
index 5aff2b56a6..ad392138b5 100644
--- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb
+++ b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb
@@ -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;protocol=https \
file://0001-Use-cross-compiled-rpcgen.patch \
"
diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.2.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.2.2.bb
index 5dfeca5326..01a079f041 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_2.2.2.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_2.2.2.bb
@@ -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 \
"
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
index 69d5b2f83b..c6d356d227 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
@@ -9,7 +9,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 \
diff --git a/meta/recipes-extended/zstd/zstd_1.4.9.bb b/meta/recipes-extended/zstd/zstd_1.4.9.bb
index 44224ec627..b648c84093 100644
--- a/meta/recipes-extended/zstd/zstd_1.4.9.bb
+++ b/meta/recipes-extended/zstd/zstd_1.4.9.bb
@@ -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 \
"
diff --git a/meta/recipes-gnome/libhandy/libhandy_1.2.0.bb b/meta/recipes-gnome/libhandy/libhandy_1.2.0.bb
index 1e37feb20a..f39cbdca5a 100644
--- a/meta/recipes-gnome/libhandy/libhandy_1.2.0.bb
+++ b/meta/recipes-gnome/libhandy/libhandy_1.2.0.bb
@@ -9,7 +9,7 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https"
+SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=master"
SRCREV = "7b38a860ffcec6c2ad28153358cc3d037ddb618f"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-gnome/libportal/libportal_0.3.bb b/meta/recipes-gnome/libportal/libportal_0.3.bb
index bc4ff3784c..c24a794fc4 100644
--- a/meta/recipes-gnome/libportal/libportal_0.3.bb
+++ b/meta/recipes-gnome/libportal/libportal_0.3.bb
@@ -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 = "a609e06d0c4adc5c510cf9ac7b060db3d368e78f"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/glslang/glslang_11.2.0.bb b/meta/recipes-graphics/glslang/glslang_11.2.0.bb
index 902f7345f5..e00f73ccb7 100644
--- a/meta/recipes-graphics/glslang/glslang_11.2.0.bb
+++ b/meta/recipes-graphics/glslang/glslang_11.2.0.bb
@@ -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 = "5421877c380d5f92c1965c7a94620dac861297dd"
-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"
diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb
index 1cc94cf993..4b8630a318 100644
--- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb
+++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb
@@ -12,7 +12,7 @@ inherit meson
SRCREV = "d16ad07e7f2a028e14d61f570931c87fa5ce404c"
PV = "1.25+git${SRCPV}"
-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 \
file://0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch \
file://reproducibility.patch"
diff --git a/meta/recipes-graphics/libfakekey/libfakekey_git.bb b/meta/recipes-graphics/libfakekey/libfakekey_git.bb
index ab6f5ac9ed..33ea6fe5a9 100644
--- a/meta/recipes-graphics/libfakekey/libfakekey_git.bb
+++ b/meta/recipes-graphics/libfakekey/libfakekey_git.bb
@@ -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"
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
index 1a31677978..06bd682823 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
@@ -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"
diff --git a/meta/recipes-graphics/libva/libva-utils_2.10.0.bb b/meta/recipes-graphics/libva/libva-utils_2.10.0.bb
index 828f4fb317..39763ba539 100644
--- a/meta/recipes-graphics/libva/libva-utils_2.10.0.bb
+++ b/meta/recipes-graphics/libva/libva-utils_2.10.0.bb
@@ -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.10-branch"
+SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.10-branch;protocol=https"
SRCREV = "f112ee75fcd1472131b20f901b93f6ac1d293fad"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
index a08eb252ce..3ea67d09d6 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
@@ -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"
diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
index 58a6997ffe..88101b5dcc 100644
--- a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
+++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
@@ -7,7 +7,7 @@ PV = "1.4.7+git${SRCPV}"
# Exclude x.99.x versions from upstream checks
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)"
-SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \
+SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4;protocol=https \
file://fix-test-includes.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 14f4c75a2c..96ec93071d 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -6,7 +6,7 @@ BUGTRACKER = "https://gitlab.freedesktop.org/mesa/piglit/-/issues"
LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
-SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \
+SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=master \
file://0001-cmake-install-bash-completions-in-the-right-place.patch \
file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
file://0001-Add-a-missing-include-for-htobe32-definition.patch \
--git a/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb b/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb
index 7a43af5e6b..ea7e17305e 100644
--- a/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb
@@ -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}"
diff --git a/meta/recipes-graphics/spir/spirv-tools_2020.7.bb b/meta/recipes-graphics/spir/spirv-tools_2020.7.bb
index 8be698533a..9a06408526 100644
--- a/meta/recipes-graphics/spir/spirv-tools_2020.7.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_2020.7.bb
@@ -8,7 +8,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRCREV = "2573fd781b5408cd7fe5755a78b60d767a748ff9"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git \
+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+)+)$"
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb
index 52821195d1..7f035f820a 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10"
DEPENDS = "libdrm virtual/libgl libepoxy"
SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985"
-SRC_URI = "git://anongit.freedesktop.org/virglrenderer \
+SRC_URI = "git://anongit.freedesktop.org/virglrenderer;branch=master \
file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \
file://0001-meson.build-use-python3-directly-for-python.patch \
"
diff --git a/meta/recipes-graphics/vulkan/assimp_5.0.1.bb b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb
index 5a8c62e64d..295ac12fc5 100644
--- a/meta/recipes-graphics/vulkan/assimp_5.0.1.bb
+++ b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271"
DEPENDS = "zlib"
-SRC_URI = "git://github.com/assimp/assimp.git;branch=assimp_5.0_release \
+SRC_URI = "git://github.com/assimp/assimp.git;branch=assimp_5.0_release;protocol=https \
file://0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch \
file://0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch \
"
--git a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.170.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.170.0.bb
index 4c9c94f3d2..b0211432ab 100644
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.170.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.170.0.bb
@@ -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=master;protocol=https"
SRCREV = "1d99b835ec3cd5a7fb2f2a2dd9a615ee2d1f0101"
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb
index 6b6ed06dbb..a866f0a5cb 100644
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.170.0.bb
@@ -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;protocol=https \
"
SRCREV = "c5678a03db383fd0dc5bfb8e9a383043bdbcb57b"
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index b7c38f6543..07d6e9d735 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -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;protocol=https \
file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \
file://debugfix.patch \
"
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.2.170.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.2.170.0.bb
index 0c8bcaa085..d81dc14472 100644
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.2.170.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.2.170.0.bb
@@ -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.170"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.170;protocol=https"
SRCREV = "88ea55de928a08ba5c5f65a93d1e7c8f666fc43f"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index d2a16643fe..e524b82dd6 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -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 \
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 161371b118..73c0cdc385 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -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 \
"
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index 7ccc022b93..2110bc75fa 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -14,7 +14,7 @@ SRCREV = "cca113f2fe0759b91fd6a0e10fdcda2c28f18a7e"
PV = "1.2.0+git${SRCPV}"
-SRC_URI = "git://git.kernel.dk/blktrace.git \
+SRC_URI = "git://git.kernel.dk/blktrace.git;branch=master \
file://ldflags.patch \
file://CVE-2018-10689.patch \
file://make-btt-scripts-python3-ready.patch \
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc
index ae2c308911..6ada0b0295 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev.inc
@@ -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;protocol=https \
"
SRCREV = "e0c25e289d6baf1d83c2b9cb523d3bc237d0c0c9"
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index 5da6c24fbf..461ab8fbd3 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -5,7 +5,7 @@ SECTION = "bootloader"
LICENSE = "GPLv2 | BSD"
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 \
"
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index e967f485c1..ef035aed23 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -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"
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index ba5ec7f650..11220c5138 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -19,7 +19,7 @@ SRCREV = "1ccfe994287119cc6cef37a7ca4c529d89de4b95"
# Lookout for PV bump too when SRCREV is changed
PV = "28"
-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 \
"
diff --git a/meta/recipes-kernel/powertop/powertop_2.13.bb b/meta/recipes-kernel/powertop/powertop_2.13.bb
index 8c7e78fd94..dc9c77f337 100644
--- a/meta/recipes-kernel/powertop/powertop_2.13.bb
+++ b/meta/recipes-kernel/powertop/powertop_2.13.bb
@@ -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 = "184cee06b2d64679bae5f806fe0a218827fdde99"
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 73fba981b7..38bdbe3cfb 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRCREV = "988f439af39a359b4387963ca4633649866d8275"
PV = "4.4"
-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 \
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index f95fb0c41e..448d632145 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -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 \
"
diff --git a/meta/recipes-sato/l3afpad/l3afpad_git.bb b/meta/recipes-sato/l3afpad/l3afpad_git.bb
index 85c2c500ea..4d5d299d47 100644
--- a/meta/recipes-sato/l3afpad/l3afpad_git.bb
+++ b/meta/recipes-sato/l3afpad/l3afpad_git.bb
@@ -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;protocol=https"
SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
index 547e851c15..5733a36b12 100644
--- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
@@ -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+)+))"
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
index d775b5c651..71fb238f43 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
@@ -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/ \
"
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
index c659964a2b..54fe578cd3 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
@@ -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 \
"
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
index 9f00281dde..e2e81c2905 100644
--- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
@@ -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"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
index 7a043d3447..bc4024736f 100644
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
@@ -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"
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb
index 2b1f513f1c..7e7612253d 100644
--- a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb
@@ -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"
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
index d01177f9b9..19c4a73dc3 100644
--- a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
+++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
@@ -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 \
"
diff --git a/meta/recipes-support/bmap-tools/bmap-tools_3.6.bb b/meta/recipes-support/bmap-tools/bmap-tools_3.6.bb
index 611c0fb680..70ce12a06f 100644
--- a/meta/recipes-support/bmap-tools/bmap-tools_3.6.bb
+++ b/meta/recipes-support/bmap-tools/bmap-tools_3.6.bb
@@ -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;protocol=https"
SRCREV = "c0673962a8ec1624b5189dc1d24f33fe4f06785a"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-support/boost/boost-build-native_4.3.0.bb b/meta/recipes-support/boost/boost-build-native_4.3.0.bb
index 00f3a86dd6..f09ff484ec 100644
--- a/meta/recipes-support/boost/boost-build-native_4.3.0.bb
+++ b/meta/recipes-support/boost/boost-build-native_4.3.0.bb
@@ -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 = "632ea768f3eb225b4472c5ed6d20afee708724ad"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+){2,}))"
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20211016.bb b/meta/recipes-support/ca-certificates/ca-certificates_20211016.bb
index 214bad4ae3..a54d6b458a 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20211016.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20211016.bb
@@ -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 \
diff --git a/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb b/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb
index 9005bdea59..e0a5499263 100644
--- a/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb
+++ b/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb
@@ -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"
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb
index e5c69c0c46..19f32e8d1f 100644
--- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb
+++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb
@@ -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"
SRCREV = "4decade67b29ad170fcf3de148e41695fc459f48"
DEPENDS = "glib-2.0"
diff --git a/meta/recipes-support/libgit2/libgit2_1.1.0.bb b/meta/recipes-support/libgit2/libgit2_1.1.0.bb
index 2bbf59ea74..9b2eec9c9e 100644
--- a/meta/recipes-support/libgit2/libgit2_1.1.0.bb
+++ b/meta/recipes-support/libgit2/libgit2_1.1.0.bb
@@ -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 = "7f4fa178629d559c037a1f72f79f79af9c1ef8ce"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.1.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.1.bb
index 197bb787ac..f335abb261 100644
--- a/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.1.bb
+++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.0.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c69090e97c8fd6372d03099c0a5bc382 \
file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \
file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \
"
-SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git"
+SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https"
SRCREV = "747bf030b0ea9c44548b4e29bcfab7ae416675fc"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-support/lz4/lz4_1.9.3.bb b/meta/recipes-support/lz4/lz4_1.9.3.bb
index 9d5dc0253a..15867023c3 100644
--- a/meta/recipes-support/lz4/lz4_1.9.3.bb
+++ b/meta/recipes-support/lz4/lz4_1.9.3.bb
@@ -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://run-ptest \
file://CVE-2021-3520.patch \
"
diff --git a/meta/recipes-support/numactl/numactl_git.bb b/meta/recipes-support/numactl/numactl_git.bb
index 6c8a667a41..a0e72253a1 100644
--- a/meta/recipes-support/numactl/numactl_git.bb
+++ b/meta/recipes-support/numactl/numactl_git.bb
@@ -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;protocol=https \
file://Fix-the-test-output-format.patch \
file://Makefile \
file://run-ptest \
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb
index 623afccb5e..5f1b73ee16 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb
@@ -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=0.23"
+SRC_URI = "git://github.com/p11-glue/p11-kit;branch=0.23;protocol=https"
SRCREV = "bd97afbfe28d5fbbde95ce36ff7a8834fc0291ee"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb
index b14b947f97..6544b374c2 100644
--- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb
+++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb
@@ -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"
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.11.bb b/meta/recipes-support/rng-tools/rng-tools_6.11.bb
index 61a0cef2e0..bc98efa3c6 100644
--- a/meta/recipes-support/rng-tools/rng-tools_6.11.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_6.11.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "sysfsutils openssl"
SRC_URI = "\
- git://github.com/nhorman/rng-tools.git \
+ git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \
file://init \
file://default \
file://rngd.service \
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
index ff32259d8e..9eb70b7e65 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
@@ -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"
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index e04c653fe3..db4741ba4f 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -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;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 \
diff --git a/meta/recipes-support/xxhash/xxhash_0.8.0.bb b/meta/recipes-support/xxhash/xxhash_0.8.0.bb
index 9e38872361..daa1bc26de 100644
--- a/meta/recipes-support/xxhash/xxhash_0.8.0.bb
+++ b/meta/recipes-support/xxhash/xxhash_0.8.0.bb
@@ -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"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
SRCREV = "94e5f23e736f2bb67ebdf90727353e65344f9fc0"
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 12/14] meta/scripts: Manual git url branch additions
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (10 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 11/14] meta: add explicit branch and protocol to SRC_URI Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 13/14] cross-canadian: correct the location of pkg-config files Anuj Mittal
` (2 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Following the scripted conversion adding branches to git://
SRC_URI entries, add the remaining references, mainly in the selftests
and recipetool.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5340c0d688036c1be6c938f05d8a8c1e3b49ec38)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
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(-)
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 433d4b6651..0240589c81 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -47,5 +47,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/"
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 3385546e8e..66e326253e 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -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('"')
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py
index 9d56e9e1e3..3621492998 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -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)
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index c46e8ba489..e2fe38be87 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -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)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 566c75369a..116bdfd697 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -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
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 13/14] cross-canadian: correct the location of pkg-config files
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (11 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 12/14] meta/scripts: Manual git url branch additions Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 14/14] llvm: bump HASHEQUIV_HASH_VERSION Anuj Mittal
2021-11-16 5:50 ` [OE-core] [hardknott][PATCH 00/14] Review request Jacob Kroon
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
layout_libdir has not been defined for many years.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2c84fbed676a8e6717592c86c3742566ad0decac)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/classes/cross-canadian.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index f5c9f61595..3fc9cac442 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -155,7 +155,7 @@ libexecdir = "${exec_prefix}/libexec/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}
FILES_${PN} = "${prefix}"
-export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig"
+export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${exec_prefix}/lib/pkgconfig"
export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
do_populate_sysroot[stamp-extra-info] = ""
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [hardknott][PATCH 14/14] llvm: bump HASHEQUIV_HASH_VERSION
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (12 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 13/14] cross-canadian: correct the location of pkg-config files Anuj Mittal
@ 2021-11-16 3:24 ` Anuj Mittal
2021-11-16 5:50 ` [OE-core] [hardknott][PATCH 00/14] Review request Jacob Kroon
14 siblings, 0 replies; 17+ messages in thread
From: Anuj Mittal @ 2021-11-16 3:24 UTC (permalink / raw)
To: openembedded-core
llvm embeds the repository location in a header file. We just changed
the SRC_URI to fetch using https instead of git. This has started giving
errors in reproducibility testing when one of the RPMs to be compared is
fetched from sstate.
Bump HASHEQUIV_HASH_VERSION and PR so its rebuilt.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-devtools/llvm/llvm_git.bb | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index 3f53b477dd..58cdaaa5a9 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -37,6 +37,10 @@ SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=http
file://0001-nfc-Fix-missing-include.patch;striplevel=2 \
"
+# remove at next version upgrade or when output changes
+PR = "r1"
+HASHEQUIV_HASH_VERSION .= ".1"
+
UPSTREAM_CHECK_GITTAGREGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git/llvm"
--
2.33.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [OE-core] [hardknott][PATCH 00/14] Review request
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
` (13 preceding siblings ...)
2021-11-16 3:24 ` [hardknott][PATCH 14/14] llvm: bump HASHEQUIV_HASH_VERSION Anuj Mittal
@ 2021-11-16 5:50 ` Jacob Kroon
2021-11-16 15:24 ` Mittal, Anuj
14 siblings, 1 reply; 17+ messages in thread
From: Jacob Kroon @ 2021-11-16 5:50 UTC (permalink / raw)
To: Anuj Mittal, openembedded-core
On 11/16/21 04:24, Anuj Mittal wrote:
> Please review these changes for hardknott. No issues seen while testing
> on autobuilder.
>
> Thanks,
>
> Anuj
>
> The following changes since commit 0ca080a23c2770a15138f702d4c879bbd90ca360:
>
> build-appliance-image: Update to hardknott head revision (2021-11-04 11:58:28 +0000)
>
> are available in the Git repository at:
>
> git://push.openembedded.org/openembedded-core-contrib anujm/hardknott
>
> Alexander Kanavin (2):
> linux-firmware: upgrade 20210919 -> 20211027
> cross-canadian: correct the location of pkg-config files
>
> Anuj Mittal (2):
> meta: add explicit branch and protocol to SRC_URI
> llvm: bump HASHEQUIV_HASH_VERSION
>
> Bruce Ashfield (2):
> linux-yocto/5.10: update to v5.10.76
> linux-yocto-rt/5.10: update to -rt54
>
> Chen Qi (1):
> avahi: update CVE id fixed by local-ping.patch
>
> Jose Quaresma (1):
> sstate: another fix for touching files inside pseudo
>
> Manuel Leonhardt (1):
> sstate: Account for reserved characters when shortening sstate
> filenames
>
> Richard Purdie (5):
> linunistring: Add missing gperf-native dependency
> pseudo: Add in ability to flush database with shutdown request
> pseudo: Add fcntl64 wrapper
> scripts/convert-srcuri: Backport SRC_URI conversion script from master
> branch
> meta/scripts: Manual git url branch additions
>
> .../devtool/devtool-upgrade-test2_git.bb | 2 +-
> .../devtool-upgrade-test2_git.bb.upgraded | 2 +-
> .../git-submodule-test/git-submodule-test.bb | 2 +-
> meta/classes/cross-canadian.bbclass | 2 +-
> meta/classes/devupstream.bbclass | 2 +-
> meta/classes/sstate.bbclass | 14 ++--
> .../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.1.bb | 2 +-
> meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +-
> .../avahi/files/local-ping.patch | 1 +
> .../connman/connman-gnome_0.7.bb | 2 +-
> .../libnss-mdns/libnss-mdns_0.14.1.bb | 2 +-
> .../libuv/libuv_1.41.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.33.bb | 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 +-
> meta/recipes-core/netbase/netbase_6.2.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.10.1.bb | 2 +-
> .../createrepo-c/createrepo-c_0.17.0.bb | 2 +-
> meta/recipes-devtools/distcc/distcc_3.3.5.bb | 2 +-
> meta/recipes-devtools/dnf/dnf_4.6.0.bb | 2 +-
> meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
> meta/recipes-devtools/file/file_5.39.bb | 2 +-
> meta/recipes-devtools/glide/glide_0.13.3.bb | 2 +-
> .../gnu-config/gnu-config_git.bb | 2 +-
> .../libcomps/libcomps_0.1.15.bb | 2 +-
> meta/recipes-devtools/libdnf/libdnf_0.58.0.bb | 2 +-
> .../librepo/librepo_1.13.0.bb | 2 +-
> meta/recipes-devtools/llvm/llvm_git.bb | 6 +-
> meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 +-
> meta/recipes-devtools/ninja/ninja_1.10.2.bb | 2 +-
> .../patchelf/patchelf_0.12.bb | 2 +-
> meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
> meta/recipes-devtools/rpm/rpm_4.16.1.3.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 +-
> meta/recipes-extended/bzip2/bzip2_1.0.8.bb | 2 +-
> .../go-examples/go-helloworld_0.1.bb | 2 +-
> .../iputils/iputils_s20200821.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.17.bb | 2 +-
> meta/recipes-extended/ltp/ltp_20210121.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 +-
> .../sysklogd/sysklogd_2.2.2.bb | 2 +-
> .../xinetd/xinetd_2.3.15.4.bb | 2 +-
> meta/recipes-extended/zstd/zstd_1.4.9.bb | 2 +-
> meta/recipes-gnome/libhandy/libhandy_1.2.0.bb | 2 +-
> meta/recipes-gnome/libportal/libportal_0.3.bb | 2 +-
> .../glslang/glslang_11.2.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.10.0.bb | 2 +-
> .../matchbox-wm/matchbox-wm_1.2.2.bb | 2 +-
> meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 2 +-
> meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
> .../spir/spirv-headers_1.5.4.bb | 2 +-
> .../spir/spirv-tools_2020.7.bb | 2 +-
> .../virglrenderer/virglrenderer_0.8.2.bb | 2 +-
> meta/recipes-graphics/vulkan/assimp_5.0.1.bb | 2 +-
> .../vulkan/vulkan-headers_1.2.170.0.bb | 2 +-
> .../vulkan/vulkan-loader_1.2.170.0.bb | 2 +-
> .../vulkan/vulkan-samples_git.bb | 2 +-
> .../vulkan/vulkan-tools_1.2.170.0.bb | 2 +-
> .../xinput-calibrator_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 +-
> ...20210919.bb => linux-firmware_20211027.bb} | 4 +-
> .../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 +++---
> meta/recipes-kernel/powertop/powertop_2.13.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.3.0.bb | 2 +-
> .../ca-certificates_20211016.bb | 2 +-
> .../dos2unix/dos2unix_7.4.2.bb | 2 +-
> .../gnome-desktop-testing_2018.1.bb | 2 +-
> meta/recipes-support/libgit2/libgit2_1.1.0.bb | 2 +-
> .../libjitterentropy_3.0.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 +-
> .../p11-kit/p11-kit_0.23.22.bb | 2 +-
> .../ptest-runner/ptest-runner_2.4.2.bb | 2 +-
> .../rng-tools/rng-tools_6.11.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 +
> 131 files changed, 239 insertions(+), 153 deletions(-)
> rename meta/recipes-kernel/linux-firmware/{linux-firmware_20210919.bb => linux-firmware_20211027.bb} (99%)
> create mode 100755 scripts/contrib/convert-srcuri.py
>
Can we please add the forward-port below from dunfell branch to fix
using Yocto on distros with gcc 11:
commit ef8b7946b4793db653ef7dd716e1d3f919a84725
Author: Andrej Valek <andrej.valek@siemens.com>
Date: Mon Aug 23 19:17:20 2021 +0200
mklibs-native: drop deprecated cpp17 exceptions
gcc11 has -std=gnu++17 as default. Remove deprecated C++17
exceptions based
on
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html.
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
/Jacob
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [OE-core] [hardknott][PATCH 00/14] Review request
2021-11-16 5:50 ` [OE-core] [hardknott][PATCH 00/14] Review request Jacob Kroon
@ 2021-11-16 15:24 ` Mittal, Anuj
0 siblings, 0 replies; 17+ messages in thread
From: Mittal, Anuj @ 2021-11-16 15:24 UTC (permalink / raw)
To: openembedded-core, jacob.kroon
On Tue, 2021-11-16 at 06:50 +0100, Jacob Kroon wrote:
> On 11/16/21 04:24, Anuj Mittal wrote:
> > Please review these changes for hardknott. No issues seen while
> > testing
> > on autobuilder.
> >
> > Thanks,
> >
> > Anuj
> >
> > The following changes since commit
> > 0ca080a23c2770a15138f702d4c879bbd90ca360:
> >
> > build-appliance-image: Update to hardknott head revision (2021-
> > 11-04 11:58:28 +0000)
> >
> > are available in the Git repository at:
> >
> > git://push.openembedded.org/openembedded-core-contrib
> > anujm/hardknott
> >
> > Alexander Kanavin (2):
> > linux-firmware: upgrade 20210919 -> 20211027
> > cross-canadian: correct the location of pkg-config files
> >
> > Anuj Mittal (2):
> > meta: add explicit branch and protocol to SRC_URI
> > llvm: bump HASHEQUIV_HASH_VERSION
> >
> > Bruce Ashfield (2):
> > linux-yocto/5.10: update to v5.10.76
> > linux-yocto-rt/5.10: update to -rt54
> >
> > Chen Qi (1):
> > avahi: update CVE id fixed by local-ping.patch
> >
> > Jose Quaresma (1):
> > sstate: another fix for touching files inside pseudo
> >
> > Manuel Leonhardt (1):
> > sstate: Account for reserved characters when shortening sstate
> > filenames
> >
> > Richard Purdie (5):
> > linunistring: Add missing gperf-native dependency
> > pseudo: Add in ability to flush database with shutdown request
> > pseudo: Add fcntl64 wrapper
> > scripts/convert-srcuri: Backport SRC_URI conversion script from
> > master
> > branch
> > meta/scripts: Manual git url branch additions
> >
> > .../devtool/devtool-upgrade-test2_git.bb | 2 +-
> > .../devtool-upgrade-test2_git.bb.upgraded | 2 +-
> > .../git-submodule-test/git-submodule-test.bb | 2 +-
> > meta/classes/cross-canadian.bbclass | 2 +-
> > meta/classes/devupstream.bbclass | 2 +-
> > meta/classes/sstate.bbclass | 14 ++--
> > .../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.1.bb | 2 +-
> > meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +-
> > .../avahi/files/local-ping.patch | 1 +
> > .../connman/connman-gnome_0.7.bb | 2 +-
> > .../libnss-mdns/libnss-mdns_0.14.1.bb | 2 +-
> > .../libuv/libuv_1.41.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.33.bb | 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 +-
> > meta/recipes-core/netbase/netbase_6.2.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.10.1.bb | 2 +-
> > .../createrepo-c/createrepo-c_0.17.0.bb | 2 +-
> > meta/recipes-devtools/distcc/distcc_3.3.5.bb | 2 +-
> > meta/recipes-devtools/dnf/dnf_4.6.0.bb | 2 +-
> > meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
> > meta/recipes-devtools/file/file_5.39.bb | 2 +-
> > meta/recipes-devtools/glide/glide_0.13.3.bb | 2 +-
> > .../gnu-config/gnu-config_git.bb | 2 +-
> > .../libcomps/libcomps_0.1.15.bb | 2 +-
> > meta/recipes-devtools/libdnf/libdnf_0.58.0.bb | 2 +-
> > .../librepo/librepo_1.13.0.bb | 2 +-
> > meta/recipes-devtools/llvm/llvm_git.bb | 6 +-
> > meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 +-
> > meta/recipes-devtools/ninja/ninja_1.10.2.bb | 2 +-
> > .../patchelf/patchelf_0.12.bb | 2 +-
> > meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
> > meta/recipes-devtools/rpm/rpm_4.16.1.3.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 +-
> > meta/recipes-extended/bzip2/bzip2_1.0.8.bb | 2 +-
> > .../go-examples/go-helloworld_0.1.bb | 2 +-
> > .../iputils/iputils_s20200821.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.17.bb | 2 +-
> > meta/recipes-extended/ltp/ltp_20210121.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 +-
> > .../sysklogd/sysklogd_2.2.2.bb | 2 +-
> > .../xinetd/xinetd_2.3.15.4.bb | 2 +-
> > meta/recipes-extended/zstd/zstd_1.4.9.bb | 2 +-
> > meta/recipes-gnome/libhandy/libhandy_1.2.0.bb | 2 +-
> > meta/recipes-gnome/libportal/libportal_0.3.bb | 2 +-
> > .../glslang/glslang_11.2.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.10.0.bb | 2 +-
> > .../matchbox-wm/matchbox-wm_1.2.2.bb | 2 +-
> > meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 2 +-
> > meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
> > .../spir/spirv-headers_1.5.4.bb | 2 +-
> > .../spir/spirv-tools_2020.7.bb | 2 +-
> > .../virglrenderer/virglrenderer_0.8.2.bb | 2 +-
> > meta/recipes-graphics/vulkan/assimp_5.0.1.bb | 2 +-
> > .../vulkan/vulkan-headers_1.2.170.0.bb | 2 +-
> > .../vulkan/vulkan-loader_1.2.170.0.bb | 2 +-
> > .../vulkan/vulkan-samples_git.bb | 2 +-
> > .../vulkan/vulkan-tools_1.2.170.0.bb | 2 +-
> > .../xinput-calibrator_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 +-
> > ...20210919.bb => linux-firmware_20211027.bb} | 4 +-
> > .../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 +++---
> > meta/recipes-kernel/powertop/powertop_2.13.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.3.0.bb | 2 +-
> > .../ca-certificates_20211016.bb | 2 +-
> > .../dos2unix/dos2unix_7.4.2.bb | 2 +-
> > .../gnome-desktop-testing_2018.1.bb | 2 +-
> > meta/recipes-support/libgit2/libgit2_1.1.0.bb | 2 +-
> > .../libjitterentropy_3.0.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 +-
> > .../p11-kit/p11-kit_0.23.22.bb | 2 +-
> > .../ptest-runner/ptest-runner_2.4.2.bb | 2 +-
> > .../rng-tools/rng-tools_6.11.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 +
> > 131 files changed, 239 insertions(+), 153 deletions(-)
> > rename meta/recipes-kernel/linux-firmware/{linux-
> > firmware_20210919.bb => linux-firmware_20211027.bb} (99%)
> > create mode 100755 scripts/contrib/convert-srcuri.py
> >
>
> Can we please add the forward-port below from dunfell branch to fix
> using Yocto on distros with gcc 11:
>
> commit ef8b7946b4793db653ef7dd716e1d3f919a84725
> Author: Andrej Valek <andrej.valek@siemens.com>
> Date: Mon Aug 23 19:17:20 2021 +0200
>
> mklibs-native: drop deprecated cpp17 exceptions
>
> gcc11 has -std=gnu++17 as default. Remove deprecated C++17
> exceptions based
> on
> http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html.
>
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
>
>
Yes, I have taken this. It'd be in next merge request.
Thanks,
Anuj
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2021-11-16 15:24 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-16 3:24 [hardknott][PATCH 00/14] Review request Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 01/14] linunistring: Add missing gperf-native dependency Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 02/14] pseudo: Add in ability to flush database with shutdown request Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 03/14] pseudo: Add fcntl64 wrapper Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 04/14] sstate: Account for reserved characters when shortening sstate filenames Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 05/14] linux-firmware: upgrade 20210919 -> 20211027 Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 06/14] linux-yocto/5.10: update to v5.10.76 Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 07/14] linux-yocto-rt/5.10: update to -rt54 Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 08/14] sstate: another fix for touching files inside pseudo Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 09/14] avahi: update CVE id fixed by local-ping.patch Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 10/14] scripts/convert-srcuri: Backport SRC_URI conversion script from master branch Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 11/14] meta: add explicit branch and protocol to SRC_URI Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 12/14] meta/scripts: Manual git url branch additions Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 13/14] cross-canadian: correct the location of pkg-config files Anuj Mittal
2021-11-16 3:24 ` [hardknott][PATCH 14/14] llvm: bump HASHEQUIV_HASH_VERSION Anuj Mittal
2021-11-16 5:50 ` [OE-core] [hardknott][PATCH 00/14] Review request Jacob Kroon
2021-11-16 15:24 ` Mittal, Anuj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.