[meta-virtualization][PATCH 1/2] crun: branch "master" renamed to "main"

[meta-virtualization][PATCH 1/2] crun: branch "master" renamed to "main"

[h.assmann]

crun "master" branch has been renamed to "main", so change SRC_URI
accordingly.

Signed-off-by: Holger Assmann <h.assmann@pengutronix.de>
---
 recipes-containers/crun/crun_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/crun/crun_git.bb b/recipes-containers/crun/crun_git.bb
index ced1e1c..ed2c5b0 100644
--- a/recipes-containers/crun/crun_git.bb
+++ b/recipes-containers/crun/crun_git.bb
@@ -9,7 +9,7 @@ SRCREV_ispec = "79b036d80240ae530a8de15e1d21c7ab9292c693"
 SRCREV_rspec = "7413a7f753e1bd9a6a9c6dc7f96f55888cbbd476"
 
 SRCREV_FORMAT = "crun_rspec"
-SRC_URI = "git://github.com/containers/crun.git;branch=master;name=crun \
+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=master;name=ispec;destsuffix=git/libocispec/image-spec \
-- 
2.29.2

[meta-virtualization][PATCH 2/2] conmon: branch "master" renamed to "main"

[Holger Assmann]

Without further parametrization, do_fetch tries do access the source via
the "master" branch of the respective repository. Since this branch has
been renamed to "main", further specification has become necessary.

Signed-off-by: Holger Assmann <h.assmann@pengutronix.de>
---
 recipes-containers/conmon/conmon_2.0.18.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/conmon/conmon_2.0.18.bb b/recipes-containers/conmon/conmon_2.0.18.bb
index d0a5739..b5c229d 100644
--- a/recipes-containers/conmon/conmon_2.0.18.bb
+++ b/recipes-containers/conmon/conmon_2.0.18.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 go-md2man-native"
 
 SRCREV = "0e155c83aa739ef0a0540ec9f9d265f57f68038b"
 SRC_URI = "\
-    git://github.com/containers/conmon.git \
+    git://github.com/containers/conmon.git;branch=main \
 "
 
 PV = "2.0.26+git${SRCPV}"
-- 
2.29.2

Re: [meta-virtualization][PATCH 1/2] crun: branch "master" renamed to "main"

[Bruce Ashfield]

Thanks for the fix!

I had made the same changes over the weekend, and coupled them with
bumps to the recipes. They are now pushed to the repo (and the branch
changes cherry picked to older releases).

Bruce

On Mon, Jun 21, 2021 at 7:44 AM Holger Assmann <h.assmann@pengutronix.de> wrote:
>
> crun "master" branch has been renamed to "main", so change SRC_URI
> accordingly.
>
> Signed-off-by: Holger Assmann <h.assmann@pengutronix.de>
> ---
>  recipes-containers/crun/crun_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-containers/crun/crun_git.bb b/recipes-containers/crun/crun_git.bb
> index ced1e1c..ed2c5b0 100644
> --- a/recipes-containers/crun/crun_git.bb
> +++ b/recipes-containers/crun/crun_git.bb
> @@ -9,7 +9,7 @@ SRCREV_ispec = "79b036d80240ae530a8de15e1d21c7ab9292c693"
>  SRCREV_rspec = "7413a7f753e1bd9a6a9c6dc7f96f55888cbbd476"
>
>  SRCREV_FORMAT = "crun_rspec"
> -SRC_URI = "git://github.com/containers/crun.git;branch=master;name=crun \
> +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=master;name=ispec;destsuffix=git/libocispec/image-spec \
> --
> 2.29.2
>
>
> 
>


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