Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

podman: Update to 5.2.2 #24977

Merged
merged 6 commits into from
Sep 20, 2024
+27 −47
Merged

podman: Update to 5.2.2 #24977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba04e87
conmon: Update to 2.1.12
1715173329 Sep 15, 2024
0e14d82
crun: Update to 1.17
1715173329 Sep 15, 2024
81f850b
slirp4netns: Update to 1.3.1
1715173329 Sep 15, 2024
01551af
netavark: Update to 1.12.2
1715173329 Sep 15, 2024
65ac347
aardvark-dns: Update to 1.12.2
1715173329 Sep 15, 2024
b592dbe
podman: Update to 5.2.2
1715173329 Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions net/aardvark-dns/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=aardvark-dns
PKG_VERSION:=1.11.0
PKG_VERSION:=1.12.2
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/containers/aardvark-dns/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=3e95b363f89a945ee6e63f51051f9eb982bdc469bf8e727b5d7adca676789750
PKG_HASH:=19317d97525c19135b31f76101b9c13bf2b009cecfc11f467b2ab30fb2641867

PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions net/netavark/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=netavark
PKG_VERSION:=1.10.3
PKG_VERSION:=1.12.2
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/containers/netavark/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=fdc3010cb221f0fcef0302f57ef6f4d9168a61f9606238a3e1ed4d2e348257b7
PKG_HASH:=d1e5a7e65b825724fd084b0162084d9b61db8cda1dad26de8a07be1bd6891dbc

PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions net/slirp4netns/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=slirp4netns
PKG_VERSION:=1.2.3
PKG_VERSION:=1.3.1
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/rootless-containers/slirp4netns/archive/v$(PKG_VERSION)
PKG_HASH:=acce648fab8fe5f113c41a8fd6d20177708519b4ddaa60f845e1998a17b22ca5
PKG_HASH:=a3b7c7b593b279c46d25a48b583371ab762968e98b6a46457d8d52a755852eb9

PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
Expand Down
6 changes: 3 additions & 3 deletions utils/conmon/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=conmon
PKG_VERSION:=2.1.10
PKG_VERSION:=2.1.12
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/containers/$(PKG_NAME)/archive/v$(PKG_VERSION)
PKG_HASH:=455fabcbd4a5a5dc5e05374a71b62dc0b08ee865c2ba398e9dc9acac1ea1836a
PKG_SOURCE_URL:=https://github.com/containers/conmon/archive/v$(PKG_VERSION)
PKG_HASH:=842f0b5614281f7e35eec2a4e35f9f7b9834819aa58ecdad8d0ff6a84f6796a6

PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion utils/conmon/patches/010-remove-libdl-dep.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/meson.build
+++ b/meson.build
@@ -90,7 +90,7 @@ executable('conmon',
@@ -87,7 +87,7 @@ executable('conmon',
'src/utils.h',
'src/seccomp_notify.c',
'src/seccomp_notify.h'],
Expand Down
8 changes: 4 additions & 4 deletions utils/crun/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=crun
PKG_VERSION:=1.15
PKG_VERSION:=1.17
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/containers/crun/tar.gz/$(PKG_VERSION)?
PKG_HASH:=357ebf4b391284d29176e1a638cff8f47569595db66c272c558241e4f807c600
PKG_HASH:=f106f6adb752af5e0a867e226440e9ddaaf2d7400149d181f171b78ca19ad5e5

PKG_BUILD_DEPENDS:=argp-standalone
PKG_BUILD_PARALLEL:=1
Expand All @@ -32,13 +32,13 @@ define Package/crun/description
A fast and low-memory footprint OCI Container Runtime fully written in C.
endef

LIBOCISPEC_COMMIT:=7b27d0a0bb87fdd7ee46365994e450a58405004f
LIBOCISPEC_COMMIT:=68211ccc41201c45ad276b04c7f67d61e80b1f7a

define Download/libocispec
PROTO:=git
URL:=https://github.com/containers/libocispec.git
VERSION:=$(LIBOCISPEC_COMMIT)
MIRROR_HASH:=45562d4650b509e97d145a90a7fda07c9855f79ee96190cfd4181ae619fcc037
MIRROR_HASH:=688d00600dbdf46d4b52acc8e43313b14471026ccff8c3cc5983e2f5dfd15571
FILE:=libocispec-$(LIBOCISPEC_COMMIT).tar.xz
SUBDIR:=libocispec
endef
Expand Down
42 changes: 11 additions & 31 deletions utils/podman/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions utils/podman/patches/010-do-not-build-docs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand 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
Expand Down
Loading