podman: Fix merge typo
PATCH 1/1 podman: Fix merge typo
From: Andrei Gherzan <[email protected]>
2b28d64667e4c22434b9db0a87a1265a0caedb66 brought a typo when resolving merge/rebase conflict. This fixes it.
Signed-off-by Andrei Gherzan <[email protected]>
--- recipes-containers/podman/podman_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-containers/podman/podman_git.bb +1 -1
@@ -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"
Signature · 1 line
2.25.1
merged.
Bruce
In message: [meta-virtualization][kirkstone][PATCH] podman: Fix merge typo
Quoted 36 lines · on 31/08/2022 Andrei Gherzan wrote:
From: Andrei Gherzan <[email protected]>
2b28d64667e4c22434b9db0a87a1265a0caedb66brought a typo when resolving merge/rebase conflict. This fixes it.Signed-off-by Andrei Gherzan <[email protected]>--- recipes-containers/podman/podman_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)recipes-containers/podman/podman_git.bb +1
-1@@ -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"Signature · 11 lines
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: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-