From a3418e0138817d295b201a66a47166b53eed2217 Mon Sep 17 00:00:00 2001 From: writings-of-prince-huainan Date: Sat, 9 Jan 2021 14:49:21 +0800 Subject: [PATCH] patch for podman pull with issue I2BF99 modify patch header Fix podman pull failed --- 0001-podman-patch-for-local-search.patch | 24 ++++++++++++++++++++++++ podman.spec | 7 +++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 0001-podman-patch-for-local-search.patch diff --git a/0001-podman-patch-for-local-search.patch b/0001-podman-patch-for-local-search.patch new file mode 100644 index 0000000..76d4b27 --- /dev/null +++ b/0001-podman-patch-for-local-search.patch @@ -0,0 +1,24 @@ +From 74e5b68971c251074b8e789db969d8541c0c6533 Mon Sep 17 00:00:00 2001 +From: weishengjing <773945074@qq.com> +Date: Sat, 9 Jan 2021 10:52:56 +0800 +Subject: [PATCH] patch for podman pull + +--- + libpod.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libpod.conf b/libpod.conf +index 2976cec..4001d21 100644 +--- a/libpod.conf ++++ b/libpod.conf +@@ -7,6 +7,7 @@ image_default_transport = "docker://" + # Paths to look for a valid OCI runtime (runc, runv, etc) + runtime_path = [ + "/usr/bin/runc", ++ "/usr/local/bin/runc", + "/usr/sbin/runc", + "/sbin/runc", + "/bin/runc", +-- +2.27.0 + diff --git a/podman.spec b/podman.spec index 0b388c0..e1a9925 100644 --- a/podman.spec +++ b/podman.spec @@ -1,6 +1,6 @@ Name: podman Version: 0.10.1 -Release: 4 +Release: 5 Summary: A daemonless container engine for managing Containers Epoch: 1 License: ASL 2.0 @@ -107,7 +107,7 @@ Provides: bundled(golang(k8s.io/apiserver)) = 4d1163080139f1f9094baf8a3a6099e85e Provides: bundled(golang(k8s.io/client-go)) = 7cd1d3291b7d9b1e2d54d4b69eb65995eaf8888e Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee5560b555ac9 Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e - +Patch1: 0001-podman-patch-for-local-search.patch %description Podman manages the entire container ecosystem which includes pods, containers, container images, and container volumes using the libpod library. @@ -210,6 +210,9 @@ install -Dp -m644 libpod.conf %{buildroot}%{_datadir}/containers/libpod.conf %{_mandir}/man5/*.5* %changelog +* Sat Jan 9 2021 Shengjing Wei - 1:0.10.1-5 +- Fixed podman pull failed with issue I2BF99 + * Wed Sep 9 2020 Guoshuai Sun - 1:0.10.1-4 - Add conflicts with docker-engine for help package -- Gitee