summaryrefslogtreecommitdiffstats
path: root/recipes-containers
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-08-17 09:15:24 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-08-25 22:55:48 -0400
commit329217064652a3e8df702240b750b16a062f5b40 (patch)
tree0b5858e2e002903c639590628b8dabc521944fda /recipes-containers
parentf6bf30aca6cb16f4fe185965f56e4e59dd7848f8 (diff)
downloadmeta-virtualization-329217064652a3e8df702240b750b16a062f5b40.tar.gz
podman: update to 4.2
We refresh one patch, and drop another that is already part of the 4.2.x release series. Bumping libpod to version v4.2.0-8-g754ec89a8, which comprises the following commits: eb2496a77 Skip / update some tests under runc eba1f7749 Bump to v4.2.1-dev 7fe5a419c Bump to v4.2.0 754e32056 Final release notes for v4.2.0 4900394c8 Document behavior of --timestamp when only FROM is used b619c7a72 check memory test based on range a3778b051 specgen: use sandbox id instead of name for annotation fa1085ed0 cmd: refuse --userns if a mapping is specified 91a1f3022 e2e: Add rootless mount cleanup test 297c72238 [CI:COPR] podman.spec.rpkg: add python3 dependency for el8 a6ea3325a start filter flag changes a19c5a252 Cirrus: Run Cross builds in [CI:DOCS] mode e776425e5 podman info: hide `--debug` 53a631ca2 ISSUE TEMPLATE: remove `--debug` from `podman info` a7d932422 Cirrus: use dnf instead of rpm to install packages 8c36b8c52 Cirrus: Fix e2e tests for "mount_rootless_test" bd3e36040 podman generate systemd --new: allow -h hostname 5c17d1b14 test: verify manifest inspect must contain OCI annotations 6b2bbd2d1 podman-volume-import: Reword "precendence" 54ee42331 man podman-volume-import: Clarify that merge happens c5c0efc95 podman generate systemd: handle --sdnotify correctly 7e7951145 Bump google.golang.org/protobuf from 1.28.0 to 1.28.1 8b9e5fb08 Use 8k buffer to help clients w/ broken parsing 7efd81cb8 With --rm option remove container if podman run fails 346b22f07 Bump golang.org/x/tools from 0.1.11 to 0.1.12 in /test/tools 5b5e53d70 syncContainer: transition from `stopping` to `exited` b7feafcb0 Fix: manifest push --rm removes a correct manifest list 24f219efb Fix: Restore a container which name is equal to a image name 32848b95f When removing objects specifying --force,podman should exit with 0 312bef288 test: update apply-podman-deltas for new tests 9b0a1fa75 build: implement --cache-to,--cache-from and --cache-ttl a382bd329 vendor: bump buildah to v1.27.0 916d51bd0 test: update apply-podman-deltas for new tests 3a239947a build: implement --cache-to,--cache-from and --cache-ttl 6b2512f67 vendor: bump buildah to v1.27.0 6beb3f208 Fixes #15154 Change order when config and connections are written eab03100f Add support, and default to rootless w/WSL prompt f826ed584 Disable F36 service that is incompat with WSL kern d16b42f26 pkginstaller: use correct GOARCH value in case of arm build 0593ceb01 Cirrus: Update DEST_BRANCH to v4.2 fb8584332 Cirrus: Improve CI VM image updates for EC2 d5793db28 Bump back to v4.2.0-dev 7e1f3106f Bump to v4.2.0-rc3 1b7e16654 v4.2.0-rc3 release notes bf2a53a2e pkginstaller: use correct GOARCH while building podman binaries d4481a317 pkginstaller: makefile improvements to avoid redownloading 1b3844f65 pkginstaller: add makefile target to notarize the built pkg 64db955e0 pkginstaller: sign qemu-system-* binary for the pkg 9a820b480 Add support for building macOS pkg installer 5c95c0920 Add support for creating sigstore signatures, and providing passphrases 0aebdb687 Hide podman manifest push --sign-by on remote b2b3edaca Use signByFlagName instead of copy&pasting the string 49d40293b Remove libpod/common eacee60c8 Update c/common to an unreleased version 62cc871c6 Update the registry server we test against from 2.6 to 2.8 52db76373 Use existing REGISTRY_IMAGE variables in more places 230363225 Use httpasswd from the surrouding OS instead of the registry image 74155705e fix e2e sign tests 983cfb90e Final v4.2.0-RC2 release notes bf6f79630 Skip one failing test on Ubuntu 25efc9b2e Fix incorrect release note about regexp 4acc14b4e Bump to v4.2.0-dev 81005b8d8 Bump to v4.2.0-RC2 6fafe120c Final release notes for v4.2.0-RC2 990ef3cf6 [CI:DOCS] podman-generate-systemd.1.md: document --sdnotify c85722eb9 pod create --share none should not create infra c3e0f8ebe machine: Fix check which is always true e6ebfbd1e Set TLSVerify=true by default for API endpoints 64bc2ee97 Semiperiodoc cleanup of obsolete FIXMEs b339045db benchmarks: fix create test fd1f5f55a integration test: fix network backend option with remote c7fef7316 docs: remove CNI word where it is not applicable 976f818f1 libpod: do not lock all containers on pod rm 772e883f8 container wait: improve error message 206f11d4f Makefile: use order-only prereq for podman-remote c4616510a API: libpod/create use correct default umask ce8b6cebd compose test: remove cni config copy 553a70096 compat api: always turn on network isolation for networks aef8039d3 compat api: allow default bridge name for networks fa7e9f0f8 Compat API: unify pull/push and add missing progress info fde39edb9 remote push: show copy progress 1f48980af fix broken machine test cbcbde587 pkg/machine/e2e: do not import from cmd/podman 69fcf04c6 fix some pkg/machine/e2e test to read stderr ce790e61b enable linter for pkg/machine/e2e ff7259567 [CI:DOCS] Cirrus: Add prominent gitlab warning 3edaa174e libpod: create /etc/passwd if missing e41113dca e2e: show command and output when a timeout happens f6d18ed41 fix goroutine leaks in events and logs backend dc1dc4600 podman-remote pull: fix duplicate progress outputs 2350ef9dd Fix potential leak on mid-stream read error 7b28a1b7c vendor: remove unused deps 3aec669e9 Makefile: remove building pages for man5 ed49f9411 makefile: remove processing of pkg/docs 24bbd40ce rpkg: remove usage of pkg/hooks 73ecc5a4b pkg,libpod: remove pkg/hooks and use hooks from c/common d151edeea Fix machine test 86159e39b document isolate option for network create c3c07ed09 Update init ctr default for play kube 6057db75d Remove return error from "containers.pause" de8d2cc94 "pod pause/unpause/stop" append "report.Errs" to "reports" 409fbeaab system tests: new system-service bats file d2e2756a4 Print rootfs download as a specific version on Win 244055030 [CI:DOCS] Fix typo in manifest manpage 76fa80447 Vendor in latests containers/storage and opencontainers/runtime-tools e89550bcd buildah vendor treadmill 9c1de040b Vendor in containers/(storage,image, common, buildah) 03eaea8bb Run codespell e4b82c77f Add --host and -H as equivalent options to --url 183fdea5f Use SafeChown rather then chown for volumes on NFS 17dbce2fb Clean up cached machine images e473c5e4b Machine init: create .ssh dir if not exist 53edd9b65 Podman pull --all-tags shorthand option f07d2bac4 Cirrus: Trigger podman-machine task by label 3bd248ae7 GHA: Fix dumb error check 6d84a9952 Podman stop --filter flag a78be890e Switch to `github.com/blang/semver/v4` 52850ce70 man page checker: enforce stricter options format a5827e13c Fixes #14698 Use prepared image for WSL2 machine init a4bae330a Add podman events -f to be alias for --filter d560c7897 [CI:DOCS] man pages: replace -c with --cpu-shares 5f5379deb [CI:DOCS] podman-create.md: replace -c with --cpu-shares f7707c81a Fix last machine test 35dc17bfe abi: create new cgroup when running in a container 7b4ebfa65 podman: always call into SetupRootless 3b37095b2 utils: call MaybeMoveToSubCgroup once edfe80027 podman: move MaybeMoveToSubCgroup to utils/ b29a52a48 Docker uses "-c" to mean "--cpu-shares" in create and run ffd2e6df9 test,manifest-run: declare TARGETPLATFORM before using it ca4630ede CI: sanity check for desired runtime bf269e634 podman machine: do not commit proxies into config file b2f3b28c6 logformatter: link by *task ID*, not build ID cfb768a36 fix wrong log message on Trace level 557b65e09 [CI:DOCS] Improve language. Fix spelling and typos. a363b3a65 Initial release notes for v4.2.0-RC1 f22af2bf8 Bump to v4.2.0-dev 74aa681e5 Bump to v4.2.0-rc1 aa29bd6de Update CI base branch 87793b633 [CI:DOCS] Rewrite the --gidmap option docs 3bb4cf8ee libpod: read exit code when cleaning up the runtime 62cdc387d podman wait: return 0 if container never ran 25d74db45 [CI:DOCS] podman-info.1.md: Update examples b41e42f42 test/system/130-kill.bats: use $IMAGE 81a19a568 Add ports and hostname correctly in kube yaml 6b9abe69d improve pull-policy documentation 76d887c77 Fix machine tests 1e7686df6 Manifest test cleanup: use defer() 96dd57ca5 podman wait can take multiple conditions a46f79883 pkg: switch to golang native error wrapping d1754bdd4 Refactored networkPrune function 1161e8bd5 manifest_test: safer registry setup and teardown 61a67a07b pkg/machine/qemu: start VM check if qemu is alive a26cf638e machine: qemu fix chardev id starting with letter 4374038cc pkg/machine/e2e: do not import from cmd/podman 4cfa8ccb2 machine test: fix endless loop in test 3adda62d2 [minor] fix duplicate test name e8d2d70ee port forward range test: fix many oopses 0424084b3 fix namespace reporting 03ee8204d podman machine: make 9p security model configurable; adjust docs 44bd166b3 test-apiv2: streamed response testing based on response duration a5898129c Fix qemu machine startHostNetworking always failing cc6faddfa use c/common code for resize and CopyDetachable 1267515e1 Update play kube docs 791dbf823 golangci install: explicitly set BINDIR 4fd5fb97a e2e tests: cleanup: capitalize CONSTANTS 72aa00aca Fix streaming for libpod/pods/stats endpoint ee05bc031 Fix network inspect compat API discrepancy 9d6efb344 Podman machine info 65d511c6d Fix podman pod unpaue TODO 251d91699 libpod: switch to golang native error wrapping 8f2d9e7a7 podman pod create --uts support 5633ef1d1 Docker-compose disable healthcheck properly handled 488eb3b74 (rootful) docker-compose now updates network MTU 4fe7b8baf Podman system df JSON format outputs `Size` and `Reclaimable` b9aa47555 Sync: handle exit file 49cb288df hack/test/utils: switch to golang native error wrapping 2da731a7e test: reduce sleep interval c02f793ba test: return immediately on connect efe1176dd specgen,run: support running container from valid manifest list 8601ab6b0 Silence setlocale warnings from `podman machine ssh` 33a474286 pkg/machine: add missing build tags to tests 5b1867923 TestEnvVarValue: fix assertion 3fbe93371 envVarValueResourceFieldRef: use int64 for value 4c5b058e8 fix flake in aardvark tests 597de7a08 libpod/runtime: switch to golang native error wrapping 8106568ca test: drop pod-create --device-read-bps test 5491123c2 [CI:DOCS] troubleshooting: document --tty and CR fe559287c docs: Remove -s from systemctl enable --now sshd 24fcfb5d9 Fix spelling "read only" -> "read-only" 2f1075dfb Implement proxy support for Windows b92149e2a podman pod create --memory 8cff1c2bf Cirrus: Add podman-machine integration test f58d7dbda Cirrus: Fix elevator workaround multi-cloud support 7131c8472 fix build d6678adc9 overlay,mount: convert lowerdir to absolute path for overlay mounts of path 891dfd3a8 specgen: fix parsing of cgroup devices rule 5262f7e01 Fix podman machine on Windows 9c658f490 docs: mention the podman-kube template c6fb533ca podman-play-kube template: rename to podman-kube bd51410b8 service: do not run under the root cgroup 5c3979762 utils: move the cgroup if root on cgroupv2 e8adec5f4 cmd/podman: switch to golang native error wrapping 7bbfb3eb0 api,images: add support for LookupManifest to Image remove API 64ec894c5 [CI:DOCS] Update podmanimage comment. d9ff0fd15 Only allow Rootless runs of Podman Machine 6904b1a61 build(deps): bump github.com/stretchr/testify from 1.7.5 to 1.8.0 5790caaef bindings: Add support for Delete in pkg/bingings/manifest 1affceb29 runtime: unpause the container before killing it 7f994a80d only create crgoup when not rootless if using cgroupfs 59a7ac210 Make `podman machine stop` wait for qemu to exit 2ee9fe4cb vendor containers/common 79a38a2c6 Add test for restore runtime verification using non-default runtime 8e3a46a87 Fix runtime check during restore 6c4c050d3 fix volume reporting in system df cc4914633 Docker compat returning unknown "initialized" for `status.status` 6d3520e8b podman image scp remote support & podman image scp tagging dc58a7306 Makefile: don't try to build rootlessport on FreeBSD c55feb7bf Makefile: don't use '-t' to specify the directory to install manpages af16edf49 Makefile: use GNU sed to convert manpages on FreeBSD 94a634fcf Makefile: use bash to evaluate tool paths 0e03a64f9 pod: ps does not race with rm 0cabd8006 pods: move code to a new function 3b10c1b78 Use Regexp in volume ls --filter name aada13f24 volume: new options [no]copy a4094530b volume: drop TODO comment 443a2afdb volumes: switch order of checks 28e2a604b vendor: update containers/common 99f68898c reveal machine error, ignore false state 9cb93c6f9 go.sum: run make vendor 0c1a3b70f Show Health Status events 386ea49cf Show starting state when machine is starting 66c62eb96 Implement CatchAll and StopCatch in signal_common.go 345778ece Fix "podman run port forward range" flake 4c5788bac Fix spelling of GetCriuVersion 590290597 Add missing criu symbols to criu_unsupported.go 2792e598c podman cgroup enhancement 09754d21d [CI:DOCS] Minor update to podmanimage upstream docs 041947b11 Bump github.com/stretchr/testify from 1.7.4 to 1.7.5 3619f0be9 Fix: Prevent OCI runtime directory remain a4ae22df8 Workaround for bug 14653 (checkpoint flake) 491857a88 Use HaveLen instead of len in podman machine list e2e tests f0b9e56e9 Fix machine list: --format implies --noheading 2fab7d169 add podman volume reload to sync volume plugins 6e8953abf test/testvol: rework testvol binary fcc25afa5 test/testvol: update container image golang to 1.18 472f79f08 test/testvol: move Containerfile into testvol dir 0d3aa61be libpod: volume plugin sendRequest remove body bool ad78d239d fix system connection and scp testing 3a810b8d2 Two fixes for DB exit code handling 30e7cbccc libpod: fix wait and exit-code logic 15188dce0 conmon: silence json-file error 2eda547dc podman run/create -v relative filepath support ef563c5a1 logformatter: link to logs using Cirrus API aa4279ae1 Fix spelling "setup" -> "set up" and similar 0320ce37d Fix system prune output message 7ef282d64 Remove lorgus.Infof on bindings start and attach 132393d15 Update basic_networking.md 4a981c490 allow filter networks by dangling status 050693b2e bump github.com/spf13/cobra from 1.4.0 to 1.5.0 ecf225019 rootless: attempt to join all specified paths 9afd5e31c rootless: improve error messages 99258703a rootless: do not ignore reexec_in_user_namespace_wait errors cfba09f68 Bump github.com/stretchr/testify from 1.7.2 to 1.7.4 1f539a264 api: show the memory limit specified for the container 7f82c4323 Fix typos f451b68df podman pod create --shm-size 46da7bc78 podman machine init --now: respect proxy envs bb5bd09ea API: containers/json always set application/json content type 282714090 [CI:DOCS] "setup" -> "set up" in source code comments dda68201a [CI:DOCS] Rewrite --env docs 948866e8a Update to use gopkg.in/yaml.v3 075c9ac45 .cirrus.yml: fix matrix expansion by properly merging YAML mappings 809044576 vendor in latests containers/image ce3d0954a Open Windows tutorial after MSI installation a3b3f1723 linter fix from #14299 065302bd5 Cirrus: Fix build. dep. missed in #14521 3af047b63 Vendor in latest containers/storage 09c462d73 fix "podman -h" help output 6c5e1420e Make it clear the REST API could be a security issue 28a38617e [CI:DOCS] fix typos in prerequisites for Fedora and make binaries sections b3f094a61 test/system/410-selinux: fix for newer runc e69691c27 Fix interrupting machine start leaves the machine unstartable 0a202a9f0 system test image: bump to 20220615 21819254d golangci-lint: update to v1.46.2 c6b9baa6c system tests: avoid rmi -a ... plus cleanup 693d439ac Update release notes and README on Main for v4.1.1 751ba07a7 libpod: improve check to create conmon cgroup 90a669594 fix CI: golangci-lint is broken on main 20b3fbe6d systemd socker activation: check listener to prevent panic 43e12c135 Fix #14416: Use absolute path to WSL binary to create ssh keys for `machine init` bfc446eea buildah-bud tests: reenable skipped 'bud' tests 455f4c782 CI: APIv2 tests: add rootless 232b3e342 buildah-bud tests: add arg sanity check 41528739c golangci-lint: enable nolintlint 1b62e4543 golangci-lint: add systemd build tag fcfcd4cdb container: do not create .containerenv with -v SRC:/run 4811cb110 podman system prune support prune unused networks 5e9d20448 Update vendor of containers/buildah 608ad7d11 Non-running containers now report statistics via the `podman stats` command 958759a71 podman pod clone 8d3e6577a Fix M1 QEMU flags b7c283759 Bump golang.org/x/tools from 0.1.10 to 0.1.11 in /test/tools 48cf1d258 podman-remote push --remove-signatures support d4272bed5 podman cp: do not overwrite non-dirs with dirs and vice versa 46c8da7d9 vendor buildah@main 7b3e43c1f podman volume create --opt=o=timeout... 80d5a00bb Fix Remote filtering embedded directory test 2b97795c1 APIv2 tests: (try to) fix flaky registry panic 81153ffa2 Introduce 'Starting' status for machines b13fc1bf9 patch for pod host networking & other host namespace handling 5614c29ce compat api: fix regressions from "Swagger refactor/cleanup" eed0e6671 Pass '--file-locks' to OCI runtime at restoring c77691f06 Do not error on signalling a just-stopped container 7e9767502 Bump github.com/opencontainers/runc from 1.1.2 to 1.1.3 549bffe58 shell completion: fix problems with container path completion bce97a3b5 apiv2 tests: clean up 700248bfe Update remote_client.md 254048e17 Cirrus: Fix artifact passing when dep. skipped f0516a014 --userns=keep-id,nomap are not allowed in rootful mode 126686f3d Podman images generated with empty /etc/containers/storage.conf 20aaaa382 Minor: Fix podmanimage README links dc4a01ec6 Add docs of changing default netavark networks ed1e4f94f Infra Inheritance patch 5fc3d871a Cirrus: Simplify only_if/skip + optimize multiarch a69a48b0d test/e2e: network dis-/connect test remove unhelpful assertions 90d80cf81 use resolvconf package from c/common/libnetwork ddf1d2cb3 update c/common to latest 811cce5a8 libpod: store network status when userns is used 0f424e90d Bump github.com/docker/docker e41d4a247 Add missing tests for manifests API 2a0d896b3 runtime: make error clearer 2c12f7bd1 Add some Readme updates around machine 8533ea000 Privileged containers can now restart if the host devices change 335925f47 Minor: Remove useless addition of storage.conf aadae49ad overlay-volumes: add support for non-volatile upperdir,workdir for anonymous volumes 5c508cb4e Bump github.com/stretchr/testify from 1.7.1 to 1.7.2 67ea5fdad Cleanup the leftovers used with ginkgo focus option 1fc5a107a [CI:DOCS] PodmanImage Readme touchup 22e442ee2 tests: buildah-bud fix reason for skip 9de092ec0 Fix secret-verify-leak flake: set build context to subdir 259c79963 Improve robustness of `podman system reset` 87b05b6a6 Prevent simultaneous machine starts 3c9b75c21 Using logDriver instead of query.LogDriver for podman play kube 241458666 podman logs k8s-file: do not reassemble partial log lines 2b0cb3002 test/e2e/save_test.go: fix flake b8de285a4 Stop machine before force removing files 1b6505d74 Update test output expectation 9a34b88c9 changed megabyte to mebibyte 831d6534f fix pod network handling with a host network 5023ce585 Align docker load and podman load output f2bbbd20d shell completion for paths inside the image/container 69e44bbcc bindings: add manifest should follow es_model while marshalling OSVersion and OSFeatures 5b9729c47 Document protocol usage for --publish 6dffa453a Bump github.com/containernetworking/cni from 1.1.0 to 1.1.1 44f11ec2c podman-remote: enable support for additional build-context on macOS, remote 3fa09e9db Makefile: Handle unexpected empty var. values fc95f832a Podman image: Mass cleanup + fix missing storage.conf f728b7b5a podman pod create --uidmap patch 8291b51ce expose podman.sock in machine inspect dbdc26a4c Removed `imageStream` hardcoded value 2805c7353 pkg/specgen: parse default network mode on server 78d1f5d7d fix "tail 800 lines: journald" flake 193397290 Add ExecStop and dependencies to fix shutdown f91c852fa Makefile: force podman-remote-static to linux cef044d85 Bump gopkg.in/yaml.v3 to v3.0.1 205c8c071 fix podman container restore without CreateNetNS 16e8b2f32 podman stats: work with network connect/disconnect ec576a549 podman volume export/import: give better error 4a8346551 podman machine ssh: do not print warning everytime 7e69e2b53 Podman no-new-privileges format 0e58636c3 podman machine ssh: set correct exit code a6f8cad54 fix bad import path for cmd/podman/utils c0ad9a43e Mount propagation works with named volumes f23ae4d66 healthcheck: wait for systemd operations 8efdbf5c4 Add API support for NoOverwriteDirNonDir e13c5f3a9 Refactor populating uptime 3a32d60e5 [CI:DOCS] Quick typo for troubleshooting ea1a8e243 Move Attach under the OCI Runtime interface fb163976f Support setting image_volume_mode in containers.conf d730f2b25 Add Authorixation field to Plugins for Info ab0728421 docs: note regarding version compatablity between server and client for bug fixes 87ad46060 Remove TODO comment 66a56ce05 vendor: bump buildah to v1.26.1-0.20220524184833-5500333c2e06 6124b5199 build: allow using cache explicitly with --squash-all using --layers 8c1128db4 Cirrus: Fix several TODOs 426a07e70 Combine the CheckAllLatest CID and PodID functions c9f6639ec Fix TODO in parse/net.go 32aa12a28 Remove TODO from pods/ps.go 8c781416b Fix swagger model of `InspectPodResponse` de54d33d2 Fix test block bypass instructions b730e7328 cmd, build: remove redundant squash processing logic 66c846616 Support remote deadlock errors in rm badf76e17 Remove more FIXMEs 9fcfea764 First batch of resolutions to FIXMEs 02c437405 [CI:DOCS] Add play kube support docs 338f01237 Remove unused archive flag from diff commands cb76d1523 fix f35 integration test network flake c3677f515 test/system/250-systemd.bats: clean up outdated TODO c9279d4d9 pkg/bindings/play/play.go: drop TODO message 462cb3370 pkg/bindings/containers/archive.go: drop TODO 60e31d87d pkg/auth: drop the TODO 09ae060a7 pkg/api/handlers/compat/images.go: drop TODO message c04ec104d libpod/pod_top_linux.go: s/TODO/NOTE/ b19e2d6f8 events: drop TODO comment 429b1f768 Fix codespell errors 4a447a213 work queue: simplify and use a wait group 2ce475576 Allow podman pod create --share +pid df394b521 Allow podman pod create to accept name argument 70f147d01 cmd/podman/common/completion.go: fix FIXMEs 2be4589b5 Remove TODO re: storage-driver 8de3e9102 help-message system test: catch more cases 33628003c Put current product first and historical product second 2400d1d52 go format previosly touched files b3e2324f5 test/e2e/search_test.go: re-enable registry.redhat.io test 956e2e1b8 pkg/domain/infra/abi/images_test.go: remove commented code fbeef1d70 image list: remove unused ConfigDigest 90a6f39d0 pkg/inspect: remove unused ImageResult type 5268314e5 podman image mount: print pretty table d3d3a207d pkg/bindings/images/rm.go: remove redundant FIXME 6c6e97018 pkg/bindings/images: remove TODOs re: system context d924c46da autocomplete `podman search --filter` f98a7d140 build(deps): bump github.com/vbauerster/mpb/v7 from 7.4.1 to 7.4.2 8af98b342 contain_top_linux.go: s/TODO/NOTE/ f5450b1e8 system tests: fix flake waiting for container to run 2133edb2c compat, build: suppress step errors when quiet is set 8fbb933f5 look for firmware based on the path of qemu binary 5d37d80ff Use containers/common/pkg/util.StringToSlice d29dec967 Cirrus: Fix building multiarch images dde428642 Bump Compat API maximum version to v1.41 b7dbc505b Instead of erroring, clean up after dangling IDs in DB e22611baf fix typo ac154425d Update _play kube_ doc following PR #14266 merged c984956f9 fix compat image resolution d66288315 auto update: create an event 633d5f1f8 fix --init with /dev bind mount 4960a17a5 fix tests by randomize the device folder name 94e82121b Support running podman under a root v2 cgroup a0d0207a2 fix podman-for-windows.md 5b79cf15a Swagger refactor/cleanup fb219a809 Update c/image 9c9fc96d2 shell completion: use more constants instead of duplicating strings 337f8b9d9 shell completion: podman save --format use all valid values 74f70315b shell completion: update podman inspect --type options 318e95fd2 shell completion: fix podman event --filter values b22143267 linter: enable unconvert linter 3b0844f99 shell completion --format: add help to function with args 3d8a1f917 shell completion --format: support maps and functions ecd6edb19 shell completion --format: fix embedded struct handling 11ff5ffd3 shell completion --format: only show usable methods eeeb88a66 shell completion --format: only show exported fields f5c8c0911 add tests and fix bug when char device pass the test as block device 653117087 ci: pr-should-include-tests: add more exceptions 40a1cd4ef Remove GO111MODULES use d49efde27 Makefile: rm gofmt target 9bf81814a Makefile: rm CHANGELOG_* and ISODATE vars d2070a39e Makefile: rm -mod=vendor 2b54bf3e6 Move GOPROXY from Makefile to cirrus.yml 11d3cf269 Makefile, podman.spec.rpkg: rm GOBIN and GOPATH c63bb6b9a Makefile,.gitignore: rm .install.goimports e2d2b537a Makefile: rm .gopathok d8c42de41 Makefile: rm .install.libseccomp.sudo target c632a2efc dependabot: add release-note-none label 0c9b0e2aa expose block and char devices with play kube 8684d41e3 k8systemd: run k8s workloads in systemd 6f9155cbb api: make no-op remote functional in /libpod/build 21a5ef859 Don't complain about XDG_RUNTIME_DIR, Closes #1424 dc435ecb2 Make errors on removing exec sessions nonfatal ee782fcb7 Deleting an n use image should return conflict not system error 977cd9bd1 Update WSL machine OS to enable user lingering 0961002d9 Update tutorial list to include Podman for Windows 5b2d5c365 Robust whitespace split of cpu utilization line from /proc/stat de4f76e7e Fix strange buildtag edit c45d51899 [BZ #2083997] pod: build pause image in custom user NS c058b828c Changed permission to 755 25f80941a build(deps): bump github.com/docker/docker 2b03a1088 Vendor in latest containers/common b8103640a Make sure tests are cleaned up when they complete 7804f4d29 Add support for machine events on Windows a4aa07a07 [CI:DOCS] Treadmill script: add --reset option b7ce98619 Fix broken pwd 1094d7553 build(deps): bump github.com/opencontainers/runc from 1.1.1 to 1.1.2 9df390655 shell completion --format: work with pointer functions 03af8213c sdnotify: send MAINPID only once 840c120c2 play kube: service container ecf0177a0 vendor c/common@main 16e22dbbe vendor: update c/storage and c/image 37e30bcb2 Fix hang in build-each-commit test e76a07087 [CI:DOCS] man pages: fix inconsistencies 60258925a test: update fedora toolbox image 1834afd3e [CI:DOCS] Benchmarks: new tool for parsing results 813f6a68f [CI:DOCS] fix `make localbenchmarks` 876b05cdb Add initial Windows guide c7c00ce55 Add more machine tests d0ca90b3e test: simplify cleanup code 0774a4ce1 kube: add support for --userns= 2b5778d41 Cirrus: Update images + new automation library 9ffc2a6ac Cirrus: Fix Makefile including 'hack' in $PATH abf4f77bc Cirrus: Simplify use of cache in automation 237f76126 Cirrus: Simplify rootless ssh setup c1656e2ee Cirrus: Guarantee $DEST_BRANCH is passed through 82f2b3edb bloat check: make more robust 9e1ee081f kube: honor pod security context IDs 82a4b8f01 kube: refactor setupSecurityContext to accept directly the security ctx be5abf03a fix: Container.cGroupPath() skip empty line to avoid false error logging c48657671 test skipper: check for $DEST_BRANCH 8ecd0b5bc fix broken CI test bb8f53a72 test: fix "podman search format json" b58e7e7f1 play kube log tag handling a1a299797 Update version to v4.2.0-dev bce014e19 Update release notes for Podman v4.1.0 9cd74a13c update podman version in readme 0dbfd376f Add 4.1 branch to API documentation 2a401b3ff Bump github.com/docker/docker ed8c1dfb4 libpod: add c.ConfigWithNetworks() d7f43e677 test: fix failing TestPostDeleteHooks cf35168f0 test: use `T.TempDir` to create temporary test directory 6ddccd94f e2e: pull_test: speed up --all-tags c38e7e5f6 build: disable --output for podman-remote clients 140fb3ae1 e2e: pull_test: squash --quiet test 669401c31 e2e: pull_test: move tests around 2fa906cca e2e: pull_test: remove redundant tests 6eaa9ca26 e2e: manifest_test: use cached registry ed159f864 Vendor in containers/buildah@v1.26.1 ebde52583 update rootless_tutorial.md 7c59f1d07 Fix usermod call in rootless_tutorial.md 5fa6f686d Report correct RemoteURI 386614367 exclude new tools vendor dir from validate f6b397bf1 add dependabot config for test/tools go.mod 3b9177995 vendor test tools in submodule 80744c644 podman system reset removed machines incorrectly 9974c90cc libpod: treat ECONNRESET as EOF 245151e62 Add more unit tests a5800c78f machine events: only open sockets when needed 36c5e6e0c Bump github.com/containers/storage from 1.40.0 to 1.40.2 ccd576504 play kube default log driver 8781a3635 benchmarks: push/pull 1585b175d pass networks to container clone 88015cf0d Implement --format for machine inspect 8da5f3f73 Add podman machine events 9166894c6 vendor test dependencies instead of installing via network 6e2e3a78e generate systemd: pods: set exit policy 5fac879ea vendor treadmill script: run 'git add vendor' 0bb484937 Additional stats for podman info e247f02a4 Vendor in containers/(common, storage, image) e74717f34 Treadmill script: revamp e17b56e0c CI: emergency fix for broken go get 4e44e5b5d Bump github.com/rootless-containers/rootlesskit from 1.0.0 to 1.0.1 4eff0c8cf pod: add exit policies cfca85356 libpod: unset networks before storing container conf 77d872ea3 vendor c/common@main 5b78f9576 Implement machine inspect for WSL 772ead253 Use simulated dual-stack binds when using WSL 23de3801d buildah-vendor-treadmill script: yet more checks 01acc2565 libpod: host netns keep same /etc/resolv.conf 519820926 fix incorrect permissions for /etc/resolv.conf in userns e6557bf0a pkg/api: do not register decoder in endpoint handler a48c37df3 fix broken hooks-dir test 69c479b16 enable errcheck linter 384c2359b libpod: unlock containers when removing pod 2902d32c4 Refactor machine inspect 64a368ba2 remove unused codepath for creating/running ctr in a pod 6b7fd318b image search --format: add completion for go template 0d9f19028 shell completion --format: use structs by reference cac2b7800 image --format: fix add completion for go template 7f28fd938 Report properly whether pod shares host network cb9a45630 shell completion --format: use anonymous struct field once 8be978158 network inspect --format: add completion for go template f93ba587c shell completion --format: work with nil structs 589e42c99 Bump github.com/containernetworking/cni from 1.0.1 to 1.1.0 a5aea8e50 Three manual fixes b3f38c31b Ginkgo: use HaveField() for better error checking 91ead1528 volume: add new option -o o=noquota ea1fcd7bc podman search: truncate by default c721acf08 podman machine starting test 3b8fa515f Emergency fix for new CI linter 83a75d2a3 Produce better test error messages 461b73f56 Github PR template: add release-note block 22b421dd7 Add CreatedSince & CreatedAt format fields to podman image history e7390f30b Allow changing of CPUs, Memory, and Disk Size 9c0c29f08 Cirrus: Fix ownership of repos. to keep git happy d4e30b33a Temporarily skip netavark/aardvark e2e test cf449e81a Cirrus: Temporarily update netavark/aardvark-dns cd7cff6bb Cirrus: Test w/ netavark/aardvark-dns in F36+ 3a07fc446 Cirrus: Update to F36 CI VM Images a73425a0b Revert "Cirrus: Disable F34 aka prior-fedora testing" Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r--recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch60
-rw-r--r--recipes-containers/podman/podman/0002-Define-ActKillThread-equal-to-ActKill.patch90
-rw-r--r--recipes-containers/podman/podman_git.bb7
3 files changed, 26 insertions, 131 deletions
diff --git a/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch b/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
index e27e1fa8..14b2714f 100644
--- a/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
+++ b/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
@@ -18,39 +18,25 @@ Index: import/Makefile
18=================================================================== 18===================================================================
19--- import.orig/Makefile 19--- import.orig/Makefile
20+++ import/Makefile 20+++ import/Makefile
21@@ -69,7 +69,7 @@ 21@@ -242,7 +242,7 @@
22 # triggered.
23 SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print)
24
25-BUILDFLAGS := -mod=vendor $(BUILDFLAGS)
26+GOBUILDFLAGS := -mod=vendor $(GOBUILDFLAGS)
27
28 BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay
29 CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
30@@ -264,11 +264,11 @@
31 22
32 .PHONY: test/checkseccomp/checkseccomp 23 .PHONY: test/checkseccomp/checkseccomp
33 test/checkseccomp/checkseccomp: .gopathok $(wildcard test/checkseccomp/*.go) 24 test/checkseccomp/checkseccomp: $(wildcard test/checkseccomp/*.go)
34- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp 25- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp
35+ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp 26+ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp
36 27
37 .PHONY: test/testvol/testvol 28 .PHONY: test/testvol/testvol
38 test/testvol/testvol: .gopathok $(wildcard test/testvol/*.go) 29 test/testvol/testvol: $(wildcard test/testvol/*.go)
39- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol 30@@ -254,7 +254,7 @@
40+ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol
41
42 .PHONY: volume-plugin-test-image
43 volume-plugin-test-img:
44@@ -276,7 +276,7 @@
45 31
46 .PHONY: test/goecho/goecho 32 .PHONY: test/goecho/goecho
47 test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go) 33 test/goecho/goecho: $(wildcard test/goecho/*.go)
48- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho 34- $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
49+ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho 35+ $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
50 36
51 test/version/version: .gopathok version/version.go 37 test/version/version: version/version.go
52 $(GO) build -o $@ ./test/version/ 38 $(GO) build -o $@ ./test/version/
53@@ -318,7 +318,7 @@ 39@@ -296,7 +296,7 @@
54 distro for journald support." 40 distro for journald support."
55 endif 41 endif
56 $(GOCMD) build \ 42 $(GOCMD) build \
@@ -59,17 +45,17 @@ Index: import/Makefile
59 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ 45 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
60 -tags "$(BUILDTAGS)" \ 46 -tags "$(BUILDTAGS)" \
61 -o $@ ./cmd/podman 47 -o $@ ./cmd/podman
62@@ -329,7 +329,7 @@ 48@@ -308,7 +308,7 @@
63 49 # '|' is to ignore SRCBINDIR mtime; see: info make 'Types of Prerequisites'
64 $(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum 50 $(SRCBINDIR)/podman$(BINSFX): $(SOURCES) go.mod go.sum | $(SRCBINDIR)
65 $(GOCMD) build \ 51 $(GOCMD) build \
66- $(BUILDFLAGS) \ 52- $(BUILDFLAGS) \
67+ $(GOBUILDFLAGS) \ 53+ $(GOBUILDFLAGS) \
68 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ 54 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
69 -tags "${REMOTETAGS}" \ 55 -tags "${REMOTETAGS}" \
70 -o $@ ./cmd/podman 56 -o $@ ./cmd/podman
71@@ -339,7 +339,7 @@ 57@@ -318,7 +318,7 @@
72 GOOS=$(GOOS) \ 58 GOOS=linux \
73 GOARCH=$(GOARCH) \ 59 GOARCH=$(GOARCH) \
74 $(GO) build \ 60 $(GO) build \
75- $(BUILDFLAGS) \ 61- $(BUILDFLAGS) \
@@ -77,7 +63,7 @@ Index: import/Makefile
77 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \ 63 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \
78 -tags "${REMOTETAGS}" \ 64 -tags "${REMOTETAGS}" \
79 -o $@ ./cmd/podman 65 -o $@ ./cmd/podman
80@@ -374,7 +374,7 @@ 66@@ -338,7 +338,7 @@
81 CGO_ENABLED=0 \ 67 CGO_ENABLED=0 \
82 GOOS=windows \ 68 GOOS=windows \
83 $(GO) build \ 69 $(GO) build \
@@ -86,7 +72,7 @@ Index: import/Makefile
86 -ldflags -H=windowsgui \ 72 -ldflags -H=windowsgui \
87 -o bin/windows/winpath.exe \ 73 -o bin/windows/winpath.exe \
88 ./cmd/winpath 74 ./cmd/winpath
89@@ -393,14 +393,14 @@ 75@@ -349,14 +349,14 @@
90 GOOS=darwin \ 76 GOOS=darwin \
91 GOARCH=$(GOARCH) \ 77 GOARCH=$(GOARCH) \
92 $(GO) build \ 78 $(GO) build \
@@ -95,7 +81,7 @@ Index: import/Makefile
95 -o bin/darwin/podman-mac-helper \ 81 -o bin/darwin/podman-mac-helper \
96 ./cmd/podman-mac-helper 82 ./cmd/podman-mac-helper
97 83
98 bin/rootlessport: .gopathok $(SOURCES) go.mod go.sum 84 bin/rootlessport: $(SOURCES) go.mod go.sum
99 CGO_ENABLED=$(CGO_ENABLED) \ 85 CGO_ENABLED=$(CGO_ENABLED) \
100 $(GO) build \ 86 $(GO) build \
101- $(BUILDFLAGS) \ 87- $(BUILDFLAGS) \
@@ -103,7 +89,7 @@ Index: import/Makefile
103 -o $@ ./cmd/rootlessport 89 -o $@ ./cmd/rootlessport
104 90
105 .PHONY: rootlessport 91 .PHONY: rootlessport
106@@ -423,7 +423,7 @@ 92@@ -379,7 +379,7 @@
107 GOARCH="$${TARGET##*.}"; \ 93 GOARCH="$${TARGET##*.}"; \
108 CGO_ENABLED=0 \ 94 CGO_ENABLED=0 \
109 $(GO) build \ 95 $(GO) build \
@@ -112,12 +98,12 @@ Index: import/Makefile
112 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \ 98 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
113 -tags '$(BUILDTAGS_CROSS)' \ 99 -tags '$(BUILDTAGS_CROSS)' \
114 -o "$@" ./cmd/podman 100 -o "$@" ./cmd/podman
115@@ -871,7 +871,7 @@ 101@@ -830,7 +830,7 @@
102
116 .PHONY: .install.ginkgo 103 .PHONY: .install.ginkgo
117 .install.ginkgo: .gopathok 104 .install.ginkgo:
118 if [ ! -x "$(GOBIN)/ginkgo" ]; then \ 105- $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo
119- $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \ 106+ $(GO) install $(GOBUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo
120+ $(GO) install $(GOBUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \
121 fi
122 107
123 .PHONY: .install.gitvalidation 108 .PHONY: .install.golangci-lint
109 .install.golangci-lint:
diff --git a/recipes-containers/podman/podman/0002-Define-ActKillThread-equal-to-ActKill.patch b/recipes-containers/podman/podman/0002-Define-ActKillThread-equal-to-ActKill.patch
deleted file mode 100644
index ba51d4ac..00000000
--- a/recipes-containers/podman/podman/0002-Define-ActKillThread-equal-to-ActKill.patch
+++ /dev/null
@@ -1,90 +0,0 @@
1From f2aa0359bcc776239bda8a4eb84957b97ef55c35 Mon Sep 17 00:00:00 2001
2From: Tonis Tiigi <tonistiigi@gmail.com>
3Date: Fri, 28 Jan 2022 14:44:56 -0800
4Subject: [PATCH] Define ActKillThread equal to ActKill
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9These constants are equal in libseccomp but Go definitions
10were defined separately. This resulted in dead code that
11never executed due to identical case statements in switch.
12Go can usually detect these error cases and refuses to build
13but for some reason this detection doesn’t work with cgo+gcc.
14Clang detects the equal constants correctly and therefore
15libseccomp-golang builds with clang broke after ActKillThread
16was added.
17
18In order to fix the clang build only removal of the
19switch case is needed. But I assumed that the setter/getter
20logic is supposed to work for ActKillThread as well
21and only way to ensure that is to set them equal like they
22are in C.
23
24Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
25Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
26Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
27Signed-off-by: Paul Moore <paul@paul-moore.com>
28Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
29Upstream-status: Backport [https://github.com/seccomp/libseccomp-golang/commit/c35397d0ea8f285a0be78693bb2fd37b06952453]
30---
31 seccomp.go | 8 ++++----
32 seccomp_internal.go | 4 ----
33 2 files changed, 4 insertions(+), 8 deletions(-)
34
35diff --git a/seccomp.go b/seccomp.go
36index e9b92e2..32f6ab2 100644
37--- a/seccomp.go
38+++ b/seccomp.go
39@@ -214,14 +214,14 @@ const (
40 // This action is only usable when libseccomp API level 3 or higher is
41 // supported.
42 ActLog ScmpAction = iota
43- // ActKillThread kills the thread that violated the rule. It is the same as ActKill.
44- // All other threads from the same thread group will continue to execute.
45- ActKillThread ScmpAction = iota
46 // ActKillProcess kills the process that violated the rule.
47 // All threads in the thread group are also terminated.
48 // This action is only usable when libseccomp API level 3 or higher is
49 // supported.
50 ActKillProcess ScmpAction = iota
51+ // ActKillThread kills the thread that violated the rule. It is the same as ActKill.
52+ // All other threads from the same thread group will continue to execute.
53+ ActKillThread = ActKill
54 )
55
56 const (
57@@ -394,7 +394,7 @@ func (a ScmpCompareOp) String() string {
58 // String returns a string representation of a seccomp match action
59 func (a ScmpAction) String() string {
60 switch a & 0xFFFF {
61- case ActKill, ActKillThread:
62+ case ActKillThread:
63 return "Action: Kill thread"
64 case ActKillProcess:
65 return "Action: Kill process"
66diff --git a/seccomp_internal.go b/seccomp_internal.go
67index 8dc7b29..8fc9914 100644
68--- a/seccomp_internal.go
69+++ b/seccomp_internal.go
70@@ -612,8 +612,6 @@ func (a ScmpCompareOp) toNative() C.int {
71 func actionFromNative(a C.uint32_t) (ScmpAction, error) {
72 aTmp := a & 0xFFFF
73 switch a & 0xFFFF0000 {
74- case C.C_ACT_KILL:
75- return ActKill, nil
76 case C.C_ACT_KILL_PROCESS:
77 return ActKillProcess, nil
78 case C.C_ACT_KILL_THREAD:
79@@ -638,8 +636,6 @@ func actionFromNative(a C.uint32_t) (ScmpAction, error) {
80 // Only use with sanitized actions, no error handling
81 func (a ScmpAction) toNative() C.uint32_t {
82 switch a & 0xFFFF {
83- case ActKill:
84- return C.C_ACT_KILL
85 case ActKillProcess:
86 return C.C_ACT_KILL_PROCESS
87 case ActKillThread:
88--
892.25.1
90
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index e9991920..355e0e09 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -17,11 +17,10 @@ DEPENDS = " \
17 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ 17 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
18" 18"
19 19
20SRCREV = "cedbbfa543651a13055a1fe093a4d0a2a28ccdfd" 20SRCREV = "754ec89a8a185d308ca5ed08afaf34d6cbda08da"
21SRC_URI = " \ 21SRC_URI = " \
22 git://github.com/containers/libpod.git;branch=v4.1;protocol=https \ 22 git://github.com/containers/libpod.git;branch=v4.2;protocol=https \
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 \
25 ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \ 24 ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \
26" 25"
27 26
@@ -32,7 +31,7 @@ GO_IMPORT = "import"
32 31
33S = "${WORKDIR}/git" 32S = "${WORKDIR}/git"
34 33
35PV = "4.1.0+git${SRCPV}" 34PV = "4.2.0+git${SRCPV}"
36 35
37PACKAGES =+ "${PN}-contrib" 36PACKAGES =+ "${PN}-contrib"
38 37