* [meta-virtualization][kirkstone][PATCH] podman: Fix merge typo
@ 2022-08-31 11:05 Andrei Gherzan
2022-08-31 12:19 ` Bruce Ashfield
0 siblings, 1 reply; 2+ messages in thread
From: Andrei Gherzan @ 2022-08-31 11:05 UTC (permalink / raw)
To: meta-virtualization; +Cc: andrei, Andrei Gherzan
From: Andrei Gherzan <andrei.gherzan@huawei.com>
2b28d64667e4c22434b9db0a87a1265a0caedb66 brought a typo when resolving
merge/rebase conflict. This fixes it.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
recipes-containers/podman/podman_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 65e0205..09bf827 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -23,7 +23,7 @@ SRC_URI = " \
file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \
file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \
file://CVE-2022-27649.patch;patchdir=src/import \
- ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://00-podman-rootless.conf', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \
"
LICENSE = "Apache-2.0"
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-virtualization][kirkstone][PATCH] podman: Fix merge typo
2022-08-31 11:05 [meta-virtualization][kirkstone][PATCH] podman: Fix merge typo Andrei Gherzan
@ 2022-08-31 12:19 ` Bruce Ashfield
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2022-08-31 12:19 UTC (permalink / raw)
To: Andrei Gherzan; +Cc: meta-virtualization, Andrei Gherzan
merged.
Bruce
In message: [meta-virtualization][kirkstone][PATCH] podman: Fix merge typo
on 31/08/2022 Andrei Gherzan wrote:
> From: Andrei Gherzan <andrei.gherzan@huawei.com>
>
> 2b28d64667e4c22434b9db0a87a1265a0caedb66 brought a typo when resolving
> merge/rebase conflict. This fixes it.
>
> Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
> ---
> recipes-containers/podman/podman_git.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
> index 65e0205..09bf827 100644
> --- a/recipes-containers/podman/podman_git.bb
> +++ b/recipes-containers/podman/podman_git.bb
> @@ -23,7 +23,7 @@ SRC_URI = " \
> file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \
> file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \
> file://CVE-2022-27649.patch;patchdir=src/import \
> - ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://00-podman-rootless.conf', '', d)} \
> + ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \
> "
>
> LICENSE = "Apache-2.0"
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7587): https://lists.yoctoproject.org/g/meta-virtualization/message/7587
> Mute This Topic: https://lists.yoctoproject.org/mt/93368235/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-31 12:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-31 11:05 [meta-virtualization][kirkstone][PATCH] podman: Fix merge typo Andrei Gherzan
2022-08-31 12:19 ` Bruce Ashfield
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.