From 37051fe0b480b3cabde1caede83e95d6815fe3ec Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 2 Nov 2021 09:24:33 -0400
Subject: global: convert github SRC_URIs to use https protocol

github is removing git:// access, and fetches will start experiencing
interruptions in service, and eventually will fail completely.

bitbake will also begin to warn on github src_uri's that don't use
https. So we convert the meta-virt instances to use protocol=https
(done using the oe-core contrib conversion script)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 recipes-containers/conmon/conmon_2.0.11.bb                        | 2 +-
 recipes-containers/containerd/containerd-docker_git.bb            | 2 +-
 recipes-containers/containerd/containerd-opencontainers_git.bb    | 2 +-
 recipes-containers/cri-o/cri-o_git.bb                             | 2 +-
 recipes-containers/criu/criu_git.bb                               | 2 +-
 recipes-containers/crun/crun_git.bb                               | 8 ++++----
 recipes-containers/docker-distribution/docker-distribution_git.bb | 2 +-
 recipes-containers/docker/docker-ce_git.bb                        | 4 ++--
 recipes-containers/docker/docker-moby.bb                          | 6 +++---
 recipes-containers/go-digest/go-digest_git.bb                     | 2 +-
 recipes-containers/go-errors/go-errors_git.bb                     | 2 +-
 recipes-containers/go-spf13-cobra/spf13-cobra_git.bb              | 2 +-
 recipes-containers/go-spf13-pflag/spf13-pflag_git.bb              | 2 +-
 recipes-containers/kubernetes/kubernetes_git.bb                   | 4 ++--
 recipes-containers/oci-image-tools/oci-image-tools_git.bb         | 2 +-
 recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb     | 2 +-
 recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb       | 2 +-
 recipes-containers/podman-compose/podman-compose_0.1.5.bb         | 2 +-
 recipes-containers/podman/podman_git.bb                           | 2 +-
 recipes-containers/riddler/riddler_git.bb                         | 2 +-
 recipes-containers/runc/runc-docker_git.bb                        | 2 +-
 recipes-containers/runc/runc-opencontainers_git.bb                | 2 +-
 recipes-containers/singularity/singularity_git.bb                 | 2 +-
 recipes-containers/skopeo/skopeo_git.bb                           | 2 +-
 recipes-containers/sloci-image/sloci-image-native_git.bb          | 2 +-
 recipes-containers/tini/tini_0.18.0.bb                            | 2 +-
 recipes-core/kata-containers/kata-agent_git.bb                    | 2 +-
 recipes-core/kata-containers/kata-proxy_git.bb                    | 2 +-
 recipes-core/kata-containers/kata-runtime_git.bb                  | 2 +-
 recipes-core/kata-containers/kata-shim_git.bb                     | 2 +-
 recipes-core/runv/runv_git.bb                                     | 2 +-
 recipes-core/runx/runx_git.bb                                     | 2 +-
 recipes-devtools/go/compose-file_git.bb                           | 2 +-
 recipes-devtools/go/go-build_git.bb                               | 4 ++--
 recipes-devtools/go/go-capability_git.bb                          | 2 +-
 recipes-devtools/go/go-cli_git.bb                                 | 2 +-
 recipes-devtools/go/go-connections_git.bb                         | 2 +-
 recipes-devtools/go/go-context_git.bb                             | 2 +-
 recipes-devtools/go/go-dbus_git.bb                                | 2 +-
 recipes-devtools/go/go-fsnotify_git.bb                            | 2 +-
 recipes-devtools/go/go-libtrust_git.bb                            | 2 +-
 recipes-devtools/go/go-logrus_git.bb                              | 2 +-
 recipes-devtools/go/go-md2man_git.bb                              | 2 +-
 recipes-devtools/go/go-metalinter_git.bb                          | 2 +-
 recipes-devtools/go/go-mux_git.bb                                 | 2 +-
 recipes-devtools/go/go-patricia_git.bb                            | 2 +-
 recipes-devtools/go/go-pty_git.bb                                 | 2 +-
 recipes-devtools/go/grpc-go_git.bb                                | 2 +-
 recipes-devtools/go/notary_git.bb                                 | 2 +-
 recipes-extended/diod/diod_1.0.24.bb                              | 2 +-
 recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb           | 2 +-
 recipes-extended/hyperstart/hyperstart_git.bb                     | 2 +-
 recipes-extended/ipxe/ipxe_git.bb                                 | 2 +-
 recipes-extended/irqbalance/irqbalance_git.bb                     | 2 +-
 recipes-extended/kvmtool/kvmtool.bb                               | 2 +-
 recipes-extended/libvmi/libvmi_git.bb                             | 2 +-
 recipes-extended/xvisor/xvisor_0.3.0.bb                           | 2 +-
 recipes-networking/cni/cni_git.bb                                 | 4 ++--
 recipes-networking/netns/netns_git.bb                             | 2 +-
 recipes-networking/openvswitch/openvswitch_git.bb                 | 2 +-
 recipes-networking/slirp4netns/slirp4netns_0.4.1.bb               | 2 +-
 61 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/recipes-containers/conmon/conmon_2.0.11.bb b/recipes-containers/conmon/conmon_2.0.11.bb
index 1f8e7b45..73319542 100644
--- a/recipes-containers/conmon/conmon_2.0.11.bb
+++ b/recipes-containers/conmon/conmon_2.0.11.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0"
 
 SRCREV = "ff9d97a08d7a4b58267ac03719786e4e7258cecf"
 SRC_URI = "\
-    git://github.com/containers/conmon.git;branch=main \
+    git://github.com/containers/conmon.git;branch=main;protocol=https \
 "
 
 SRC_URI[md5sum] = "5c711911d766d76813333c3812277574"
