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>

24 files changed, 36 insertions, 36 deletions

diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb
index e2f452c1..26ba3612 100644
--- a/recipes-containers/conmon/conmon_git.bb
+++ b/recipes-containers/conmon/conmon_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "glib-2.0 go-md2man-native libseccomp"
 
 SRCREV = "1ef246896b4f6566964ed861b98cd32d0e7bf7a2"
 SRC_URI = "\
-    git://github.com/containers/conmon.git;branch=main \
+    git://github.com/containers/conmon.git;branch=main;protocol=https \
 "
 
 PV = "2.0.29+git${SRCPV}"
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index b9af08c4..fbf0c64c 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
 
 
 SRCREV = "69e5db821af6458b4078d654ad3dcb3f31faa522"
-SRC_URI = "git://github.com/containerd/containerd;branch=release/1.5 \
+SRC_URI = "git://github.com/containerd/containerd;branch=release/1.5;protocol=https \
            file://0001-Add-build-option-GODEBUG-1.patch \
            file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
           "
diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb
index 5cecc26e..41b86251 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 = "1d447191ee73ead59f344f354edac5d64f377e15"
 SRC_URI = "\
-        git://github.com/kubernetes-sigs/cri-o.git;branch=master;name=cri-o \
+        git://github.com/kubernetes-sigs/cri-o.git;branch=master;name=cri-o;protocol=https \
         file://0001-Makefile-force-symlinks.patch \
         file://crio.conf \
         "
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb
index 06d1b439..74700a07 100644
--- a/recipes-containers/cri-tools/cri-tools_git.bb
+++ b/recipes-containers/cri-tools/cri-tools_git.bb
@@ -18,7 +18,7 @@ What is not in scope for this project? \
 
 SRCREV_cri-tools = "de32df077e6b0e9e31ce367dfc34c1b6b46e30fa"
 SRC_URI = "\
-        git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools \
+        git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https \
         file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \
         "
 
diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index 09ed8434..2daf16c3 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 = "4a1731891e91e62f15c40c361aff2a8a54d91bb3"
 PV = "3.16.1+git${SRCPV}"
 
-SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master \
+SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \
            file://0002-criu-Skip-documentation-install.patch \
            file://0001-criu-Change-libraries-install-directory.patch \
            file://lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch \
diff --git a/recipes-containers/crun/crun_git.bb b/recipes-containers/crun/crun_git.bb
index d103bac7..68f7f432 100644
--- a/recipes-containers/crun/crun_git.bb
+++ b/recipes-containers/crun/crun_git.bb
@@ -10,11 +10,11 @@ SRCREV_rspec = "ab23082b188344f6fbb63a441ea00ffc2852d06d"
 SRCREV_yajl = "f344d21280c3e4094919fd318bc5ce75da91fc06"
 
 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=master;name=rspec;destsuffix=git/libocispec/runtime-spec \
-           git://github.com/opencontainers/image-spec.git;branch=main;name=ispec;destsuffix=git/libocispec/image-spec \
-           git://github.com/containers/yajl.git;branch=main;name=yajl;destsuffix=git/libocispec/yajl \
+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=master;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 \
+           git://github.com/containers/yajl.git;branch=main;name=yajl;destsuffix=git/libocispec/yajl;protocol=https \
           "
 
 PV = "1.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 1f6334fa..57a4c978 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="61e7e208239878249a7ee4dae3c16c2d08a32d19"
-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 \
            file://0001-build-use-to-use-cross-go-compiler.patch \
           "
diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
index 71d659ce..5fe8fbd5 100644
--- a/recipes-containers/docker/docker-ce_git.bb
+++ b/recipes-containers/docker/docker-ce_git.bb
@@ -36,9 +36,9 @@ SRCREV_libnetwork = "64b7a4574d1426139437d20e81c0b6d391130ec8"
 SRCREV_cli = "62eae52c2a76f4c1dcf79dfc7b5ea3bf5eebab8b"
 SRCREV_FORMAT = "docker_libnetwork"
 SRC_URI = "\
-        git://github.com/docker/docker.git;branch=20.10;name=docker \
-        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
-        git://github.com/docker/cli;branch=20.10;name=cli;destsuffix=git/cli \
+        git://github.com/docker/docker.git;branch=20.10;name=docker;protocol=https \
+        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork;protocol=https \
+        git://github.com/docker/cli;branch=20.10;name=cli;destsuffix=git/cli;protocol=https \
         file://0001-libnetwork-use-GO-instead-of-go.patch \
         file://docker.init \
         file://0001-dynbinary-use-go-cross-compiler.patch \
diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb
index 85d49ec2..138d9d22 100644
--- a/recipes-containers/docker/docker-moby_git.bb
+++ b/recipes-containers/docker/docker-moby_git.bb
@@ -39,9 +39,9 @@ SRCREV_libnetwork = "64b7a4574d1426139437d20e81c0b6d391130ec8"
 SRCREV_cli = "62eae52c2a76f4c1dcf79dfc7b5ea3bf5eebab8b"
 SRCREV_FORMAT = "moby_libnetwork"
 SRC_URI = "\
-        git://github.com/moby/moby.git;branch=20.10;name=moby \
-        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
-        git://github.com/docker/cli;branch=20.10;name=cli;destsuffix=git/cli \
+        git://github.com/moby/moby.git;branch=20.10;name=moby;protocol=https \
+        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork;protocol=https \
+        git://github.com/docker/cli;branch=20.10;name=cli;destsuffix=git/cli;protocol=https \
         file://docker.init \
         file://0001-libnetwork-use-GO-instead-of-go.patch \
         file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \
diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb
index e341ad7f..1a43a533 100644
--- a/recipes-containers/k3s/k3s_git.bb
+++ b/recipes-containers/k3s/k3s_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://k3s.io/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/src/import/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 
-SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.22;name=k3s \
+SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.22;name=k3s;protocol=https \
            file://k3s.service \
            file://k3s-agent.service \
            file://k3s-agent \
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index 901de4dc..204abb6b 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;branch=master"
+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, \
@@ -13,8 +13,8 @@ PE = "1"
 BBCLASSEXTEND = "devupstream:target"
 LIC_FILES_CHKSUM:class-devupstream = "file://src/import/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 DEFAULT_PREFERENCE:class-devupstream = "-1"
-SRC_URI:class-devupstream = "git://github.com/kubernetes/kubernetes.git;branch=master;name=kubernetes \
-                             git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release \
+SRC_URI:class-devupstream = "git://github.com/kubernetes/kubernetes.git;branch=master;name=kubernetes;protocol=https \
+                             git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release;protocol=https \
                             "
 SRCREV_kubernetes:class-devupstream = "f6331c74b673d3039240edc77cd66696bbefdd9c"
 SRCREV_kubernetes-release:class-devupstream = "7c1aa83dac555de6f05500911467b70aca4949f0"
@@ -22,8 +22,8 @@ PV:class-devupstream = "v1.23-alpha+git${SRCPV}"
 
 SRCREV_FORMAT ?= "kubernetes_release"
 
-SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.22;name=kubernetes \
-           git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release"
+SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.22;name=kubernetes;protocol=https \
+           git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release;protocol=https"
 
 SRC_URI:append = " \
            file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
index ba1cef5a..61c93ec1 100644
--- a/recipes-containers/lxc/lxc_git.bb
+++ b/recipes-containers/lxc/lxc_git.bb
@@ -36,7 +36,7 @@ RDEPENDS:${PN}-ptest += "file make gmp nettle gnutls bash libgcc"
 
 RDEPENDS:${PN}-networking += "iptables"
 
-SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-4.0 \
+SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-4.0;protocol=https \
         file://lxc-1.0.0-disable-udhcp-from-busybox-template.patch \
         file://run-ptest \
         file://lxc-fix-B-S.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 4b3ae841..f3cfe117 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;branch=master \
