All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-virtualization][PATCH] meta-virt: sync SRC_URIs between k8s and k3s
@ 2023-02-14  6:28 Chen Qi
  2023-02-15 20:10 ` Bruce Ashfield
  0 siblings, 1 reply; 2+ messages in thread
From: Chen Qi @ 2023-02-14  6:28 UTC (permalink / raw)
  To: meta-virtualization

k3s is using a lot of SRC_URIs and some of them have corrsponding
recipe in meta-virt, which are used by k8s. These components'
SRC_URIs are better to be kept in sync, because this avoids two
local git repos (Yocto supports fetching locally) which are totally
the same. Remove the '.git' suffix from these recipes to sync the
SRC_URIs.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 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/oci-image-spec/oci-image-spec_git.bb     | 2 +-
 recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-containers/go-digest/go-digest_git.bb b/recipes-containers/go-digest/go-digest_git.bb
index c06a1420..ad2da25d 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};branch=master;protocol=https"
+SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 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 f1d7ef3b..678b0242 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};branch=master;protocol=https"
+SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "5dd12d0cfe7f152f80558d591504ce685299311e"
 PV = "v0.8.1+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 b272f164..b2ae9191 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};branch=master;protocol=https"
+SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 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 ea63029a..5d66de3a 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};branch=master;protocol=https"
+SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
 
 SRCREV = "d5e0c0615acee7028e1e2740a11102313be88de1"
 PV = "v1.0.5+git${SRCPV}"
diff --git a/recipes-containers/oci-image-spec/oci-image-spec_git.bb b/recipes-containers/oci-image-spec/oci-image-spec_git.bb
index d13e3d63..22cb8913 100644
--- a/recipes-containers/oci-image-spec/oci-image-spec_git.bb
+++ b/recipes-containers/oci-image-spec/oci-image-spec_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=27ef03aa2da6e424307f102e8
 SRCNAME = "image-spec"
 
 PKG_NAME = "github.com/opencontainers/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
+SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
 
 SRCREV = "02efb9a75ee11e05937b535cc5f228f9343ab2f5"
 PV = "v1.0.2+git${SRCPV}"
diff --git a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
index 5e0be285..e5a9ef04 100644
--- a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
+++ b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=b355a61a394a504dacde901c9
 SRCNAME = "runtime-spec"
 
 PKG_NAME = "github.com/opencontainers/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
+SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
 
 SRCREV = "7ceeb8af52593e37d8ef28bd350f50044b7adf1d"
 PV = "v1.0.2+git${SRCPV}"
-- 
2.37.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [meta-virtualization][PATCH] meta-virt: sync SRC_URIs between k8s and k3s
  2023-02-14  6:28 [meta-virtualization][PATCH] meta-virt: sync SRC_URIs between k8s and k3s Chen Qi
@ 2023-02-15 20:10 ` Bruce Ashfield
  0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2023-02-15 20:10 UTC (permalink / raw)
  To: Chen Qi; +Cc: meta-virtualization

A good optimization.

I'm still working on testing and merging my WIP k8s and the pending
patches, but no need to make this wait for that effort.

merged.

Bruce

In message: [meta-virtualization][PATCH] meta-virt: sync SRC_URIs between k8s and k3s
on 13/02/2023 Chen Qi wrote:

> k3s is using a lot of SRC_URIs and some of them have corrsponding
> recipe in meta-virt, which are used by k8s. These components'
> SRC_URIs are better to be kept in sync, because this avoids two
> local git repos (Yocto supports fetching locally) which are totally
> the same. Remove the '.git' suffix from these recipes to sync the
> SRC_URIs.
> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  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/oci-image-spec/oci-image-spec_git.bb     | 2 +-
>  recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/recipes-containers/go-digest/go-digest_git.bb b/recipes-containers/go-digest/go-digest_git.bb
> index c06a1420..ad2da25d 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};branch=master;protocol=https"
> +SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
>  
>  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 f1d7ef3b..678b0242 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};branch=master;protocol=https"
> +SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
>  
>  SRCREV = "5dd12d0cfe7f152f80558d591504ce685299311e"
>  PV = "v0.8.1+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 b272f164..b2ae9191 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};branch=master;protocol=https"
> +SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
>  
>  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 ea63029a..5d66de3a 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};branch=master;protocol=https"
> +SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=master;protocol=https"
>  
>  SRCREV = "d5e0c0615acee7028e1e2740a11102313be88de1"
>  PV = "v1.0.5+git${SRCPV}"
> diff --git a/recipes-containers/oci-image-spec/oci-image-spec_git.bb b/recipes-containers/oci-image-spec/oci-image-spec_git.bb
> index d13e3d63..22cb8913 100644
> --- a/recipes-containers/oci-image-spec/oci-image-spec_git.bb
> +++ b/recipes-containers/oci-image-spec/oci-image-spec_git.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=27ef03aa2da6e424307f102e8
>  SRCNAME = "image-spec"
>  
>  PKG_NAME = "github.com/opencontainers/${SRCNAME}"
> -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
> +SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
>  
>  SRCREV = "02efb9a75ee11e05937b535cc5f228f9343ab2f5"
>  PV = "v1.0.2+git${SRCPV}"
> diff --git a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
> index 5e0be285..e5a9ef04 100644
> --- a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
> +++ b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=b355a61a394a504dacde901c9
>  SRCNAME = "runtime-spec"
>  
>  PKG_NAME = "github.com/opencontainers/${SRCNAME}"
> -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
> +SRC_URI = "git://${PKG_NAME};destsuffix=git/src/${PKG_NAME};branch=main;protocol=https"
>  
>  SRCREV = "7ceeb8af52593e37d8ef28bd350f50044b7adf1d"
>  PV = "v1.0.2+git${SRCPV}"
> -- 
> 2.37.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7852): https://lists.yoctoproject.org/g/meta-virtualization/message/7852
> Mute This Topic: https://lists.yoctoproject.org/mt/96954816/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-02-15 20:10 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-14  6:28 [meta-virtualization][PATCH] meta-virt: sync SRC_URIs between k8s and k3s Chen Qi
2023-02-15 20:10 ` Bruce Ashfield

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.