diff options
| author | Oskari Rauta <oskari.rauta@gmail.com> | 2022-03-03 02:42:23 +0200 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2022-03-02 16:31:08 -0800 |
| commit | c36c8ed94cfc97b3b517c082cd791dc59e48f533 (patch) | |
| tree | 2af990b85b4f4a9ec8d03e095223e4c372975e50 | |
| parent | 5e2df7e38ea670b3e43c2efba944f6c242dc7cb3 (diff) | |
podman: update to version 4.0.2
- Patch had became obsolete, it's contents were merged to upstream. Patch removed.
- Version updated, long list of changes is available at https://github.com/containers/podman/releases
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
| -rw-r--r-- | utils/podman/Makefile | 10 | ||||
| -rw-r--r-- | utils/podman/patches/010-declare-temp-failure-retry-before-usage.patch | 34 |
2 files changed, 5 insertions, 39 deletions
diff --git a/utils/podman/Makefile b/utils/podman/Makefile index a9f0c7831..7d3ad252d 100644 --- a/utils/podman/Makefile +++ b/utils/podman/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podman -PKG_VERSION:=3.4.4 +PKG_VERSION:=4.0.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION) -PKG_HASH:=718c9e1e734c2d374fcf3c59e4cc7c1755acb954fc7565093e1d636c04b72e3a +PKG_HASH:=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -17,7 +17,7 @@ PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 GO_PKG:=github.com/containers/podman/ -GO_PKG_BUILD_PKG:=github.com/containers/podman/v3/cmd/podman/ +GO_PKG_BUILD_PKG:=github.com/containers/podman/v4/cmd/podman/ include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk @@ -45,7 +45,7 @@ endef define Package/podman $(call Package/podman/Default) - DEPENDS:=$(GO_ARCH_DEPENDS) +conmon +cni +cni-plugins +btrfs-progs +glib2 +gnupg2 +iptables +libgpg-error +libseccomp +libgpgme +nsenter +zoneinfo-simple +kmod-veth + DEPENDS:=$(GO_ARCH_DEPENDS) +conmon +cni +cni-plugins +btrfs-progs +glib2 +gnupg2 +uci-firewall +libgpg-error +libseccomp +libgpgme +nsenter +zoneinfo-simple +kmod-veth CONFLICTS:=podman-selinux VARIANT:=default PROVIDES:=podman @@ -54,7 +54,7 @@ endef define Package/podman-selinux $(call Package/podman/Default) TITLE += with SELinux support - DEPENDS:=$(GO_ARCH_DEPENDS) +conmon +cni +cni-plugins +btrfs-progs +glib2 +gnupg2 +iptables +libgpg-error +libseccomp +libgpgme +nsenter +zoneinfo-simple +kmod-veth +libselinux + DEPENDS:=$(GO_ARCH_DEPENDS) +conmon +cni +cni-plugins +btrfs-progs +glib2 +gnupg2 +uci-firewall +libgpg-error +libseccomp +libgpgme +nsenter +zoneinfo-simple +kmod-veth +libselinux VARIANT:=selinux PROVIDES:=podman endef diff --git a/utils/podman/patches/010-declare-temp-failure-retry-before-usage.patch b/utils/podman/patches/010-declare-temp-failure-retry-before-usage.patch deleted file mode 100644 index a111da41f..000000000 --- a/utils/podman/patches/010-declare-temp-failure-retry-before-usage.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/pkg/rootless/rootless_linux.c -+++ b/pkg/rootless/rootless_linux.c -@@ -19,6 +19,15 @@ - #include <sys/select.h> - #include <stdio.h> - -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - #define cleanup_free __attribute__ ((cleanup (cleanup_freep))) - #define cleanup_close __attribute__ ((cleanup (cleanup_closep))) - #define cleanup_dir __attribute__ ((cleanup (cleanup_dirp))) -@@ -72,15 +81,6 @@ int rename_noreplace (int olddirfd, cons - return rename (oldpath, newpath); - } - --#ifndef TEMP_FAILURE_RETRY --#define TEMP_FAILURE_RETRY(expression) \ -- (__extension__ \ -- ({ long int __result; \ -- do __result = (long int) (expression); \ -- while (__result == -1L && errno == EINTR); \ -- __result; })) --#endif -- - static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces"; - static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone"; - |