Re: [meta-virtualization][PATCH] cni: Add ;protocol=https for flannel_plugin SRC_URI

2022-04-11 Thread Bruce Ashfield
On Mon, Apr 11, 2022 at 6:45 AM Diego Sueiro  wrote:

> Also, fix the indentation for the SRC_URI variable assignment.
>
>
It had a protocol specification already, I just managed to miss an 'o'.
I've fixed that, and pushed the change.

Annoying that github didn't break/stop my build immediately with that typo,
but at least it is fixed now

Bruce



> Signed-off-by: Diego Sueiro 
> ---
>  recipes-networking/cni/cni_git.bb | 9 +
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/
> cni_git.bb
> index 42eed1b..9248af2 100644
> --- a/recipes-networking/cni/cni_git.bb
> +++ b/recipes-networking/cni/cni_git.bb
> @@ -15,10 +15,11 @@ SRCREV_plugins =
> "b8a10bbe111e9db72433f357c37077554ada7ca1"
>  SRCREV_flannel_plugin = "076c4462d6c6887614fc881b806b690b9e56ceb2"
>  SRCREV_FORMAT = "cni_plugins"
>  SRC_URI = "\
> -   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
> 
> \
> -git://
> github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protcol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel
> 
> \
> -   "
> +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
> 
> \
> +git://
> github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protcol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel;protocol=https
> 
> \
> +"
> +
>  LICENSE = "Apache-2.0"
>  LIC_FILES_CHKSUM =
> "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
>
> --
> 2.35.1
>
>
> 
>
>

-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7149): 
https://lists.yoctoproject.org/g/meta-virtualization/message/7149
Mute This Topic: https://lists.yoctoproject.org/mt/90391972/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[meta-virtualization][PATCH] cni: Add ;protocol=https for flannel_plugin SRC_URI

2022-04-11 Thread Diego Sueiro
Also, fix the indentation for the SRC_URI variable assignment.

Signed-off-by: Diego Sueiro 
---
 recipes-networking/cni/cni_git.bb | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-networking/cni/cni_git.bb 
b/recipes-networking/cni/cni_git.bb
index 42eed1b..9248af2 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -15,10 +15,11 @@ SRCREV_plugins = "b8a10bbe111e9db72433f357c37077554ada7ca1"
 SRCREV_flannel_plugin = "076c4462d6c6887614fc881b806b690b9e56ceb2"
 SRCREV_FORMAT = "cni_plugins"
 SRC_URI = "\
-   
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
 \
-
git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protcol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel
 \
-   "
+
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
 \
+
git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protcol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel;protocol=https
 \
+"
+
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = 
"file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 
-- 
2.35.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7148): 
https://lists.yoctoproject.org/g/meta-virtualization/message/7148
Mute This Topic: https://lists.yoctoproject.org/mt/90391972/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-