[PATCH] conmon: switch to main branch

[PATCH] conmon: switch to main branch

[Yu, Mingli]

From: Mingli Yu <mingli.yu@windriver.com>

Switch to main branch to fix do_fetch error.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 recipes-containers/conmon/conmon_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb
index 74f5bfa..974eb07 100644
--- a/recipes-containers/conmon/conmon_git.bb
+++ b/recipes-containers/conmon/conmon_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 go-md2man-native"
 
 SRCREV = "31614525ebc5fd9668a6e084b5638d71b903bf6d"
 SRC_URI = "\
-    git://github.com/containers/conmon.git \
+    git://github.com/containers/conmon.git;branch=main \
 "
 
 PV = "2.0.28+git${SRCPV}"
-- 
2.29.2

Re: [meta-virtualization] [PATCH] conmon: switch to main branch

[Bruce Ashfield]

Thanks for the change.

I had done the same myself over the weekend, but was still doing a few tests.

I pushed the change this morning, and have also cherry picked it to
older releases.

Bruce

On Mon, Jun 21, 2021 at 1:41 AM Yu, Mingli <mingli.yu@windriver.com> wrote:
>
> From: Mingli Yu <mingli.yu@windriver.com>
>
> Switch to main branch to fix do_fetch error.
>
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
>  recipes-containers/conmon/conmon_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb
> index 74f5bfa..974eb07 100644
> --- a/recipes-containers/conmon/conmon_git.bb
> +++ b/recipes-containers/conmon/conmon_git.bb
> @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 go-md2man-native"
>
>  SRCREV = "31614525ebc5fd9668a6e084b5638d71b903bf6d"
>  SRC_URI = "\
> -    git://github.com/containers/conmon.git \
> +    git://github.com/containers/conmon.git;branch=main \
>  "
>
>  PV = "2.0.28+git${SRCPV}"
> --
> 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

Re: [meta-virtualization] [PATCH] conmon: switch to main branch

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1815 bytes --]

Yes, I see it in:
https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=950b24b2d5fe454c9d3a9eab5691753067e4b7d0

On Mon, Jul 5, 2021 at 1:25 AM Yu, Mingli <mingli.yu@windriver.com> wrote:

>
>
> On 6/21/21 8:58 PM, Bruce Ashfield wrote:
> > [Please note: This e-mail is from an EXTERNAL e-mail address]
> >
> > Thanks for the change.
> >
> > I had done the same myself over the weekend, but was still doing a few
> tests.
> >
> > I pushed the change this morning, and have also cherry picked it to
> > older releases.
>
> Thanks Bruce!
> BTW is this change merged?
>
> Thanks,
>
> >
> > Bruce
> >
> > On Mon, Jun 21, 2021 at 1:41 AM Yu, Mingli <mingli.yu@windriver.com>
> wrote:
> >>
> >> From: Mingli Yu <mingli.yu@windriver.com>
> >>
> >> Switch to main branch to fix do_fetch error.
> >>
> >> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> >> ---
> >>   recipes-containers/conmon/conmon_git.bb | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/recipes-containers/conmon/conmon_git.bb
> b/recipes-containers/conmon/conmon_git.bb
> >> index 74f5bfa..974eb07 100644
> >> --- a/recipes-containers/conmon/conmon_git.bb
> >> +++ b/recipes-containers/conmon/conmon_git.bb
> >> @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 go-md2man-native"
> >>
> >>   SRCREV = "31614525ebc5fd9668a6e084b5638d71b903bf6d"
> >>   SRC_URI = "\
> >> -    git://github.com/containers/conmon.git \
> >> +    git://github.com/containers/conmon.git;branch=main \
> >>   "
> >>
> >>   PV = "2.0.28+git${SRCPV}"
> >> --
> >> 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
> >
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 3384 bytes --]

Re: [meta-virtualization] [PATCH] conmon: switch to main branch

[Yu, Mingli]

On 6/21/21 8:58 PM, Bruce Ashfield wrote:
> [Please note: This e-mail is from an EXTERNAL e-mail address]
> 
> Thanks for the change.
> 
> I had done the same myself over the weekend, but was still doing a few tests.
> 
> I pushed the change this morning, and have also cherry picked it to
> older releases.

Thanks Bruce!
BTW is this change merged?

Thanks,

> 
> Bruce
> 
> On Mon, Jun 21, 2021 at 1:41 AM Yu, Mingli <mingli.yu@windriver.com> wrote:
>>
>> From: Mingli Yu <mingli.yu@windriver.com>
>>
>> Switch to main branch to fix do_fetch error.
>>
>> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>> ---
>>   recipes-containers/conmon/conmon_git.bb | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb
>> index 74f5bfa..974eb07 100644
>> --- a/recipes-containers/conmon/conmon_git.bb
>> +++ b/recipes-containers/conmon/conmon_git.bb
>> @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 go-md2man-native"
>>
>>   SRCREV = "31614525ebc5fd9668a6e084b5638d71b903bf6d"
>>   SRC_URI = "\
>> -    git://github.com/containers/conmon.git \
>> +    git://github.com/containers/conmon.git;branch=main \
>>   "
>>
>>   PV = "2.0.28+git${SRCPV}"
>> --
>> 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
> 

