Skip to contentSkip to conversation

conmon: switch to main branch

PATCH In review Yu, Mingli 3 participants 5 messages Jun 21, 2021 – Jul 6, 2021

lore
Share & tools
lore

Yu, Mingli

author
#0 lore raw

PATCH 1/1 conmon: switch to main branch

From: Mingli Yu <[email protected]>

Switch to main branch to fix do_fetch error.

---
 recipes-containers/conmon/conmon_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-containers/conmon/conmon_git.bb +1 -1
index 74f5bfa..974eb07 100644
@@ -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}"
Signature · 1 line
2.29.2
#1 lore raw

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

Quoted 29 lines · Mingli

From: Mingli Yu <[email protected]>

Switch to main branch to fix do_fetch error.

---
 recipes-containers/conmon/conmon_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-containers/conmon/conmon_git.bb +1 -2
index 74f5bfa..974eb07 100644
@@ -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

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
author
#2 lore raw
Quoted 8 lines · Bruce Ashfield

[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,

Quoted 40 lines

Bruce

Quoted 24 lines · Mingli

From: Mingli Yu <[email protected]>

Switch to main branch to fix do_fetch error.

---
  recipes-containers/conmon/conmon_git.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
recipes-containers/conmon/conmon_git.bb +1 -2
index 74f5bfa..974eb07 100644
@@ -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}"
--
Quoted 5 lines

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

#3 lore raw

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

Quoted 64 lines · Mingli
Quoted 5 lines · Bruce Ashfield

[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.

Quoted 3 lines

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

Thanks Bruce!
BTW is this change merged?

Thanks,

Quoted 4 lines

Bruce

On Mon, Jun 21, 2021 at 1:41 AM Yu, Mingli <[email protected]>

Quoted 11 lines · wrote:

Review

Quoted 11 lines

From: Mingli Yu <[email protected]>

Switch to main branch to fix do_fetch error.

---
  recipes-containers/conmon/conmon_git.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/recipes-containers/conmon/conmon_git.bb

Quoted 25 lines
Quoted 13 lines

index 74f5bfa..974eb07 100644

recipes-containers/conmon/conmon_git.bb +1 -2
@@ -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}"
--
Quoted 5 lines

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

author
#4 lore raw
Quoted 4 lines · Martin Jansa

**[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,

Quoted 78 lines · On Mon, Jul 5, 2021 at 1:25 AM Yu, Mingli <[email protected]…


    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
    <[email protected] <mailto:[email protected]>> wrote:
     >>
     >> From: Mingli Yu <[email protected]
    <mailto:[email protected]>>
     >>
     >> Switch to main branch to fix do_fetch error.
     >>
     >> Signed-off-by: Mingli Yu <[email protected]
    <mailto:[email protected]>>
     >> ---
     >>   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
     >