All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-virtualization][PATCH dunfell] containers: Explictly reference a valid branch
@ 2021-09-08 18:02 Fabio Estevam
  2021-09-08 18:07 ` Bruce Ashfield
  0 siblings, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2021-09-08 18:02 UTC (permalink / raw)
  To: meta-virtualization; +Cc: bruce.ashfield, otavio, marex, Fabio Estevam

These repositories have dropped their master branches,
so the fetcher default no longer works.

Point to an existing branch to fix the fetch failure.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Sorry for the resend.

I was not subscribed to the list in the first time.

 recipes-containers/oci-image-spec/oci-image-spec_git.bb   | 2 +-
 recipes-containers/podman-compose/podman-compose_0.1.5.bb | 2 +-
 recipes-containers/podman/podman_git.bb                   | 2 +-
 recipes-containers/skopeo/skopeo_git.bb                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 5805740..a137bc8 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}"
+SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=main"
 
 SRCREV = "bd4f8fcb0979a663d8b97a1d4d9b030b3d2ca1fa"
 PV = "v1.0.1+git${SRCPV}"
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 4015069..b9eb1c8 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"
+SRC_URI = "git://github.com/containers/podman-compose.git;branch=devel"
 
 SRCREV = "f008986633879acf3f54848dabbf07cef8e9c68f"
 
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index aa6b25b..a8a6b02 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -26,7 +26,7 @@ python __anonymous() {
 
 SRCREV = "444a19cdd2e6108c75f6c1aadc1a2a9138a8bd73"
 SRC_URI = " \
-    git://github.com/containers/libpod.git;branch=master \
+    git://github.com/containers/libpod.git;branch=main \
 "
 
 LICENSE = "Apache-2.0"
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index f5a6231..b14c293 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 \
+    git://github.com/containers/skopeo;branch=main \
     file://storage.conf \
     file://registries.conf \
 "
-- 
2.25.1


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

* Re: [meta-virtualization][PATCH dunfell] containers: Explictly reference a valid branch
  2021-09-08 18:02 [meta-virtualization][PATCH dunfell] containers: Explictly reference a valid branch Fabio Estevam
@ 2021-09-08 18:07 ` Bruce Ashfield
  2021-09-08 18:29   ` Fabio Estevam
  0 siblings, 1 reply; 5+ messages in thread
From: Bruce Ashfield @ 2021-09-08 18:07 UTC (permalink / raw)
  To: Fabio Estevam; +Cc: meta-virtualization, Otavio Salvador, Marek Vasut

On Wed, Sep 8, 2021 at 2:02 PM Fabio Estevam <festevam@denx.de> wrote:
>
> These repositories have dropped their master branches,
> so the fetcher default no longer works.
>
> Point to an existing branch to fix the fetch failure.
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
> Sorry for the resend.
>
> I was not subscribed to the list in the first time.

You are working on an out of date master, or an old branch.

If you want some of the branch changes cherry picked, specify the
commit and branch, and I can do that.

Bruce

>
>  recipes-containers/oci-image-spec/oci-image-spec_git.bb   | 2 +-
>  recipes-containers/podman-compose/podman-compose_0.1.5.bb | 2 +-
>  recipes-containers/podman/podman_git.bb                   | 2 +-
>  recipes-containers/skopeo/skopeo_git.bb                   | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> 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 5805740..a137bc8 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}"
> +SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=main"
>
>  SRCREV = "bd4f8fcb0979a663d8b97a1d4d9b030b3d2ca1fa"
>  PV = "v1.0.1+git${SRCPV}"
> 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 4015069..b9eb1c8 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"
> +SRC_URI = "git://github.com/containers/podman-compose.git;branch=devel"
>
>  SRCREV = "f008986633879acf3f54848dabbf07cef8e9c68f"
>
> diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
> index aa6b25b..a8a6b02 100644
> --- a/recipes-containers/podman/podman_git.bb
> +++ b/recipes-containers/podman/podman_git.bb
> @@ -26,7 +26,7 @@ python __anonymous() {
>
>  SRCREV = "444a19cdd2e6108c75f6c1aadc1a2a9138a8bd73"
>  SRC_URI = " \
> -    git://github.com/containers/libpod.git;branch=master \
> +    git://github.com/containers/libpod.git;branch=main \
>  "
>
>  LICENSE = "Apache-2.0"
> diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
> index f5a6231..b14c293 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 \
> +    git://github.com/containers/skopeo;branch=main \
>      file://storage.conf \
>      file://registries.conf \
>  "
> --
> 2.25.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

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

* Re: [meta-virtualization][PATCH dunfell] containers: Explictly reference a valid branch
  2021-09-08 18:07 ` Bruce Ashfield
@ 2021-09-08 18:29   ` Fabio Estevam
  2021-09-09 18:32     ` Bruce Ashfield
  0 siblings, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2021-09-08 18:29 UTC (permalink / raw)
  To: Bruce Ashfield; +Cc: meta-virtualization, Otavio Salvador, Marek Vasut

