diff options
| author | Oskari Rauta <oskari.rauta@gmail.com> | 2024-03-25 09:28:07 +0200 |
|---|---|---|
| committer | Tianling Shen <cnsztl@gmail.com> | 2024-03-26 00:26:14 +0800 |
| commit | 551ff0f8108b41432dc593ed4b159a132196ce1c (patch) | |
| tree | 5b91bde154953703862e82022259cc5e3ae3147f /utils/podman/patches | |
| parent | 680bb774217469eb5eba81d0dc7c02fab1618f21 (diff) | |
podman: update to v5.0.0
Major version update to podman
- Obsolete patch removed
- patch 010-do-not-build-docs.patch refreshed
Changelog: https://github.com/containers/podman/releases/tag/v5.0.0
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
Diffstat (limited to 'utils/podman/patches')
| -rw-r--r-- | utils/podman/patches/010-do-not-build-docs.patch | 4 | ||||
| -rw-r--r-- | utils/podman/patches/020-fix-build-with-musl-1.2.4.patch | 16 |
2 files changed, 2 insertions, 18 deletions
diff --git a/utils/podman/patches/010-do-not-build-docs.patch b/utils/podman/patches/010-do-not-build-docs.patch index 4ff46a3fd..ab9a51a26 100644 --- 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 -@@ -224,7 +224,7 @@ GV_VERSION=v0.7.2 +@@ -227,7 +227,7 @@ GV_VERSION=v0.7.3 default: all .PHONY: all @@ -9,7 +9,7 @@ .PHONY: binaries ifeq ($(shell uname -s),FreeBSD) -@@ -803,7 +803,7 @@ rpm-install: package ## Install rpm pac +@@ -810,7 +810,7 @@ rpm-install: package ## Install rpm pac /usr/bin/podman info # will catch a broken conmon .PHONY: install diff --git a/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch b/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch deleted file mode 100644 index 9d56ca780..000000000 --- a/utils/podman/patches/020-fix-build-with-musl-1.2.4.patch +++ /dev/null @@ -1,16 +0,0 @@ -From https://github.com/mattn/go-sqlite3/pull/1177/commits/65d6085c5d87280c0d6883c884ddb25f9273942f Mon Sep 17 00:00:00 2001 -From: leso-kn <info@lesosoftware.com> -Date: Mon, 10 Jul 2023 14:58:52 +0200 -Subject: [PATCH] Fix musl build (#1164) - ---- a/vendor/github.com/mattn/go-sqlite3/sqlite3.go -+++ b/vendor/github.com/mattn/go-sqlite3/sqlite3.go -@@ -21,7 +21,7 @@ package sqlite3 - #cgo CFLAGS: -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 - #cgo CFLAGS: -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT - #cgo CFLAGS: -Wno-deprecated-declarations --#cgo linux,!android CFLAGS: -DHAVE_PREAD64=1 -DHAVE_PWRITE64=1 -+#cgo linux,!android CFLAGS: -DHAVE_PREAD=1 -DHAVE_PWRITE=1 - #cgo openbsd CFLAGS: -I/usr/local/include - #cgo openbsd LDFLAGS: -L/usr/local/lib - #ifndef USE_LIBSQLITE3 |