diff options
| -rw-r--r-- | Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -172,20 +172,16 @@ endif package-pacman-podman: @echo "=== Building Arch package for $(arch) ===" - podman run --rm -v $(CURDIR):/src:Z -w /src $(arch_image) bash -c '\ - pacman -Syu --noconfirm make clang lld curl tar gzip gettext gtk4 libadwaita gtksourceview5 fakeroot rsync && \ - curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ - source $$HOME/.cargo/env && \ - useradd -m builder && \ - chown -R builder:builder /src && \ - su builder -c "cd /src && make -e profile=$(profile) -e channel=$(channel) -e target=$(target) package-pacman"' + podman run --rm --userns=keep-id -v $(CURDIR):/src:Z -w /src $(arch_image) bash -c '\ + pacman -Syu --noconfirm make clang lld curl tar gzip gettext gtk4 libadwaita gtksourceview5 fakeroot rsync rust && \ + make -e profile=$(profile) -e channel=$(channel) -e target=$(target) package-pacman' package-rpm-podman: ifndef distro $(error distro is required, e.g., make package-rpm-podman distro=fedora43) endif @echo "=== Building RPM for $(distro) ($(arch)) ===" - podman run --rm -v $(CURDIR):/src:Z -w /src $(fedora_image_$(distro)) bash -c '\ + podman run --rm --userns=keep-id -v $(CURDIR):/src:Z -w /src $(fedora_image_$(distro)) bash -c '\ dnf install -y make clang lld curl tar gzip gettext gtk4-devel libadwaita-devel gtksourceview5-devel pkg-config && \ curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ source $$HOME/.cargo/env && \ @@ -198,7 +194,7 @@ ifndef distro $(error distro is required, e.g., make package-deb-podman distro=bookworm) endif @echo "=== Building DEB for $(distro) ($(arch)) ===" - podman run --rm -v $(CURDIR):/src:Z -w /src $(debian_image_$(distro)) bash -c '\ + podman run --rm --userns=keep-id -v $(CURDIR):/src:Z -w /src $(debian_image_$(distro)) bash -c '\ apt-get update && \ apt-get install -y make clang lld curl tar gzip gettext libgtk-4-dev libadwaita-1-dev libgtksourceview-5-dev pkg-config && \ curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ |