podman: Update to 5.2.2

- Cleanup Makefile - Refresh patches - Simplify go tags - Separate go tags with space due to upstream change - Remove vars which are indentical to upstream or empty - Invoke built-in go vars instead of duplicating one by one Signed-off-by: Tianling Shen <[email protected]> Tested-by: Dirk Buchwalder <[email protected]>
openwrt · Sep 20, 2024 · b592dbe · b592dbe
1 parent 65ac347
commit b592dbe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/utils/podman/Makefile b/utils/podman/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podman
-PKG_VERSION:=5.0.0
+PKG_VERSION:=5.2.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION)
-PKG_HASH:=818db636955a1eeec4dcb586d18783ab86a8afd07e3f4adaf25920b3697316c9
+PKG_HASH:=571658f175d61724269c1a20626c1e39424af59b7bcf7ff94135d03b790bbecb
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -39,7 +39,9 @@ define Package/podman
   CATEGORY:=Utilities
   TITLE:=Podman
   URL:=https://podman.io
-  DEPENDS:=$(GO_ARCH_DEPENDS) +conmon +libgpgme +libseccomp +nsenter +zoneinfo-simple +kmod-veth +slirp4netns +netavark +aardvark-dns +catatonit +crun +PODMAN_SELINUX_SUPPORT:libselinux
+  DEPENDS:=$(GO_ARCH_DEPENDS) +conmon +libgpgme +libseccomp +nsenter \
+	+zoneinfo-simple +kmod-veth +slirp4netns +netavark +aardvark-dns \
+	+catatonit +crun +PODMAN_SELINUX_SUPPORT:libselinux
 endef
 
 define Package/podman/description
@@ -64,42 +66,20 @@ define Package/podman/conffiles
 /etc/containers/networks/podman.json
 endef
 
+GO_PKG_TAGS:=seccomp exclude_graphdriver_devicemapper apparmor
 ifdef CONFIG_PODMAN_SELINUX_SUPPORT
-  GO_PKG_TAGS=seccomp,exclude_graphdriver_devicemapper,selinux,apparmor
-else
-  GO_PKG_TAGS=seccomp,exclude_graphdriver_devicemapper,apparmor
+  GO_PKG_TAGS+= selinux
 endif
 
 MAKE_VARS += \
-	GO_INSTALL_BIN_PATH="$(strip $(GO_PKG_INSTALL_BIN_PATH))" \
-	BUILD_DIR="$(PKG_BUILD_DIR)" \
-	GO_BUILD_DIR="$(GO_PKG_BUILD_DIR)" \
-	GO_BUILD_BIN_DIR="$(GO_PKG_BUILD_BIN_DIR)" \
-	GO_BUILD_DEPENDS_PATH="$(GO_PKG_BUILD_DEPENDS_PATH)" \
-	GO_BUILD_DEPENDS_SRC="$(GO_PKG_BUILD_DEPENDS_SRC)" \
-	GOOS="$(GO_OS)" \
-	GOARCH="$(GO_ARCH)" \
-	CC="$(TARGET_CC)" \
-	CXX="$(TARGET_CXX)" \
-	CGO_CFLAGS="$(filter-out $(GO_CFLAGS_TO_REMOVE),$(TARGET_CFLAGS))" \
-	CGO_CPPFLAGS="$(TARGET_CPPFLAGS)" \
-	CGO_CXXFLAGS="$(filter-out $(GO_CFLAGS_TO_REMOVE),$(TARGET_CXXFLAGS))" \
-	CGO_LDFLAGS="$(TARGET_LDFLAGS)" \
-	GOPATH="$(GO_PKG_BUILD_DIR)" \
-	GOCACHE="$(GO_BUILD_CACHE_DIR)" \
-	GOMODCACHE="$(GO_MOD_CACHE_DIR)" \
-	GOFLAGS="$(GO_PKG_GCFLAGS)" \
-	GO_PKG_CFLAGS="$(GO_PKG_CFLAGS)" \
-	CGO_ENABLED=1 \
-	GOENV=off \
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_PKG_BUILD_CONFIG_VARS) \
+	$(GO_PKG_VARS) \
 	PREFIX=/usr \
 	LIBEXECDIR=/usr/lib \
 	LIBEXECPODMAN=/usr/lib/podman \
-	SHAREDIR_CONTAINERS=/usr/share/containers \
-	ETCDIR=/etc \
 	TMPFILESDIR=/var/run/podman \
-	BUILDTAGS="$(GO_PKG_TAGS)" \
-	EXTRA_LDFLAGS="$(GO_PKG_LDFLAGS)"
+	BUILDTAGS="$(GO_PKG_TAGS)"
 
 define Build/Prepare
 	$(call Build/Prepare/Default)

diff --git a/utils/podman/patches/010-do-not-build-docs.patch b/utils/podman/patches/010-do-not-build-docs.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -227,7 +227,7 @@ GV_VERSION=v0.7.3
+@@ -230,7 +230,7 @@ GV_VERSION=v0.7.4
  default: all
 
  .PHONY: all
@@ -9,7 +9,7 @@
 
  .PHONY: binaries
  ifeq ($(shell uname -s),FreeBSD)
-@@ -810,7 +810,7 @@ rpm-install: package  ## Install rpm pac
+@@ -853,7 +853,7 @@ rpm-install: package  ## Install rpm pac
  	/usr/bin/podman info  # will catch a broken conmon
 
  .PHONY: install