gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-10 12:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

podman: Update to 5.2.2

Browse Source 
- 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 <cnsztl@immortalwrt.org>
Tested-by: Dirk Buchwalder <buchwalder@posteo.de>
This commit is contained in:
Tianling Shen
2024-09-15 16:29:17 +08:00
parent 65ac3470d9
commit b592dbe61a
2 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
utils/podman/Makefile
View File

@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=podman PKG_NAME:=podman
PKG_VERSION:=5.0.0 PKG_VERSION:=5.2.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION) 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:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@@ -39,7 +39,9 @@ define Package/podman
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=Podman TITLE:=Podman
URL:=https://podman.io 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 endef
define Package/podman/description define Package/podman/description
@@ -64,42 +66,20 @@ define Package/podman/conffiles
/etc/containers/networks/podman.json /etc/containers/networks/podman.json
endef endef
GO_PKG_TAGS:=seccomp exclude_graphdriver_devicemapper apparmor
ifdef CONFIG_PODMAN_SELINUX_SUPPORT ifdef CONFIG_PODMAN_SELINUX_SUPPORT
GO_PKG_TAGS=seccomp,exclude_graphdriver_devicemapper,selinux,apparmor GO_PKG_TAGS+= selinux
else
GO_PKG_TAGS=seccomp,exclude_graphdriver_devicemapper,apparmor
endif endif
MAKE_VARS += \ MAKE_VARS += \
GO_INSTALL_BIN_PATH="$(strip $(GO_PKG_INSTALL_BIN_PATH))" \ $(GO_GENERAL_BUILD_CONFIG_VARS) \
BUILD_DIR="$(PKG_BUILD_DIR)" \ $(GO_PKG_BUILD_CONFIG_VARS) \
GO_BUILD_DIR="$(GO_PKG_BUILD_DIR)" \ $(GO_PKG_VARS) \
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 \
PREFIX=/usr \ PREFIX=/usr \
LIBEXECDIR=/usr/lib \ LIBEXECDIR=/usr/lib \
LIBEXECPODMAN=/usr/lib/podman \ LIBEXECPODMAN=/usr/lib/podman \
SHAREDIR_CONTAINERS=/usr/share/containers \
ETCDIR=/etc \
TMPFILESDIR=/var/run/podman \ TMPFILESDIR=/var/run/podman \
BUILDTAGS="$(GO_PKG_TAGS)" \ BUILDTAGS="$(GO_PKG_TAGS)"
EXTRA_LDFLAGS="$(GO_PKG_LDFLAGS)"
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)

4
utils/podman/patches/010-do-not-build-docs.patch
View File

@@ -1,6 +1,6 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -227,7 +227,7 @@ GV_VERSION=v0.7.3 @@ -230,7 +230,7 @@ GV_VERSION=v0.7.4
default: all default: all
.PHONY: all .PHONY: all
@@ -9,7 +9,7 @@
.PHONY: binaries .PHONY: binaries
ifeq ($(shell uname -s),FreeBSD) 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 /usr/bin/podman info # will catch a broken conmon
.PHONY: install .PHONY: install