Skip to contentSkip to conversation

nerdctl: renamed upstream branch master to main

PATCH In review Guenther Meyer 2 participants 5 messages Nov 16, 2022 – Nov 18, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nerdctl: renamed upstream branch master to main

---
 recipes-containers/nerdctl/nerdctl_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-containers/ renamed from recipes-containers/nerdctl/nerdctl_git.bb +0 -0

nerdctl/nerdctl_git.bb
index 5d4d827..343c85d 100644

recipes-containers/nerdctl/nerdctl_git.bb +0 -1
@@ -13,7 +13,7 @@ DEPENDS = " \
 SRCREV_FORMAT="nerdcli_cgroups"
 SRCREV_nerdcli = "48f189a53a24c12838433f5bb5dd57f536816a8a"
 
-SRC_URI = "git://github.com/containerd/

nerdctl.git;name=nerdcli;branch=master;protocol=https" +SRC_URI = "git://github.com/containerd/ nerdctl.git;name=nerdcli;branch=main;protocol=https"

include src_uri.inc

Signature · 1 line
2.38.1
#1 lore raw

The change itself is fine, but your patch came through mangled, and it doesn't apply to the repository.

I could make the change myself, but it is probably worth sorting out which part of the patch sending chain caused the corruption.

Bruce

Quoted 33 lines · Guenther Meyer
---
 recipes-containers/nerdctl/nerdctl_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-containers/ renamed from recipes-containers/nerdctl/nerdctl_git.bb +0 -0

nerdctl/nerdctl_git.bb
index 5d4d827..343c85d 100644

recipes-containers/nerdctl/nerdctl_git.bb +0 -1
@@ -13,7 +13,7 @@ DEPENDS = " \
 SRCREV_FORMAT="nerdcli_cgroups"
 SRCREV_nerdcli = "48f189a53a24c12838433f5bb5dd57f536816a8a"
 
-SRC_URI = "git://github.com/containerd/

nerdctl.git;name=nerdcli;branch=master;protocol=https" +SRC_URI = "git://github.com/containerd/ nerdctl.git;name=nerdcli;branch=main;protocol=https"

include src_uri.inc

--
2.38.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7683): https://lists.yoctoproject.org/g/meta-virtualization/message/7683
Mute This Topic: https://lists.yoctoproject.org/mt/95065671/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

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
#2 lore raw
Quoted 5 lines · On Donnerstag, 17. November 2022 19:23:08 CET Bruce Ashfield wrote:

The change itself is fine, but your patch came through mangled, and it doesn't apply to the repository.

I could make the change myself, but it is probably worth sorting out which part of the patch sending chain caused the corruption.

Ok, what's thew problem? What can I do?

#3 lore raw
Quoted 9 lines · Guenther Meyer
Quoted 5 lines · On Donnerstag, 17. November 2022 19:23:08 CET Bruce Ashfield wrote:

The change itself is fine, but your patch came through mangled, and it doesn't apply to the repository.

I could make the change myself, but it is probably worth sorting out which part of the patch sending chain caused the corruption.

Ok, what's thew problem? What can I do?

How did you relay the patch ? Was it via git-send-email or something else ?

Following my normal workflow and scripts, the patch is definitely garbled/line wrapped:

build [/home/bruc...ualization]> git am -s ~/incoming/0001-_meta-virtualization_PATCH_nerdctl_renamed_upstream_branch_master_to_m.patch
Applying: nerdctl: renamed upstream branch master to main
error: corrupt patch at line 16
Patch failed at 0001 nerdctl: renamed upstream branch master to main
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
build [/home/bruc...ualization]> git am --show-current-patch
Date: Wed, 16 Nov 2022 14:09:27 +0100
From: Guenther Meyer <[email protected]>
To: "[email protected]"
<[email protected]>
Subject: [meta-virtualization] [PATCH] nerdctl: renamed upstream branch
master to main

---
 recipes-containers/nerdctl/nerdctl_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-containers/ renamed from recipes-containers/nerdctl/nerdctl_git.bb +0 -0

nerdctl/nerdctl_git.bb
index 5d4d827..343c85d 100644

recipes-containers/nerdctl/nerdctl_git.bb +0 -1
@@ -13,7 +13,7 @@ DEPENDS = " \
 SRCREV_FORMAT="nerdcli_cgroups"
 SRCREV_nerdcli = "48f189a53a24c12838433f5bb5dd57f536816a8a"
 
-SRC_URI = "git://github.com/containerd/

nerdctl.git;name=nerdcli;branch=master;protocol=https" +SRC_URI = "git://github.com/containerd/

nerdctl.git;name=nerdcli;branch=main;protocol=https"

include src_uri.inc

Signature · 1 line
2.38.1
Quoted 10 lines

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7685): https://lists.yoctoproject.org/g/meta-virtualization/message/7685
Mute This Topic: https://lists.yoctoproject.org/mt/95065671/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

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
#4 lore raw
Quoted 1 line · On Freitag, 18. November 2022 00:32:52 CET Bruce Ashfield wrote:

On Thu, Nov 17, 2022 at 4:25 PM Guenther Meyer <[email protected]>

Quoted 10 lines · wrote:
Quoted 8 lines · On Donnerstag, 17. November 2022 19:23:08 CET Bruce Ashfield wrote:
Quoted 5 lines

The change itself is fine, but your patch came through mangled, and it doesn't apply to the repository.

I could make the change myself, but it is probably worth sorting out which part of the patch sending chain caused the corruption.

Ok, what's thew problem? What can I do?

How did you relay the patch ? Was it via git-send-email or something else ?

I did a "git format-patch -1 HEAD" and pasted the result (without the header lines) into my MUA. As this looked similar to other patch emails, I thought, that would be fine.

Quoted 3 lines

Following my normal workflow and scripts, the patch is definitely garbled/line wrapped:

Ah ok, my MUA wraps lines at column 78, maybe that's the problem. I will send the patch again.

Signature · 3 lines
Signum-Media Softwareentwicklung
https://www.signum-media.de
Telefon: +49 89 215 443 28