diff --git a/recipes-containers/containerd/containerd-docker_git.bb b/recipes-containers/containerd/containerd-docker_git.bb
index b18a9bb2..f6b0e287 100644
--- a/recipes-containers/containerd/containerd-docker_git.bb
+++ b/recipes-containers/containerd/containerd-docker_git.bb
@@ -1,6 +1,6 @@
 SRCREV = "3addd840653146c90a254301d6c3a663c7fd6429"
 SRC_URI = "\
-	git://github.com/docker/containerd.git;branch=v0.2.x;destsuffix=git/src/github.com/containerd/containerd \
+	git://github.com/docker/containerd.git;branch=v0.2.x;destsuffix=git/src/github.com/containerd/containerd;protocol=https \
 	"
 
 include containerd.inc
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index 8deb8024..a52a5c35 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -1,5 +1,5 @@
 SRCREV = "3b3e9d5f62a114153829f9fbe2781d27b0a2ddac"
-SRC_URI = "git://github.com/containerd/containerd;branch=release/1.2 \
+SRC_URI = "git://github.com/containerd/containerd;branch=release/1.2;protocol=https \
            file://0001-build-use-oe-provided-GO-and-flags.patch \
            file://0001-Add-build-option-GODEBUG-1.patch \
           "
diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb
index ebf5bab3..46c53e85 100644
--- a/recipes-containers/cri-o/cri-o_git.bb
+++ b/recipes-containers/cri-o/cri-o_git.bb
@@ -16,7 +16,7 @@ At a high level, we expect the scope of cri-o to be restricted to the following
 
 SRCREV_cri-o = "6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3"
 SRC_URI = "\
-	git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.17;name=cri-o \
+	git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.17;name=cri-o;protocol=https \
 	file://0001-Makefile-force-symlinks.patch \
         file://crio.conf \
 	"
diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index 704a0f9e..80fcf27e 100644
--- a/recipes-containers/criu/criu_git.bb
+++ b/recipes-containers/criu/criu_git.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
 SRCREV = "c703e3fd8404e506cc6156719b953ea0580d59a4"
 PV = "3.13+git${SRCPV}"
 
-SRC_URI = "git://github.com/checkpoint-restore/criu.git \
+SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \
            file://0001-criu-Fix-toolchain-hardcode.patch \
            file://0002-criu-Skip-documentation-install.patch \
            file://0001-criu-Change-libraries-install-directory.patch \
diff --git a/recipes-containers/crun/crun_git.bb b/recipes-containers/crun/crun_git.bb
index 252319cd..6d32339d 100644
--- a/recipes-containers/crun/crun_git.bb
+++ b/recipes-containers/crun/crun_git.bb
@@ -9,10 +9,10 @@ SRCREV_ispec = "775207bd45b6cb8153ce218cc59351799217451f"
 SRCREV_rspec = "19e92ca817772b4466f2ed2b8d808dfb7a8ab4be"
 
 SRCREV_FORMAT = "crun_rspec"
-SRC_URI = "git://github.com/containers/crun.git;branch=main;name=crun \
-           git://github.com/containers/libocispec.git;branch=main;name=libocispec;destsuffix=git/libocispec \
-           git://github.com/opencontainers/runtime-spec.git;branch=main;name=rspec;destsuffix=git/libocispec/runtime-spec \
-           git://github.com/opencontainers/image-spec.git;branch=main;name=ispec;destsuffix=git/libocispec/image-spec \
+SRC_URI = "git://github.com/containers/crun.git;branch=main;name=crun;protocol=https \
+           git://github.com/containers/libocispec.git;branch=main;name=libocispec;destsuffix=git/libocispec;protocol=https \
+           git://github.com/opencontainers/runtime-spec.git;branch=main;name=rspec;destsuffix=git/libocispec/runtime-spec;protocol=https \
+           git://github.com/opencontainers/image-spec.git;branch=main;name=ispec;destsuffix=git/libocispec/image-spec;protocol=https \
           "
 
 PV = "0.10.2+git${SRCREV_crun}"
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index 50d5a642..481d57bb 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -4,7 +4,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
 
 SRCREV_distribution="2461543d988979529609e8cb6fca9ca190dc48da"
-SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.7;name=distribution;destsuffix=git/src/github.com/docker/distribution \
+SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.7;name=distribution;destsuffix=git/src/github.com/docker/distribution;protocol=https \
            file://docker-registry.service \
           "
 
diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
index adffcec6..5aa226c6 100644
--- a/recipes-containers/docker/docker-ce_git.bb
+++ b/recipes-containers/docker/docker-ce_git.bb
@@ -21,8 +21,8 @@ DESCRIPTION = "Linux container runtime \
 SRCREV_docker = "afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3"
 SRCREV_libnetwork = "c7bae399e46fd620b8a006174b7327e4e6e647fd"
 SRC_URI = "\
-	git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
-	git://github.com/docker/libnetwork.git;branch=bump_19.03;name=libnetwork;destsuffix=git/libnetwork \
+	git://github.com/docker/docker-ce.git;branch=19.03;name=docker;protocol=https \
+	git://github.com/docker/libnetwork.git;branch=bump_19.03;name=libnetwork;destsuffix=git/libnetwork;protocol=https \
 	file://0001-libnetwork-use-GO-instead-of-go.patch \
 	file://docker.init \
 	file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \
