From edd70c0cb8702851d1c45a826513f7123208e7fb Mon Sep 17 00:00:00 2001 From: xxyzz Date: Sat, 4 Feb 2023 22:07:24 +0800 Subject: [PATCH 1/5] podman 4.4.0 - Build with the latest go - Use GNU Make to fix "invalid `override' directive" error - Build from git tag to fix "fatal: not a git repository" error - Fix build doc error by using just one job with `-j1` argument --- Formula/podman.rb | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Formula/podman.rb b/Formula/podman.rb index d21eb8275763d..e095d5f3fa951 100644 --- a/Formula/podman.rb +++ b/Formula/podman.rb @@ -1,8 +1,9 @@ class Podman < Formula desc "Tool for managing OCI containers and pods" homepage "https://podman.io/" - url "https://github.com/containers/podman/archive/v4.3.1.tar.gz" - sha256 "455c29c4ee78cd6365e5d46e20dd31a5ce4e6e1752db6774253d76bd3ca78813" + url "https://github.com/containers/podman.git", + tag: "v4.4.0", + revision: "3443f453e28169a88848f90a7ce3137fc4a4bebf" license all_of: ["Apache-2.0", "GPL-3.0-or-later"] head "https://github.com/containers/podman.git", branch: "main" @@ -17,10 +18,8 @@ class Podman < Formula sha256 x86_64_linux: "4b4d3245f41cc8ad7f6352f1ccd8db1ad5a12910572ef47a6a1ec1d053aec5dd" end + depends_on "go" => :build depends_on "go-md2man" => :build - # Required latest gvisor.dev/gvisor/pkg/gohacks - # Try to switch to the latest go on the next release - depends_on "go@1.18" => :build on_macos do depends_on "qemu" @@ -29,6 +28,7 @@ class Podman < Formula on_linux do depends_on "autoconf" => :build depends_on "automake" => :build + depends_on "make" => :build depends_on "pkg-config" => :build depends_on "rust" => :build depends_on "conmon" @@ -42,8 +42,8 @@ class Podman < Formula resource "gvproxy" do on_macos do - url "https://github.com/containers/gvisor-tap-vsock/archive/v0.4.0.tar.gz" - sha256 "896cf02fbabce9583a1bba21e2b384015c0104d634a73a16d2f44552cf84d972" + url "https://github.com/containers/gvisor-tap-vsock/archive/v0.5.0.tar.gz" + sha256 "8048f4f5faa2722547d1854110c2347f817b2f47ec51d39b2a7b308f52a7fe59" end end @@ -62,21 +62,22 @@ class Podman < Formula resource "netavark" do on_linux do - url "https://github.com/containers/netavark/archive/refs/tags/v1.3.0.tar.gz" - sha256 "cc8a8e03498cb9b4c74fdbda09a64fdf9000fea398d07073c4e368fc83d35f56" + url "https://github.com/containers/netavark/archive/refs/tags/v1.5.0.tar.gz" + sha256 "303fbcf3fc645b0e8e8fc1759626c92082f85f49b9d07672918aebd496a24d34" end end resource "aardvark-dns" do on_linux do - url "https://github.com/containers/aardvark-dns/archive/refs/tags/v1.3.0.tar.gz" - sha256 "6dd1ce4346ed5c57bbd990140e02e69c036919032582b937d2ad7835329d3bc3" + url "https://github.com/containers/aardvark-dns/archive/refs/tags/v1.5.0.tar.gz" + sha256 "b7e7ca1b94c1a62c8800f49befb803ec37cc5caf7656352537343a8fb654e4a6" end end def install if OS.mac? ENV["CGO_ENABLED"] = "1" + ENV.prepend_path "PATH", Formula["make"].opt_libexec/"gnubin" system "make", "podman-remote" bin.install "bin/darwin/podman" => "podman-remote" @@ -90,7 +91,7 @@ def install (libexec/"podman").install "bin/gvproxy" end - system "make", "podman-remote-darwin-docs" + system "make", "-j1", "podman-remote-darwin-docs" man1.install Dir["docs/build/remote/darwin/*.1"] bash_completion.install "completions/bash/podman" From ea3b3f1b1135aef5369f9ab78b52e0169fe832f4 Mon Sep 17 00:00:00 2001 From: xxyzz Date: Sun, 5 Feb 2023 10:18:32 +0800 Subject: [PATCH 2/5] Add resource netavark's build dependency protobuf --- Formula/podman.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/podman.rb b/Formula/podman.rb index e095d5f3fa951..28783d88d4ec6 100644 --- a/Formula/podman.rb +++ b/Formula/podman.rb @@ -30,6 +30,7 @@ class Podman < Formula depends_on "automake" => :build depends_on "make" => :build depends_on "pkg-config" => :build + depends_on "protobuf" => :build depends_on "rust" => :build depends_on "conmon" depends_on "crun" From b6e184333db841644974d2f10dae70eb372576db Mon Sep 17 00:00:00 2001 From: xxyzz Date: Sun, 5 Feb 2023 12:00:32 +0800 Subject: [PATCH 3/5] Add quadlet path to test --- Formula/podman.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/podman.rb b/Formula/podman.rb index 28783d88d4ec6..65ba133937db4 100644 --- a/Formula/podman.rb +++ b/Formula/podman.rb @@ -175,6 +175,7 @@ def caveats #{libexec}/podman/catatonit #{libexec}/podman/netavark #{libexec}/podman/aardvark-dns + #{libexec}/podman/quadlet #{libexec}/podman/rootlessport ].sort, Dir[libexec/"podman/*"].sort out = shell_output("file #{libexec}/podman/catatonit") From b315fe0b72fb40bc17c279e988665c7157c85e02 Mon Sep 17 00:00:00 2001 From: xxyzz Date: Sun, 5 Feb 2023 20:27:01 +0800 Subject: [PATCH 4/5] Add remove make `-j1` flag at next release comment --- Formula/podman.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/podman.rb b/Formula/podman.rb index 65ba133937db4..095aace7979d0 100644 --- a/Formula/podman.rb +++ b/Formula/podman.rb @@ -92,6 +92,7 @@ def install (libexec/"podman").install "bin/gvproxy" end + # Remove the "-j1" flag at next release system "make", "-j1", "podman-remote-darwin-docs" man1.install Dir["docs/build/remote/darwin/*.1"] From f63f14178382a57d44f4999c71bbc47f39d80174 Mon Sep 17 00:00:00 2001 From: xxyzz Date: Sun, 5 Feb 2023 22:20:55 +0800 Subject: [PATCH 5/5] Move `make` build dependency to `on_macos` block --- Formula/podman.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/podman.rb b/Formula/podman.rb index 095aace7979d0..0600f9f23e118 100644 --- a/Formula/podman.rb +++ b/Formula/podman.rb @@ -22,13 +22,13 @@ class Podman < Formula depends_on "go-md2man" => :build on_macos do + depends_on "make" => :build depends_on "qemu" end on_linux do depends_on "autoconf" => :build depends_on "automake" => :build - depends_on "make" => :build depends_on "pkg-config" => :build depends_on "protobuf" => :build depends_on "rust" => :build