Source: podman Source-Version: 5.2.3+ds1-1 Severity: wishlist Tags: patch Hi!
I'm trying to upgrade the golang-github-shirou-gopsutil package from v3 to v4, and this is one of the reverse dependencies that would fail to build if I uploading it now. The attached patch removes the hardcoded v3 suffix, which should make it build with both v3 and v4. So it would be nice if this could be uploaded right away to make this not block this mini-transition anymore. :) Thanks, Guillem
From 9b8d0ea36d0cce1d867129a9f8f2a82f8175a6d4 Mon Sep 17 00:00:00 2001 From: Guillem Jover <[email protected]> Date: Wed, 2 Oct 2024 00:26:41 +0200 Subject: [PATCH] Do not hardcode gopsutil v3 We can use v4 when no version suffix is used. Remove it so that we can upgrade the gopsutil modules from v3 to v4 in Debian. --- debian/patches/Use-gopsutil-v4.patch | 58 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 59 insertions(+) create mode 100644 debian/patches/Use-gopsutil-v4.patch diff --git a/debian/patches/Use-gopsutil-v4.patch b/debian/patches/Use-gopsutil-v4.patch new file mode 100644 index 000000000..b9863d7c3 --- /dev/null +++ b/debian/patches/Use-gopsutil-v4.patch @@ -0,0 +1,58 @@ +From: Guillem Jover <[email protected]> +Date: Tue, 01 Oct 2024 22:48:05 +0200 +Subject: Do not hardcode gopsutil v3 + +We can use v4 when no version suffix is used. Remove it so that we can +upgrade the gopsutil modules from v3 to v4 in Debian. + +--- + cmd/podman/machine/init.go | 2 +- + cmd/podman/machine/server9p.go | 2 +- + pkg/machine/e2e/init_test.go | 2 +- + pkg/machine/gvproxy_unix.go | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +--- a/cmd/podman/machine/init.go ++++ b/cmd/podman/machine/init.go +@@ -15,7 +15,7 @@ import ( + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/shim" + "github.com/containers/podman/v5/pkg/machine/vmconfigs" +- "github.com/shirou/gopsutil/v3/mem" ++ "github.com/shirou/gopsutil/mem" + "github.com/sirupsen/logrus" + "github.com/spf13/cobra" + ) +--- a/cmd/podman/machine/server9p.go ++++ b/cmd/podman/machine/server9p.go +@@ -11,7 +11,7 @@ import ( + "github.com/containers/common/pkg/completion" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/fileserver" +- psutil "github.com/shirou/gopsutil/v3/process" ++ psutil "github.com/shirou/gopsutil/process" + "github.com/sirupsen/logrus" + "github.com/spf13/cobra" + ) +--- a/pkg/machine/e2e/init_test.go ++++ b/pkg/machine/e2e/init_test.go +@@ -15,7 +15,7 @@ import ( + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gexec" +- "github.com/shirou/gopsutil/v3/mem" ++ "github.com/shirou/gopsutil/mem" + "github.com/sirupsen/logrus" + ) + +--- a/pkg/machine/gvproxy_unix.go ++++ b/pkg/machine/gvproxy_unix.go +@@ -8,7 +8,7 @@ import ( + "syscall" + "time" + +- psutil "github.com/shirou/gopsutil/v3/process" ++ psutil "github.com/shirou/gopsutil/process" + "github.com/sirupsen/logrus" + "golang.org/x/sys/unix" + ) diff --git a/debian/patches/series b/debian/patches/series index dc69b6d08..e2a8b58f4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ system-goimports.patch 0002-Revert-update-to-docker-27.patch 0003-TestProviders-Skip-test-if-unable-to-list-providers.patch +Use-gopsutil-v4.patch -- 2.45.2