+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 b03cff33..6fab0870 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;branch=master \
+SRC_URI = "git://github.com/opencontainers/runtime-tools.git;branch=master;protocol=https \
            file://0001-Revert-implement-add-set-function-for-hooks-items.patch \
            file://0001-build-use-for-cross-compiler.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 2cda5acd..67aa7ddb 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;branch=master \
+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 b7a29482..95e14648 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
 
-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 a77f23b5..5ab79d30 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -19,7 +19,7 @@ DEPENDS = " \
 
 SRCREV = "6e8de00bb224f9931d7402648f0177e7357ed079"
 SRC_URI = " \
-    git://github.com/containers/libpod.git;branch=v3.4 \
+    git://github.com/containers/libpod.git;branch=v3.4;protocol=https \
 "
 
 LICENSE = "Apache-2.0"
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb
index 5ba041a0..be751d62 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 \
            file://0001-build-use-to-select-cross-compiler.patch \
           "
 
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb
index c3dc6ff8..4a46fd2f 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 = "04bcb7c71550a0212bfb876db7bac723ae13296a"
-SRC_URI = "git://github.com/opencontainers/runc;branch=release-1.0;name=runc-docker \
+SRC_URI = "git://github.com/opencontainers/runc;branch=release-1.0;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 37955403..16ef5098 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 = "86d83333d765f4535e4898d6778388dab715eb7c"
 SRC_URI = " \
-    git://github.com/opencontainers/runc;branch=release-1.0 \
+    git://github.com/opencontainers/runc;branch=release-1.0;protocol=https \
     file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
     "
 RUNC_VERSION = "1.0.2"
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index 39ee8ca6..77a187e0 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_git.bb
@@ -21,7 +21,7 @@ RDEPENDS:${PN} = " \
 "
 
 SRC_URI = " \
-    git://github.com/containers/skopeo;branch=release-1.4 \
+    git://github.com/containers/skopeo;branch=release-1.4;protocol=https \
     file://0001-Makefile-use-pkg-config-instead-of-gpgme-config.patch \
     file://storage.conf \
     file://registries.conf \
diff --git a/recipes-containers/sloci-image/sloci-image_git.bb b/recipes-containers/sloci-image/sloci-image_git.bb
index 1491ec7e..37f91045 100644
--- a/recipes-containers/sloci-image/sloci-image_git.bb
+++ b/recipes-containers/sloci-image/sloci-image_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://LICENSE;md5=948cd8e59069fad992b0469af9ad7966"
-SRC_URI = "git://github.com/jirutka/sloci-image.git;branch=master \
+SRC_URI = "git://github.com/jirutka/sloci-image.git;branch=master;protocol=https \
            file://0001-sloci-image-fix-variant-quoting.patch \
           "
 
diff --git a/recipes-containers/tini/tini_0.19.0.bb b/recipes-containers/tini/tini_0.19.0.bb
index 69e3991a..914cffbf 100644
--- a/recipes-containers/tini/tini_0.19.0.bb
+++ b/recipes-containers/tini/tini_0.19.0.bb
@@ -6,7 +6,7 @@ it to exit all the while reaping zombies and performing signal forwarding. "
 
 SRCREV = "b9f42a0e7bb46efea0c9e3d8610c96ab53b467f8"
 SRC_URI = " \
-  git://github.com/krallin/tini.git;branch=master \
+  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-containers/umoci/umoci_git.bb b/recipes-containers/umoci/umoci_git.bb
index 3c8b2fb3..b1a17280 100644
--- a/recipes-containers/umoci/umoci_git.bb
+++ b/recipes-containers/umoci/umoci_git.bb
@@ -7,7 +7,7 @@ RDEPENDS:${PN} = "skopeo"
 RDEPENDS:${PN}:class-native = ""
 
 SRCREV_umoci = "758044fc26ad65eb900143e90d1e22c2d6e4484d"
-SRC_URI = "git://github.com/opencontainers/umoci.git;branch=main;name=umoci;destsuffix=github.com/opencontainers/umoci \
+SRC_URI = "git://github.com/opencontainers/umoci.git;branch=main;name=umoci;destsuffix=github.com/opencontainers/umoci;protocol=https \
           "
 
 PV = "v0.4.7-dev+git${SRCPV}"