Re: [meta-virtualization] [PATCH] conmon: switch to main branch

[Yu, Mingli]

On 7/5/21 4:27 PM, Martin Jansa wrote:
> **[Please note: This e-mail is from an EXTERNAL e-mail address]
> 
> Yes, I see it in:
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=950b24b2d5fe454c9d3a9eab5691753067e4b7d0 
> <https://urldefense.com/v3/__https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=950b24b2d5fe454c9d3a9eab5691753067e4b7d0__;!!AjveYdw8EvQ!LOd1jhUL1lTDqPYpPtkx3VUegEfozaL2ilIAtjJX06CKSGmSryem3XvN3YXPrKZ4Yjs$>

Oh, yes, I see, thanks Martin very much for your pointing out!

Thanks,

> 
> On Mon, Jul 5, 2021 at 1:25 AM Yu, Mingli <mingli.yu@windriver.com 
> <mailto:mingli.yu@windriver.com>> wrote:
> 
> 
> 
>     On 6/21/21 8:58 PM, Bruce Ashfield wrote:
>      > [Please note: This e-mail is from an EXTERNAL e-mail address]
>      >
>      > Thanks for the change.
>      >
>      > I had done the same myself over the weekend, but was still doing
>     a few tests.
>      >
>      > I pushed the change this morning, and have also cherry picked it to
>      > older releases.
> 
>     Thanks Bruce!
>     BTW is this change merged?
> 
>     Thanks,
> 
>      >
>      > Bruce
>      >
>      > On Mon, Jun 21, 2021 at 1:41 AM Yu, Mingli
>     <mingli.yu@windriver.com <mailto:mingli.yu@windriver.com>> wrote:
>      >>
>      >> From: Mingli Yu <mingli.yu@windriver.com
>     <mailto:mingli.yu@windriver.com>>
>      >>
>      >> Switch to main branch to fix do_fetch error.
>      >>
>      >> Signed-off-by: Mingli Yu <mingli.yu@windriver.com
>     <mailto:mingli.yu@windriver.com>>
>      >> ---
>      >>   recipes-containers/conmon/conmon_git.bb
>     <https://urldefense.com/v3/__http://conmon_git.bb__;!!AjveYdw8EvQ!LOd1jhUL1lTDqPYpPtkx3VUegEfozaL2ilIAtjJX06CKSGmSryem3XvN3YXP1SFgxcA$>
>     | 2 +-
>      >>   1 file changed, 1 insertion(+), 1 deletion(-)
>      >>
>      >> diff --git a/recipes-containers/conmon/conmon_git.bb
>     <https://urldefense.com/v3/__http://conmon_git.bb__;!!AjveYdw8EvQ!LOd1jhUL1lTDqPYpPtkx3VUegEfozaL2ilIAtjJX06CKSGmSryem3XvN3YXP1SFgxcA$>
>     b/recipes-containers/conmon/conmon_git.bb
>     <https://urldefense.com/v3/__http://conmon_git.bb__;!!AjveYdw8EvQ!LOd1jhUL1lTDqPYpPtkx3VUegEfozaL2ilIAtjJX06CKSGmSryem3XvN3YXP1SFgxcA$>
>      >> index 74f5bfa..974eb07 100644
>      >> --- a/recipes-containers/conmon/conmon_git.bb
>     <https://urldefense.com/v3/__http://conmon_git.bb__;!!AjveYdw8EvQ!LOd1jhUL1lTDqPYpPtkx3VUegEfozaL2ilIAtjJX06CKSGmSryem3XvN3YXP1SFgxcA$>
>      >> +++ b/recipes-containers/conmon/conmon_git.bb
>     <https://urldefense.com/v3/__http://conmon_git.bb__;!!AjveYdw8EvQ!LOd1jhUL1lTDqPYpPtkx3VUegEfozaL2ilIAtjJX06CKSGmSryem3XvN3YXP1SFgxcA$>
>      >> @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 go-md2man-native"
>      >>
>      >>   SRCREV = "31614525ebc5fd9668a6e084b5638d71b903bf6d"
>      >>   SRC_URI = "\
>      >> -    git://github.com/containers/conmon.git
>     <https://urldefense.com/v3/__http://github.com/containers/conmon.git__;!!AjveYdw8EvQ!LOd1jhUL1lTDqPYpPtkx3VUegEfozaL2ilIAtjJX06CKSGmSryem3XvN3YXPT69BMFQ$>
>     \
>      >> +    git://github.com/containers/conmon.git;branch=main
>     <https://urldefense.com/v3/__http://github.com/containers/conmon.git;branch=main__;!!AjveYdw8EvQ!LOd1jhUL1lTDqPYpPtkx3VUegEfozaL2ilIAtjJX06CKSGmSryem3XvN3YXPi8yxuZI$>
>     \
>      >>   "
>      >>
>      >>   PV = "2.0.28+git${SRCPV}"
>      >> --
>      >> 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
>      >
> 
>     
>