diff --git a/recipes-containers/docker/docker-moby.bb b/recipes-containers/docker/docker-moby.bb
index 600603f1..83ccf456 100644
--- a/recipes-containers/docker/docker-moby.bb
+++ b/recipes-containers/docker/docker-moby.bb
@@ -39,9 +39,9 @@ SRCREV_moby = "420b1d36250f9cfdc561f086f25a213ecb669b6f"
 SRCREV_libnetwork = "c7bae399e46fd620b8a006174b7327e4e6e647fd"
 SRCREV_cli = "eb310fca49568dccd87c6136f774ef6fff2a1b51"
 SRC_URI = "\
-	git://github.com/moby/moby.git;branch=19.03;name=moby \
-	git://github.com/docker/libnetwork.git;branch=bump_19.03;name=libnetwork;destsuffix=git/libnetwork \
-	git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
+	git://github.com/moby/moby.git;branch=19.03;name=moby;protocol=https \
+	git://github.com/docker/libnetwork.git;branch=bump_19.03;name=libnetwork;destsuffix=git/libnetwork;protocol=https \
+	git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli;protocol=https \
 	file://docker.init \
 	file://0001-libnetwork-use-GO-instead-of-go.patch \
         file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \
diff --git a/recipes-containers/go-digest/go-digest_git.bb b/recipes-containers/go-digest/go-digest_git.bb
index a2f8cd69..001b6f12 100644
--- a/recipes-containers/go-digest/go-digest_git.bb
+++ b/recipes-containers/go-digest/go-digest_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE.code;md5=9cd86830b557232ce55e
 SRCNAME = "go-digest"
 
 PKG_NAME = "github.com/opencontainers/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}"
+SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master"
 
 SRCREV = "b6234c321f263c503268e3b205f3d9755f9d14ed"
 PV = "v1.0.0-rc0+git${SRCPV}"
diff --git a/recipes-containers/go-errors/go-errors_git.bb b/recipes-containers/go-errors/go-errors_git.bb
index 3bb74a7c..04500352 100644
--- a/recipes-containers/go-errors/go-errors_git.bb
+++ b/recipes-containers/go-errors/go-errors_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=6fe682a02df52c6653f33bd0f
 SRCNAME = "errors"
 
 PKG_NAME = "github.com/pkg/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}"
+SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master"
 
 SRCREV = "248dadf4e9068a0b3e79f02ed0a610d935de5302"
 PV = "v0.8.0+git${SRCPV}"
diff --git a/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb b/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb
index e942e4e3..eeaf83c9 100644
--- a/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb
+++ b/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE.txt;md5=920d76114a32b0fb75b3f
 SRCNAME = "cobra"
 
 PKG_NAME = "github.com/spf13/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}"
+SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master"
 
 SRCREV = "b5d8e8f46a2f829f755b6e33b454e25c61c935e1"
 PV = "v0.0.1+git${SRCPV}"
diff --git a/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb b/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb
index 2fbcb439..cb2925d3 100644
--- a/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb
+++ b/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=1e8b7dc8b906737639131047a
 SRCNAME = "pflag"
 
 PKG_NAME = "github.com/spf13/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}"
+SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master"
 
 SRCREV = "9ff6c6923cfffbcd502984b8e0c80539a94968b7"
 PV = "v1.0.0-rc4+git${SRCPV}"
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index 76107afe..8c286e23 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -1,4 +1,4 @@
-HOMEPAGE = "git://github.com/kubernetes/kubernetes"
+HOMEPAGE = "git://github.com/kubernetes/kubernetes;branch=master;protocol=https"
 SUMMARY = "Production-Grade Container Scheduling and Management"
 DESCRIPTION = "Kubernetes is an open source system for managing containerized \
 applications across multiple hosts, providing basic mechanisms for deployment, \
@@ -8,7 +8,7 @@ maintenance, and scaling of applications. \
 PV = "v1.17.1-beta+git${SRCREV_kubernetes}"
 SRCREV_kubernetes = "f45fc1861acab22eb6a4697e3fb831e85ef5ff9c"
 
-SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.17;name=kubernetes \
+SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.17;name=kubernetes;protocol=https \
            file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
            file://0001-cross-don-t-build-tests-by-default.patch \
           "
diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
index 676f3cc4..13519303 100644
--- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb
+++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "\
            spf13-pflag \
           "
 
-SRC_URI = "git://github.com/opencontainers/image-tools.git \
+SRC_URI = "git://github.com/opencontainers/image-tools.git;branch=master;protocol=https \
            file://0001-config-make-Config.User-mapping-errors-a-warning.patch \
            file://0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch"
 
diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
index adbfc1ef..b9226f5c 100644
--- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
+++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
@@ -3,7 +3,7 @@ SUMMARY = "oci-runtime-tool is a collection of tools for working with the OCI ru
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=b355a61a394a504dacde901c958f662c"
 
-SRC_URI = "git://github.com/opencontainers/runtime-tools.git \
+SRC_URI = "git://github.com/opencontainers/runtime-tools.git;branch=master;protocol=https \
            file://0001-Revert-implement-add-set-function-for-hooks-items.patch \
            "
 
diff --git a/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb b/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb
index 6734bffe..70c5b947 100644
--- a/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb
+++ b/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb
@@ -7,7 +7,7 @@ PRIORITY = "optional"
 DEPENDS = "yajl util-linux"
 
 SRCREV = "05e692346ca73e022754332a7da641230dae2ffe"
