diff options
| author | Andrei Gherzan <andrei.gherzan@huawei.com> | 2022-08-31 13:05:46 +0200 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-08-31 08:19:34 -0400 |
| commit | e11d5b630e6b5626b58b742b80f5bdf277a44168 (patch) | |
| tree | f62a8acb880ec543ea0825521c5c0faff5f8bce2 /recipes-containers | |
| parent | 2b28d64667e4c22434b9db0a87a1265a0caedb66 (diff) | |
| download | meta-virtualization-e11d5b630e6b5626b58b742b80f5bdf277a44168.tar.gz | |
podman: Fix merge typo
2b28d64667e4c22434b9db0a87a1265a0caedb66 brought a typo when resolving
merge/rebase conflict. This fixes it.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
| -rw-r--r-- | recipes-containers/podman/podman_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index 65e02051..09bf8270 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb | |||
| @@ -23,7 +23,7 @@ SRC_URI = " \ | |||
| 23 | file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \ | 23 | file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \ |
| 24 | file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \ | 24 | file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \ |
| 25 | file://CVE-2022-27649.patch;patchdir=src/import \ | 25 | file://CVE-2022-27649.patch;patchdir=src/import \ |
| 26 | ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://00-podman-rootless.conf', '', d)} \ | 26 | ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \ |
| 27 | " | 27 | " |
| 28 | 28 | ||
| 29 | LICENSE = "Apache-2.0" | 29 | LICENSE = "Apache-2.0" |