Hi Bruce,

On 08/09/2021 15:07, Bruce Ashfield wrote:
> On Wed, Sep 8, 2021 at 2:02 PM Fabio Estevam <festevam@denx.de> wrote:
>> 
>> These repositories have dropped their master branches,
>> so the fetcher default no longer works.
>> 
>> Point to an existing branch to fix the fetch failure.
>> 
>> Signed-off-by: Fabio Estevam <festevam@denx.de>
>> ---
>> Sorry for the resend.
>> 
>> I was not subscribed to the list in the first time.
> 
> You are working on an out of date master, or an old branch.

I am working on dunfell.

> If you want some of the branch changes cherry picked, specify the
> commit and branch, and I can do that.

Could you please cherry-pick the four commits below to dunfell to fix 
the build?

oci-image-spec_git: 
https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=96712be73dbca60fdceb4be68e5454944fe42d50

podman compose: 
https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/recipes-containers/podman-compose/podman-compose_0.1.5.bb?id=f32657ae6efd35e259147582ed12fb864688402a

podman: 
https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/recipes-containers/podman/podman_git.bb?id=4344c3db4054fae135d2d2d72c2300994f69f8d4

skopeo: 
https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/recipes-containers/skopeo/skopeo_git.bb?id=c3fe6ab4276444d0ac0c1de23a935d77fc2f4404

Thanks,

Fabio Estevam
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-60 Fax: (+49)-8142-66989-80 Email: 
festevam@denx.de

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

* Re: [meta-virtualization][PATCH dunfell] containers: Explictly reference a valid branch
  2021-09-08 18:29   ` Fabio Estevam
@ 2021-09-09 18:32     ` Bruce Ashfield
  2021-09-09 18:48       ` Fabio Estevam
  0 siblings, 1 reply; 5+ messages in thread
From: Bruce Ashfield @ 2021-09-09 18:32 UTC (permalink / raw)
  To: Fabio Estevam; +Cc: meta-virtualization, Otavio Salvador, Marek Vasut

On Wed, Sep 8, 2021 at 2:29 PM Fabio Estevam <festevam@denx.de> wrote:
>
> Hi Bruce,
>
> On 08/09/2021 15:07, Bruce Ashfield wrote:
> > On Wed, Sep 8, 2021 at 2:02 PM Fabio Estevam <festevam@denx.de> wrote:
> >>
> >> These repositories have dropped their master branches,
> >> so the fetcher default no longer works.
> >>
> >> Point to an existing branch to fix the fetch failure.
> >>
> >> Signed-off-by: Fabio Estevam <festevam@denx.de>
> >> ---
> >> Sorry for the resend.
> >>
> >> I was not subscribed to the list in the first time.
> >
> > You are working on an out of date master, or an old branch.
>
> I am working on dunfell.
>
> > If you want some of the branch changes cherry picked, specify the
> > commit and branch, and I can do that.
>
> Could you please cherry-pick the four commits below to dunfell to fix
> the build?
>
> oci-image-spec_git:
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=96712be73dbca60fdceb4be68e5454944fe42d50
>
> podman compose:
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/recipes-containers/podman-compose/podman-compose_0.1.5.bb?id=f32657ae6efd35e259147582ed12fb864688402a
>
> podman:
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/recipes-containers/podman/podman_git.bb?id=4344c3db4054fae135d2d2d72c2300994f69f8d4
>
> skopeo:
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/recipes-containers/skopeo/skopeo_git.bb?id=c3fe6ab4276444d0ac0c1de23a935d77fc2f4404
>

These have been cherry-picked into dunfell.

Cheers,

Bruce

> Thanks,
>
> Fabio Estevam
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-60 Fax: (+49)-8142-66989-80 Email:
> festevam@denx.de



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

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

* Re: [meta-virtualization][PATCH dunfell] containers: Explictly reference a valid branch
  2021-09-09 18:32     ` Bruce Ashfield
@ 2021-09-09 18:48       ` Fabio Estevam
  0 siblings, 0 replies; 5+ messages in thread
From: Fabio Estevam @ 2021-09-09 18:48 UTC (permalink / raw)
  To: Bruce Ashfield; +Cc: meta-virtualization, Otavio Salvador, Marek Vasut

Hi Bruce,

On 09/09/2021 15:32, Bruce Ashfield wrote:

> These have been cherry-picked into dunfell.

Excellent, I am able to build dunfell now.

Thanks!

Fabio Estevam
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-60 Fax: (+49)-8142-66989-80 Email: 
festevam@denx.de

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

end of thread, other threads:[~2021-09-09 18:48 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-08 18:02 [meta-virtualization][PATCH dunfell] containers: Explictly reference a valid branch Fabio Estevam
2021-09-08 18:07 ` Bruce Ashfield
2021-09-08 18:29   ` Fabio Estevam
2021-09-09 18:32     ` Bruce Ashfield
2021-09-09 18:48       ` Fabio Estevam

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.