From 1ea327ace334954011235e0b60fe00f751cd05de Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 24 Jan 2026 17:45:28 +0100 Subject: [PATCH] podman: podman-remote, podmansh, libsqlite3 and make cross same as native --- srcpkgs/podman/template | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index f671718e77c..bf08cce099a 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,15 +1,15 @@ # Template file for 'podman' pkgname=podman version=5.7.1 -revision=1 +revision=2 _container_libs_common=0.66.1 build_style=go build_wrksrc=podman-${version} go_import_path="github.com/containers/podman/v5" go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport" -go_build_tags="seccomp apparmor containers_image_ostree_stub cni" +go_build_tags="seccomp apparmor containers_image_ostree_stub cni libsqlite3" hostmakedepends="pkg-config go-md2man python3 mdocml" -makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel" +makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel sqlite-devel" depends="runc conmon cni-plugins slirp4netns fuse-overlayfs containers-common containers.image containers.storage netavark passt" checkdepends="qemu" @@ -23,16 +23,17 @@ distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz checksum="c04c12f90d1bf410ccc4d27a30cff188d6a9361bddb5fceb19659ae08257cc6f d008a3cc50d6f68fe84f139081c811384223665c273a520bee174f5b9f2f48af" -if [ "$CROSS_BUILD" ]; then - go_build_tags+=" containers_image_openpgp" -fi - case $XBPS_TARGET_MACHINE in aarch64* | x86_64*) ;; *) make_check="no" ;; # Upstream only supports tests on aarch64 and x86_64 esac post_build() { + # Manually building podman-remote since we don't have per go_package go_build_tags. + # Using `go build` instead of install since -o doesn't work with that. + go build -p "$XBPS_MAKEJOBS" -mod=vendor -modcacherw -v \ + -tags "remote ${go_build_tags}" \ + -o podman-remote "${go_import_path}/cmd/podman" make docs } @@ -54,4 +55,6 @@ post_install() { vinstall containers.cgfs.conf 644 usr/share/containers containers.conf vsv podman vsv podman-docker + vbin podman-remote + ln -sf podman ${DESTDIR}/usr/bin/podmansh }