[bug#71923] [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix.

[bug#71923] [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix.

[Jean-Pierre De Jesus DIAZ]

This fixes these packages and additionally updates podman to 5.1.1.

I've verified with `strings <binaries> | grep '/gnu/store'` to check for
references in the store for go packages and found none after these
patches. (perhaps there's a clever way of checking that I'm not aware of
but it works).

Jean-Pierre De Jesus DIAZ (4):
  gnu: gvisor-tap-vsock: Fix build.
  gnu: podman: Fix build.
  gnu: buildah: Fix build.
  gnu: podman: Update to 5.1.1.

 gnu/packages/containers.scm | 45 ++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 28 deletions(-)


base-commit: cf6f06b4461867f32d70354e8799516f991075e1
-- 
2.45.2

[bug#71923] [PATCH 1/4] gnu: gvisor-tap-vsock: Fix build.

[Jean-Pierre De Jesus DIAZ]

* gnu/packages/containers.scm (gvisor-tap-vsock)<arguments>: Remove
'remove-go-references phase, add 'patch-go-reference phase and remove
imported modules.

Change-Id: I202292e303268b3ec0f13f19d4ceba517cd73aaa
---
 gnu/packages/containers.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index c57f249ebd..396324284e 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -392,12 +392,15 @@ (define-public gvisor-tap-vsock
      (list
       #:make-flags `(list ,(string-append "GIT_VERSION=v" version))
       #:test-target "test"
-      #:imported-modules
-      (source-module-closure `(,@%gnu-build-system-modules
-                               (guix build go-build-system)))
       #:phases
       #~(modify-phases %standard-phases
           (delete 'configure)
+          ;; Add -trimpath flag to avoid keeping references to go package
+          ;; in the store.
+          (add-after 'unpack 'patch-go-reference
+            (lambda _
+              (substitute* "Makefile"
+                (("go build") "go build -trimpath"))))
           (add-before 'build 'setenv
             (lambda _
               ;; For golang toolchain.
@@ -408,9 +411,7 @@ (define-public gvisor-tap-vsock
               (invoke "rm" "-r" "test")))
           (replace 'install
             (lambda _
-              (install-file "bin/gvproxy" (string-append #$output "/bin"))))
-          (add-after 'install 'remove-go-references
-            (@@ (guix build go-build-system) remove-go-references)))))
+              (install-file "bin/gvproxy" (string-append #$output "/bin")))))))
     (native-inputs (list go-1.20))
     (home-page "https://github.com/containers/gvisor-tap-vsock")
     (synopsis "Network stack for virtualization based on gVisor")
-- 
2.45.2

[bug#71923] [PATCH 2/4] gnu: podman: Fix build.

[Jean-Pierre De Jesus DIAZ]

* gnu/packages/containers.scm (podman)<arguments>: Remove
'remove-go-references phase, add BUILDFLAGS=-trimpath to make-flags and
remove imported modules.

Change-Id: I6ffca5bd5be21b8b61ea9aa50273f97c5e342f9d
---
 gnu/packages/containers.scm | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 396324284e..38af5cb3fb 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -473,12 +473,10 @@ (define-public podman
               (string-append "PREFIX=" #$output)
               (string-append "HELPER_BINARIES_DIR=" #$output "/_guix")
               (string-append "GOMD2MAN="
-                             #$go-github-com-go-md2man "/bin/go-md2man"))
+                             #$go-github-com-go-md2man "/bin/go-md2man")
+              (string-append "BUILDFLAGS=-trimpath"))
       #:tests? #f                  ; /sys/fs/cgroup not set up in guix sandbox
       #:test-target "test"
-      #:imported-modules
-      (source-module-closure `(,@%gnu-build-system-modules
-                               (guix build go-build-system)))
       #:phases
       #~(modify-phases %standard-phases
           (delete 'configure)
@@ -530,17 +528,6 @@ (define-public podman
                    ,(string-append #$passt          "/bin")
                    ,(string-append #$procps         "/bin") ; ps
                    "/run/setuid-programs")))))
-          (add-after 'install 'remove-go-references
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((go (assoc-ref inputs "go")))
-                (for-each
-                 (lambda (file)
-                   (when (executable-file? file)
-                     ((@@ (guix build go-build-system) remove-store-reference)
-                      file go)))
-                 (append (find-files (string-append #$output "/bin"))
-                         (find-files (string-append #$output "/libexec"))
-                         (find-files (string-append #$output "/lib")))))))
           (add-after 'install 'install-completions
             (lambda _
               (invoke "make" "install.completions"
-- 
2.45.2

[bug#71923] [PATCH 3/4] gnu: buildah: Fix build.

[Jean-Pierre De Jesus DIAZ]

* gnu/packages/containers.scm (buildah)<arguments>: Remove
'remove-go-references phase, add 'patch-buildflags phase and remove
imported modules.

Change-Id: Id89ea5c90ba8064484eec460efdfa592c974adca
---
 gnu/packages/containers.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 38af5cb3fb..1b7032ca82 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -617,9 +617,6 @@ (define-public buildah
                              #$go-github-com-go-md2man "/bin/go-md2man"))
       #:tests? #f                  ; /sys/fs/cgroup not set up in guix sandbox
       #:test-target "test-unit"
-      #:imported-modules
-      (source-module-closure `(,@%gnu-build-system-modules
-                               (guix build go-build-system)))
       #:phases
       #~(modify-phases %standard-phases
           (delete 'configure)
@@ -631,6 +628,12 @@ (define-public buildah
               ;; Make <4.4 causing CC not to be propagated into $(shell ...)
               ;; calls.  Can be removed once we update to >4.3.
               (setenv "CC" #$(cc-for-target))))
+          ;; Add -trimpath to build flags to avoid keeping references to go
+          ;; packages.
+          (add-after 'set-env 'patch-buildflags
+            (lambda _
+              (substitute* "Makefile"
+                (("BUILDFLAGS :=") "BUILDFLAGS := -trimpath "))))
           (replace 'check
             (lambda* (#:key tests? #:allow-other-keys)
               (when tests?
@@ -658,8 +661,6 @@ (define-public buildah
                    ,(string-append #$gcc            "/bin") ; cpp
                    ,(string-append #$passt          "/bin")
                    "/run/setuid-programs")))))
-          (add-after 'install 'remove-go-references
-            (@@ (guix build go-build-system) remove-go-references))
           (add-after 'install 'install-completions
             (lambda _
               (invoke "make" "install.completions"
-- 
2.45.2

[bug#71923] [PATCH 4/4] gnu: podman: Update to 5.1.1.

[Jean-Pierre De Jesus DIAZ]

* gnu/packages/containers.scm (podman): Update to 5.1.1.

Change-Id: Ie2563c1862debefcd6b5d0268e6cb57b6ae7193b
---
 gnu/packages/containers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 1b7032ca82..fccb972b94 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -455,7 +455,7 @@ (define-public catatonit
 (define-public podman
   (package
     (name "podman")
-    (version "5.1.0")
+    (version "5.1.1")
     (source
      (origin
        (method git-fetch)
@@ -463,7 +463,7 @@ (define-public podman
              (url "https://github.com/containers/podman")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "0ldzrrz8jba6ka1xfs8msiy08iz4m674xhfxbcdsnc9lmxi3ys4f"))
+        (base32 "1rhlwd350ll472jn7gm4nbkfkbm609d5s97wdqfb7lfagqwi1vny"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
-- 
2.45.2

[bug#71923] [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix.

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]


Hi,

Thanks for the patches.

It looks like it was missed during the merge/cherry pick from go-team
branch where I've fixed it recently.

I'm checking the build and will apply shortly.

--
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#71923] [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix.

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 6959 bytes --]


Hi,

It looks good!

--8<---------------cut here---------------start------------->8---
> ./pre-inst-env guix build podman buildah podman gvisor-tap-vsock
/gnu/store/gzql3mr9r1w1h892lhab9pzq9g7wid1z-gvisor-tap-vsock-0.7.3
/gnu/store/12mvay4cpsx4zgbksrwfh5nw857n674l-podman-5.1.1
/gnu/store/ggmq3xhnbdvlyc22hxqdwhbbkh1z82q5-buildah-1.36.0
/gnu/store/12mvay4cpsx4zgbksrwfh5nw857n674l-podman-5.1.1
--8<---------------cut here---------------end--------------->8---
Check after build:

--8<---------------cut here---------------start------------->8---
gnu_store=(
    /gnu/store/gzql3mr9r1w1h892lhab9pzq9g7wid1z-gvisor-tap-vsock-0.7.3
    /gnu/store/12mvay4cpsx4zgbksrwfh5nw857n674l-podman-5.1.1
    /gnu/store/ggmq3xhnbdvlyc22hxqdwhbbkh1z82q5-buildah-1.36.0
    /gnu/store/12mvay4cpsx4zgbksrwfh5nw857n674l-podman-5.1.1)

for store_item in ${gnu_store[@]}
do
    find "$store_item" -type f -exec strings {} \; |
        grep "/gnu/store/................................-" |
        grep -v ":" |
        sort -u
done

exec -a "$0" "/gnu/store/12mvay4cpsx4zgbksrwfh5nw857n674l-podman-5.1.1/bin/.podman-real" "$@"
exec -a "$0" "/gnu/store/ggmq3xhnbdvlyc22hxqdwhbbkh1z82q5-buildah-1.36.0/bin/.buildah-real" "$@"
export CONTAINERS_HELPER_BINARY_DIR="/gnu/store/ggmq3xhnbdvlyc22hxqdwhbbkh1z82q5-buildah-1.36.0/_guix"
/gnu/store/12mvay4cpsx4zgbksrwfh5nw857n674l-podman-5.1.1/bin
/gnu/store/12mvay4cpsx4zgbksrwfh5nw857n674l-podman-5.1.1/_guix
/gnu/store/4w1jppw9dv5ard2yi3dqlmscg0yfnarh-gpgme-1.18.0/lib/libgpgmepp.so
/gnu/store/4w1jppw9dv5ard2yi3dqlmscg0yfnarh-gpgme-1.18.0/lib/libgpgmepp.so.6
/gnu/store/4w1jppw9dv5ard2yi3dqlmscg0yfnarh-gpgme-1.18.0/lib/libgpgme.so
/gnu/store/4w1jppw9dv5ard2yi3dqlmscg0yfnarh-gpgme-1.18.0/lib/libgpgme.so.11
/gnu/store/55zmgnm171z03cx4y9iscvkkyf85phwr-libseccomp-2.5.4/lib/libseccomp.so
/gnu/store/55zmgnm171z03cx4y9iscvkkyf85phwr-libseccomp-2.5.4/lib/libseccomp.so.2
#!/gnu/store/5mzqf6fz9bz30ybgx7jrqw424qbg9rbk-bash-minimal-5.1.16/bin/bash
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libasan.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libasan.so.6
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libatomic.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libatomic.so.1
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libcc1.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libcc1.so.0
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libgcc_s.so.1
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libgomp.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libgomp.so.1
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libitm.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libitm.so.1
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/liblsan.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/liblsan.so.0
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libquadmath.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libquadmath.so.0
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libssp.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libssp.so.0
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libstdc++.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libstdc++.so.6
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libtsan.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libtsan.so.0
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libubsan.so
/gnu/store/6ncav55lbk5kqvwwflrzcr41hp5jbq0c-gcc-11.3.0-lib/lib/libubsan.so.1
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/ld-linux-x86-64.so.2
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libanl.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libanl.so.1
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libBrokenLocale.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libBrokenLocale.so.1
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libc_malloc_debug.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libc_malloc_debug.so.0
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libcrypt.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libcrypt.so.1
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libc.so.6
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libdl.so.2
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libmemusage.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libm.so.6
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libmvec.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libmvec.so.1
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libnsl.so.1
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libnss_compat.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libnss_compat.so.2
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libnss_db.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libnss_db.so.2
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libnss_dns.so.2
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libnss_files.so.2
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libnss_hesiod.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libnss_hesiod.so.2
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libpcprofile.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libpthread.so.0
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libresolv.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libresolv.so.2
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/librt.so.1
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libthread_db.so
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libthread_db.so.1
/gnu/store/ln6hxqjvz6m9gdd9s97pivlqck7hzs99-glibc-2.35/lib/libutil.so.1
/gnu/store/q36qjkk0vchk31q3jipmv1vbhj273yxn-libassuan-2.5.5/lib/libassuan.so
/gnu/store/q36qjkk0vchk31q3jipmv1vbhj273yxn-libassuan-2.5.5/lib/libassuan.so.0
/gnu/store/r2zwkcq2bqamhbz85i48l8rvrbvmyqp7-libgpg-error-1.45/lib/libgpg-error.so
/gnu/store/r2zwkcq2bqamhbz85i48l8rvrbvmyqp7-libgpg-error-1.45/lib/libgpg-error.so.0
--8<---------------cut here---------------end--------------->8---

The -trimpath is part of the go-build-system now.

--8<---------------cut here---------------start------------->8---
-trimpath
        remove all file system paths from the resulting executable.
        Instead of absolute file system paths, the recorded file names
        will begin either a module path@version (when using modules),
        or a plain import path (when using the standard library, or GOPATH).
--8<---------------cut here---------------end--------------->8---

--
Oleg


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#71923: [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix.

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 54 bytes --]


Pushed as 13ae21cd05..2dd43fdacc to master.

--
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]