-SRC_URI = "git://github.com/projectatomic/oci-systemd-hook \
+SRC_URI = "git://github.com/projectatomic/oci-systemd-hook;branch=master;protocol=https \
            file://0001-selinux-drop-selinux-support.patch \
            file://0001-configure-drop-selinux-support.patch \
            file://0001-Add-additional-cgroup-mounts-from-root-NS-automatica.patch \
diff --git a/recipes-containers/podman-compose/podman-compose_0.1.5.bb b/recipes-containers/podman-compose/podman-compose_0.1.5.bb
index bf91705a..e63b4e5d 100644
--- a/recipes-containers/podman-compose/podman-compose_0.1.5.bb
+++ b/recipes-containers/podman-compose/podman-compose_0.1.5.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit setuptools3 pypi
 
-SRC_URI = "git://github.com/containers/podman-compose.git;branch=devel"
+SRC_URI = "git://github.com/containers/podman-compose.git;branch=devel;protocol=https"
 
 SRCREV = "6289d25a42cfdb5dfcac863b1b1b4ace32ce31b7"
 
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index af94f0c4..aedef99f 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -26,7 +26,7 @@ python __anonymous() {
 
 SRCREV = "a11c4ead10177a66ef2810a0a92ea8ce2299da07"
 SRC_URI = " \
-    git://github.com/containers/libpod.git;branch=v2.0 \
+    git://github.com/containers/libpod.git;branch=v2.0;protocol=https \
 "
 
 LICENSE = "Apache-2.0"
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb
index 08976060..203d300c 100644
--- a/recipes-containers/riddler/riddler_git.bb
+++ b/recipes-containers/riddler/riddler_git.bb
@@ -3,7 +3,7 @@ SUMMARY = "Convert `docker inspect` to opencontainers (OCI compatible) runc spec
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=20ce4c6a4f32d6ee4a68e3a7506db3f1"
 
-SRC_URI = "git://github.com/jfrazelle/riddler;branch=master"
+SRC_URI = "git://github.com/jfrazelle/riddler;branch=master;protocol=https"
 SRCREV = "23befa0b232877b5b502b828e24161d801bd67f6"
 PV = "0.1.0+git${SRCPV}"
 GO_IMPORT = "import"
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb
index 3684366f..42b4cb54 100644
--- a/recipes-containers/runc/runc-docker_git.bb
+++ b/recipes-containers/runc/runc-docker_git.bb
@@ -3,7 +3,7 @@ include runc.inc
 # Note: this rev is before the required protocol field, update when all components
 #       have been updated to match.
 SRCREV_runc-docker = "425e105d5a03fabd737a126ad93d62a9eeede87f"
-SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \
+SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker;protocol=https \
            file://0001-runc-Add-console-socket-dev-null.patch \
            file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
            file://0001-runc-docker-SIGUSR1-daemonize.patch \
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb
index a1271f69..9dc17c09 100644
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -2,7 +2,7 @@ include runc.inc
 
 SRCREV = "652297c7c7e6c94e8d064ad5916c32891a6fd388"
 SRC_URI = " \
-    git://github.com/opencontainers/runc;branch=master \
+    git://github.com/opencontainers/runc;branch=master;protocol=https \
     file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
     file://0001-Only-allow-proc-mount-if-it-is-procfs.patch \
     "
diff --git a/recipes-containers/singularity/singularity_git.bb b/recipes-containers/singularity/singularity_git.bb
index 103270dd..29cd45cf 100644
--- a/recipes-containers/singularity/singularity_git.bb
+++ b/recipes-containers/singularity/singularity_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT.md;md5=be78c34e483dd7d8439358b1e024b294 \
                     file://LICENSE.md;md5=df4326b473db6424033f1d98a5645e30 \
                     file://debian/copyright;md5=ed267cf386d9b75ab1f27f407e935b10"
 
-SRC_URI = "git://github.com/singularityware/singularity.git;protocol=https \
+SRC_URI = "git://github.com/singularityware/singularity.git;protocol=https;branch=master \
     file://0001-Use-python3.patch \
 "
 PV = "2.3.1+git${SRCPV}"
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index be72dc13..b27ea9ed 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -20,7 +20,7 @@ RDEPENDS_${PN} = " \
 "
 
 SRC_URI = " \
-    git://github.com/containers/skopeo;branch=release-1.2 \
+    git://github.com/containers/skopeo;branch=release-1.2;protocol=https \
     file://storage.conf \
     file://registries.conf \
 "
diff --git a/recipes-containers/sloci-image/sloci-image-native_git.bb b/recipes-containers/sloci-image/sloci-image-native_git.bb
index 56e8e0f1..d31983bd 100644
--- a/recipes-containers/sloci-image/sloci-image-native_git.bb
+++ b/recipes-containers/sloci-image/sloci-image-native_git.bb
@@ -1,7 +1,7 @@
 SUMMARY = "A simple CLI tool for packing rootfs into a single-layer OCI image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://git/LICENSE;md5=948cd8e59069fad992b0469af9ad7966"
-SRC_URI = "git://github.com/jirutka/sloci-image.git"
+SRC_URI = "git://github.com/jirutka/sloci-image.git;branch=master;protocol=https"
 
 DEPENDS = ""
 
diff --git a/recipes-containers/tini/tini_0.18.0.bb b/recipes-containers/tini/tini_0.18.0.bb
index 373d886a..f8b8492e 100644
--- a/recipes-containers/tini/tini_0.18.0.bb
+++ b/recipes-containers/tini/tini_0.18.0.bb
@@ -6,7 +6,7 @@ it to exit all the while reaping zombies and performing signal forwarding. "
 
 SRCREV = "fec3683b971d9c3ef73f284f176672c44b448662"
 SRC_URI = " \
-  git://github.com/krallin/tini.git \
+  git://github.com/krallin/tini.git;branch=master;protocol=https \
   file://0001-Do-not-strip-the-output-binary-allow-yocto-to-do-thi.patch \
   "
 
diff --git a/recipes-core/kata-containers/kata-agent_git.bb b/recipes-core/kata-containers/kata-agent_git.bb
index 3632ee52..f4a65155 100644
--- a/recipes-core/kata-containers/kata-agent_git.bb
+++ b/recipes-core/kata-containers/kata-agent_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/agent/LICENSE;md5=86d3
 
 GO_IMPORT = "github.com/kata-containers/agent"
 SRCREV = "e03f7d7453fabffb17e1540f28666c26178d3cbf"
-SRC_URI = "git://${GO_IMPORT}.git \
+SRC_URI = "git://${GO_IMPORT}.git;branch=master \
           "
 
 RDEPENDS_${PN}-dev_append = "bash"
diff --git a/recipes-core/kata-containers/kata-proxy_git.bb b/recipes-core/kata-containers/kata-proxy_git.bb
index 8de0bfcf..06458d2c 100644
--- a/recipes-core/kata-containers/kata-proxy_git.bb
+++ b/recipes-core/kata-containers/kata-proxy_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/proxy/LICENSE;md5=86d3
 
 GO_IMPORT = "github.com/kata-containers/proxy"
 SRCREV = "1148847739f9a9f47b92e34e4f309dc109d4dba9"
-SRC_URI = "git://${GO_IMPORT}.git \
+SRC_URI = "git://${GO_IMPORT}.git;branch=master \
           "
 
 RDEPENDS_${PN}-dev_append = "bash"
diff --git a/recipes-core/kata-containers/kata-runtime_git.bb b/recipes-core/kata-containers/kata-runtime_git.bb
index 4f250f19..d0b2cd8d 100644
--- a/recipes-core/kata-containers/kata-runtime_git.bb
+++ b/recipes-core/kata-containers/kata-runtime_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/runtime/LICENSE;md5=86
 
 GO_IMPORT = "github.com/kata-containers/runtime"
 SRCREV = "f4cf2137be58c3778d87a8ee8e258e68d1ede888"
-SRC_URI = "git://${GO_IMPORT}.git \
+SRC_URI = "git://${GO_IMPORT}.git;branch=master \
           "
 RDEPENDS_${PN}-dev_append = "bash"
 RDEPENDS_${PN} = " \
diff --git a/recipes-core/kata-containers/kata-shim_git.bb b/recipes-core/kata-containers/kata-shim_git.bb
index fb55a8e7..ebf945da 100644
--- a/recipes-core/kata-containers/kata-shim_git.bb
+++ b/recipes-core/kata-containers/kata-shim_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/shim/LICENSE;md5=86d3f
 
 GO_IMPORT = "github.com/kata-containers/shim"
 SRCREV = "bcc35aeca3ef6fa0976005c9e93525906aefed2f"
-SRC_URI = "git://${GO_IMPORT}.git \
+SRC_URI = "git://${GO_IMPORT}.git;branch=master \
           "
 
 RDEPENDS_${PN}-dev_append = "bash"
diff --git a/recipes-core/runv/runv_git.bb b/recipes-core/runv/runv_git.bb
index ef94f096..99c45e40 100644
--- a/recipes-core/runv/runv_git.bb
+++ b/recipes-core/runv/runv_git.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Hypervisor-based Runtime for OCI"
 
 SRCREV_runv = "b360a686abc6c6e896382990ef1b93ef07c7a677"
 SRC_URI = "\
-	git://github.com/hyperhq/runv.git;nobranch=1;name=runv \
+	git://github.com/hyperhq/runv.git;nobranch=1;name=runv;protocol=https \
 	"
 
 LICENSE = "Apache-2.0"
diff --git a/recipes-core/runx/runx_git.bb b/recipes-core/runx/runx_git.bb
index 3b4cd335..f739c19b 100644
--- a/recipes-core/runx/runx_git.bb
+++ b/recipes-core/runx/runx_git.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Xen Runtime for OCI"
 
 SRCREV_runx = "da0c75c58ae5232d19b1791c33545db3225e1ea9"
 SRC_URI = "\
-	  git://github.com/lf-edge/runx;nobranch=1;name=runx \
+	  git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \
           https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz;destsuffix=git/kernel/build \
           file://0001-make-kernel-cross-compilation-tweaks.patch \
           file://0001-make-initrd-cross-install-tweaks.patch \
diff --git a/recipes-devtools/go/compose-file_git.bb b/recipes-devtools/go/compose-file_git.bb
index bcf8c3d2..e98c5b97 100644
--- a/recipes-devtools/go/compose-file_git.bb
+++ b/recipes-devtools/go/compose-file_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=9cd86830b557232ce55e2a6b4
 SRCNAME = "compose-file"
 
 PKG_NAME = "github.com/aanand/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}"
+SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master"
 
 SRCREV = "a3e58764f50597b6217fec07e9bff7225c4a1719"
 PV = "3.0+git${SRCPV}"
diff --git a/recipes-devtools/go/go-build_git.bb b/recipes-devtools/go/go-build_git.bb
index e057b6d7..cbc7b9db 100644
--- a/recipes-devtools/go/go-build_git.bb
+++ b/recipes-devtools/go/go-build_git.bb
@@ -6,8 +6,8 @@ SRCREV_runx = "da0c75c58ae5232d19b1791c33545db3225e1ea9"
 SRCREV_runc = "e4363b038787addfa12e8b0acf5417d4fba01693"
 
 SRC_URI = "\
-	  git://github.com/lf-edge/runx;nobranch=1;name=runx \
-	  git://github.com/opencontainers/runc.git;nobranch=1;destsuffix=runc;name=runc \
+	  git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \
+	  git://github.com/opencontainers/runc.git;nobranch=1;destsuffix=runc;name=runc;protocol=https \
 	  "
 SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b"
 SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769"
diff --git a/recipes-devtools/go/go-capability_git.bb b/recipes-devtools/go/go-capability_git.bb
index 8524af62..19b04b58 100644
--- a/recipes-devtools/go/go-capability_git.bb
+++ b/recipes-devtools/go/go-capability_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a7304f5073e7be4ba7bffabbf9f2bbca"
 SRCNAME = "gocapability"
 
 PKG_NAME = "github.com/syndtr/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "2c00daeb6c3b45114c80ac44119e7b8801fdd852"
 PV = "0.0+git${SRCPV}"
diff --git a/recipes-devtools/go/go-cli_git.bb b/recipes-devtools/go/go-cli_git.bb
index 434594c9..ada7b14d 100644
--- a/recipes-devtools/go/go-cli_git.bb
+++ b/recipes-devtools/go/go-cli_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ed9b539ed65d73926f30ff1f1587dc44"
 SRCNAME = "cli"
 
 PKG_NAME = "github.com/codegangsta/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "27ecc97192df1bf053a22b04463f2b51b8b8373e"
 PV = "1.1.0+git${SRCPV}"
diff --git a/recipes-devtools/go/go-connections_git.bb b/recipes-devtools/go/go-connections_git.bb
index 5d071b0a..89176f72 100644
--- a/recipes-devtools/go/go-connections_git.bb
+++ b/recipes-devtools/go/go-connections_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=04424bc6f5a5be60691b9824d
 SRCNAME = "go-connections"
 
 PKG_NAME = "github.com/docker/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}"
+SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master"
 
 SRCREV = "4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366"
 PV = "0.2.1+git${SRCPV}"
diff --git a/recipes-devtools/go/go-context_git.bb b/recipes-devtools/go/go-context_git.bb
index 15f6a8dd..e873ef98 100644
--- a/recipes-devtools/go/go-context_git.bb
+++ b/recipes-devtools/go/go-context_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c50f6bd9c1e15ed0bad3bea18e3c1b7f"
 SRCNAME = "context"
 
 PKG_NAME = "github.com/gorilla/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "14f550f51af52180c2eefed15e5fd18d63c0a64a"
 
diff --git a/recipes-devtools/go/go-dbus_git.bb b/recipes-devtools/go/go-dbus_git.bb
index 23908619..9ebf3bbf 100644
--- a/recipes-devtools/go/go-dbus_git.bb
+++ b/recipes-devtools/go/go-dbus_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=09042bd5c6c96a2b9e45ddf1bc517eed"
 SRCNAME = "dbus"
 
 PKG_NAME = "github.com/godbus/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "5f6efc7ef2759c81b7ba876593971bfce311eab3"
 PV = "4.0.0+git${SRCPV}"
diff --git a/recipes-devtools/go/go-fsnotify_git.bb b/recipes-devtools/go/go-fsnotify_git.bb
index 0826aa7f..60b2f0c6 100644
--- a/recipes-devtools/go/go-fsnotify_git.bb
+++ b/recipes-devtools/go/go-fsnotify_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c38914c9a7ab03bb2b96d4baaee10769"
 SRCNAME = "fsnotify"
 
 PKG_NAME = "github.com/fsnotify/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6"
 PV = "1.2.11+git${SRCPV}"
diff --git a/recipes-devtools/go/go-libtrust_git.bb b/recipes-devtools/go/go-libtrust_git.bb
index 55659464..1949f123 100644
--- a/recipes-devtools/go/go-libtrust_git.bb
+++ b/recipes-devtools/go/go-libtrust_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8"
 SRCNAME = "libtrust"
 
 PKG_NAME = "github.com/docker/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "9cbd2a1374f46905c68a4eb3694a130610adc62a"
 PV = "0.0+git${SRCPV}"
diff --git a/recipes-devtools/go/go-logrus_git.bb b/recipes-devtools/go/go-logrus_git.bb
index aa89033e..17e57267 100644
--- a/recipes-devtools/go/go-logrus_git.bb
+++ b/recipes-devtools/go/go-logrus_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8dadfef729c08ec4e631c4f6fc5d43a0"
 SRCNAME = "logrus"
 
 PKG_NAME = "github.com/Sirupsen/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "d26492970760ca5d33129d2d799e34be5c4782eb"
 PV = "0.11.0+git${SRCPV}"
diff --git a/recipes-devtools/go/go-md2man_git.bb b/recipes-devtools/go/go-md2man_git.bb
index cc8dd5c3..ddb45df7 100644
--- a/recipes-devtools/go/go-md2man_git.bb
+++ b/recipes-devtools/go/go-md2man_git.bb
@@ -9,7 +9,7 @@ BBCLASSEXTEND = "native"
 GO_IMPORT = "github.com/cpuguy83/go-md2man"
 #GO_INSTALL = "${GO_IMPORT}/bin/go-md2man"
 
-SRC_URI = "git://${GO_IMPORT}.git"
+SRC_URI = "git://${GO_IMPORT}.git;branch=master"
 
 SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a"
 PV = "1.0.10+git${SRCPV}"
diff --git a/recipes-devtools/go/go-metalinter_git.bb b/recipes-devtools/go/go-metalinter_git.bb
index 668b431a..daeebe18 100644
--- a/recipes-devtools/go/go-metalinter_git.bb
+++ b/recipes-devtools/go/go-metalinter_git.bb
@@ -9,7 +9,7 @@ BBCLASSEXTEND = "native"
 SRCNAME = "gometalinter"
 
 PKG_NAME = "github.com/alecthomas/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "e8d801238da6f0dfd14078d68f9b53fa50a7eeb5"
 PV = "0.0+git${SRCPV}"
diff --git a/recipes-devtools/go/go-mux_git.bb b/recipes-devtools/go/go-mux_git.bb
index 7a2025a0..d6a67b0e 100644
--- a/recipes-devtools/go/go-mux_git.bb
+++ b/recipes-devtools/go/go-mux_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c50f6bd9c1e15ed0bad3bea18e3c1b7f"
 SRCNAME = "mux"
 
 PKG_NAME = "github.com/gorilla/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "136d54f81f00414c45c3c68dd47e98cc97519c5e"
 
diff --git a/recipes-devtools/go/go-patricia_git.bb b/recipes-devtools/go/go-patricia_git.bb
index 8c1e10d9..4ef75685 100644
--- a/recipes-devtools/go/go-patricia_git.bb
+++ b/recipes-devtools/go/go-patricia_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9949b99212edd6b1e24ce702376c3baf"
 SRCNAME = "go-patricia"
 
 PKG_NAME = "github.com/tchap/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "666120de432aea38ab06bd5c818f04f4129882c9"
 PV = "2.2.6+git${SRCPV}"
diff --git a/recipes-devtools/go/go-pty_git.bb b/recipes-devtools/go/go-pty_git.bb
index 02cef69e..0cbe2520 100644
--- a/recipes-devtools/go/go-pty_git.bb
+++ b/recipes-devtools/go/go-pty_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://License;md5=93958070863d769117fa33b129020050"
 SRCNAME = "pty"
 
 PKG_NAME = "github.com/creack/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
+SRC_URI = "git://${PKG_NAME}.git;branch=master"
 
 SRCREV = "05017fcccf23c823bfdea560dcc958a136e54fb7"
 
diff --git a/recipes-devtools/go/grpc-go_git.bb b/recipes-devtools/go/grpc-go_git.bb
index 48c42499..aa5d67b9 100644
--- a/recipes-devtools/go/grpc-go_git.bb
+++ b/recipes-devtools/go/grpc-go_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=a4bad33881612090c6035d839
 SRCNAME = "grpc-go"
 
 PKG_NAME = "google.golang.org/grpc"
-SRC_URI = "git://github.com/grpc/${SRCNAME}.git;destsuffix=git/src/${PKG_NAME}"
+SRC_URI = "git://github.com/grpc/${SRCNAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "777daa17ff9b5daef1cfdf915088a2ada3332bf0"
 PV = "1.4.0+git${SRCPV}"
diff --git a/recipes-devtools/go/notary_git.bb b/recipes-devtools/go/notary_git.bb
index 9cfb46ea..9f89914a 100644
--- a/recipes-devtools/go/notary_git.bb
+++ b/recipes-devtools/go/notary_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=3596b980bb036e0875174ed15
 SRCNAME = "notary"
 
 PKG_NAME = "github.com/docker/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}"
+SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master"
 
 SRCREV = "d6e1431feb32348e0650bf7551ac5cffd01d857b"
 PV = "0.6.1+git${SRCPV}"
diff --git a/recipes-extended/diod/diod_1.0.24.bb b/recipes-extended/diod/diod_1.0.24.bb
index a4a85284..0a327162 100644
--- a/recipes-extended/diod/diod_1.0.24.bb
+++ b/recipes-extended/diod/diod_1.0.24.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 PV = "1.0.24+git${SRCPV}"
 SRCREV = "0ea3fe3d829b5085307cd27a512708d99ef48199"
-SRC_URI = "git://github.com/chaos/diod.git;protocol=git \
+SRC_URI = "git://github.com/chaos/diod.git;protocol=https;branch=master \
            file://diod \
            file://diod.conf \
            file://0001-build-allow-builds-to-work-with-separate-build-dir.patch \
diff --git a/recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb b/recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb
index a8bbf0f5..30a74be2 100644
--- a/recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb
+++ b/recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRCREV = "098d9ad79fdbb8538adde08628408aa32a8b4b17"
-SRC_URI = "git://github.com/containers/fuse-overlayfs.git;nobranch=1"
+SRC_URI = "git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https"
 
 DEPENDS = "fuse3"
 
diff --git a/recipes-extended/hyperstart/hyperstart_git.bb b/recipes-extended/hyperstart/hyperstart_git.bb
index 9f984191..2b93b2a4 100644
--- a/recipes-extended/hyperstart/hyperstart_git.bb
+++ b/recipes-extended/hyperstart/hyperstart_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 
 inherit autotools-brokensep 
 
-SRC_URI = "git://github.com/hyperhq/hyperstart.git"
+SRC_URI = "git://github.com/hyperhq/hyperstart.git;branch=master;protocol=https"
 SRC_URI += "file://0001-container.c-Fix-compiler-errors-that-gcc-8.1.0-repor.patch"
 
 SRCREV = "15bb718ad34045aa1962a8204f602c6afe9a76ab"
diff --git a/recipes-extended/ipxe/ipxe_git.bb b/recipes-extended/ipxe/ipxe_git.bb
index 47c5b7ad..ac0760b5 100644
--- a/recipes-extended/ipxe/ipxe_git.bb
+++ b/recipes-extended/ipxe/ipxe_git.bb
@@ -11,7 +11,7 @@ PR = "r0"
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI = " \
-    git://git.ipxe.org/ipxe.git;protocol=https \
+    git://git.ipxe.org/ipxe.git;protocol=https;branch=master \
     file://ipxe-fix-hostcc-nopie-cflags.patch \
     "
 
diff --git a/recipes-extended/irqbalance/irqbalance_git.bb b/recipes-extended/irqbalance/irqbalance_git.bb
index 7755e8ea..aac1b706 100644
--- a/recipes-extended/irqbalance/irqbalance_git.bb
+++ b/recipes-extended/irqbalance/irqbalance_git.bb
@@ -9,7 +9,7 @@ require irqbalance.inc
 SRCREV = "b47eea84cbb93f533b0cba2f1aaf9ca4da8706b9"
 PV = "1.6.0"
 
-SRC_URI = "git://github.com/Irqbalance/irqbalance \
+SRC_URI = "git://github.com/Irqbalance/irqbalance;branch=master;protocol=https \
            file://add-initscript.patch \
            file://irqbalance-Add-status-and-reload-commands.patch \
            file://irqbalanced.service \
diff --git a/recipes-extended/kvmtool/kvmtool.bb b/recipes-extended/kvmtool/kvmtool.bb
index 90ad8a1f..d5b88671 100644
--- a/recipes-extended/kvmtool/kvmtool.bb
+++ b/recipes-extended/kvmtool/kvmtool.bb
@@ -9,7 +9,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
 inherit kernel-arch
 
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git;branch=master \
            file://external-crosscompiler.patch \
            file://0001-Avoid-pointers-for-address-of-packed-members.patch \
            file://0001-kvmtool-9p-fixed-compilation-error.patch \
diff --git a/recipes-extended/libvmi/libvmi_git.bb b/recipes-extended/libvmi/libvmi_git.bb
index 88fa5d30..62a6b3ff 100644
--- a/recipes-extended/libvmi/libvmi_git.bb
+++ b/recipes-extended/libvmi/libvmi_git.bb
@@ -8,7 +8,7 @@ PV = "0.12.0"
 
 DEPENDS = "libvirt libcheck bison fuse byacc-native"
 
-SRC_URI = "git://github.com/libvmi/libvmi.git \
+SRC_URI = "git://github.com/libvmi/libvmi.git;branch=master;protocol=https \
 "
 
 SRCREV = "6934e8a4758018983ec53ec791dd14a7d6ac31a9"
diff --git a/recipes-extended/xvisor/xvisor_0.3.0.bb b/recipes-extended/xvisor/xvisor_0.3.0.bb
index 66ad6187..8b0a2164 100644
--- a/recipes-extended/xvisor/xvisor_0.3.0.bb
+++ b/recipes-extended/xvisor/xvisor_0.3.0.bb
@@ -9,7 +9,7 @@ require xvisor-configs.inc
 inherit autotools-brokensep
 
 SRCREV = "58592ef18c71526a0045935d1e8eed5e8553b7d6"
-SRC_URI = "git://github.com/xvisor/xvisor.git \
+SRC_URI = "git://github.com/xvisor/xvisor.git;branch=master;protocol=https \
            file://0001-TESTS-Don-t-specify-mabi-or-march-for-RISC-V.patch \
           "
 
diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 3ad939bd..4a6e2977 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -13,8 +13,8 @@ SRCREV_cni = "4cfb7b568922a3c79a23e438dc52fe537fc9687e"
 # Version 0.8.5
 SRCREV_plugins = "1f33fb729ae2b8900785f896df2dc1f6fe5e8239"
 SRC_URI = "\
-	git://github.com/containernetworking/cni.git;nobranch=1;name=cni \
-        git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins \
+	git://github.com/containernetworking/cni.git;nobranch=1;name=cni;protocol=https \
+        git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https \
 	"
 
 RPROVIDES_${PN} += "kubernetes-cni"
diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb
index da6aac21..66f1f2a5 100644
--- a/recipes-networking/netns/netns_git.bb
+++ b/recipes-networking/netns/netns_git.bb
@@ -3,7 +3,7 @@ SUMMARY = "Runc hook for setting up default bridge networking."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=48ef0979a2bcc3fae14ff30b8a7f5dbf"
 
-SRC_URI = "git://github.com/genuinetools/netns;branch=master \
+SRC_URI = "git://github.com/genuinetools/netns;branch=master;protocol=https \
            file://Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch \
           "
 SRCREV = "9b103a19b917cc3762a33b7d78244b1d5e45ccfd"
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index 07258be7..86144196 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -23,7 +23,7 @@ SRC_URI = "file://openvswitch-switch \
            file://openvswitch-switch-setup \
            file://openvswitch-testcontroller \
            file://openvswitch-testcontroller-setup \
-           git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.13 \
+           git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-2.13 \
            file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \
            file://run-ptest \
            file://disable_m4_check.patch \
diff --git a/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb b/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb
index b47df968..391300d8 100644
--- a/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb
+++ b/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1e2efd29c201480c6be2744d9edade26"
 
 SRCREV = "4d38845e2e311b684fc8d1c775c725bfcd5ddc27"
-SRC_URI = "git://github.com/rootless-containers/slirp4netns.git;nobranch=1"
+SRC_URI = "git://github.com/rootless-containers/slirp4netns.git;nobranch=1;protocol=https"
 
 DEPENDS = "glib-2.0 libcap libseccomp"
 
-- 
cgit v1.2.3-54-g00ecf