mbox series

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

Message ID cover.1720024272.git.jean@foundation.xyz
Headers show
Series gnu: gvisor-tap-vsock, buildah, podman build fix. | expand

Message

Jean-Pierre De Jesus Diaz July 3, 2024, 4:34 p.m. UTC 
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

Comments

Sharlatan Hellseher July 3, 2024, 9:36 p.m. UTC | #1 
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
Sharlatan Hellseher July 3, 2024, 9:58 p.m. UTC | #2 
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
Sharlatan Hellseher July 3, 2024, 10 p.m. UTC | #3 
Pushed as 13ae21cd05..2dd43fdacc to master.

--
Oleg