From: Bruce Ashfield <bruce.ashfield@gmail.com>
To: Andrei Gherzan <andrei@gherzan.com>
Cc: meta-virtualization@lists.yoctoproject.org,
Andrei Gherzan <andrei.gherzan@huawei.com>
Subject: Re: [meta-virtualization][kirkstone][PATCH] podman: Fix merge typo
Date: Wed, 31 Aug 2022 08:19:56 -0400 [thread overview]
Message-ID: <20220831121954.GA32905@gmail.com> (raw)
In-Reply-To: <20220831110546.3898236-1-andrei@gherzan.com>
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]
> -=-=-=-=-=-=-=-=-=-=-=-
>
prev parent reply other threads:[~2022-08-31 12:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 11:05 [meta-virtualization][kirkstone][PATCH] podman: Fix merge typo Andrei Gherzan
2022-08-31 12:19 ` Bruce Ashfield [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220831121954.GA32905@gmail.com \
--to=bruce.ashfield@gmail.com \
--cc=andrei.gherzan@huawei.com \
--cc=andrei@gherzan.com \
--cc=meta-virtualization@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.