From cf77f1497ff51ec10675200dbd373acc798c9233 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Sat, 31 May 2025 14:17:57 +0700
Subject: [PATCH] Revert some changes

---
 mk/podman.mk          |  2 +-
 mk/prefix.mk          | 16 ++++++++++------
 podman/rustinstall.sh |  2 --
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mk/podman.mk b/mk/podman.mk
index 7d249abd4..b36456f1f 100644
--- a/mk/podman.mk
+++ b/mk/podman.mk
@@ -31,7 +31,7 @@ else
 endif
 
 container_su: FORCE
-	podman run $(PODMAN_VOLUMES) --interactive --tty $(IMAGE_TAG) bash
+	podman exec --user=0 --latest --interactive --tty bash
 
 container_clean: FORCE
 	rm -f build/container.tag
diff --git a/mk/prefix.mk b/mk/prefix.mk
index 4019d669f..669430211 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -78,11 +78,6 @@ $(PREFIX)/libtool: $(PREFIX)/libtool.tar.gz
 	echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version
 	mv "$@.partial" "$@"
 
-$(PREFIX)/libtool.tar.gz:
-	mkdir -p "$(@D)"
-	wget -O $@.partial "https://gitlab.redox-os.org/redox-os/libtool/-/archive/v$(LIBTOOL_VERSION)-redox/libtool-v$(LIBTOOL_VERSION)-redox.tar.gz"
-	mv $@.partial $@
-
 $(PREFIX)/libtool-build: $(PREFIX)/libtool $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
@@ -129,7 +124,16 @@ $(PREFIX)/rust-install.tar.gz:
 $(PREFIX)/rust-install: $(PREFIX)/rust-install.tar.gz
 	rm -rf "$@.partial" "$@"
 	mkdir -p "$@.partial"
-	tar --extract --file "$<" --directory "$@.partial" --strip-components=1
+
+	git clone \
+		--recurse-submodules \
+		"https://gitlab.redox-os.org/redox-os/libtool/" \
+		--branch "v$(LIBTOOL_VERSION)-redox" \
+		--depth 2 \
+		"$@.partial"
+
+	# rootless podman problem
+	chmod -R u+w $@.partial
 	touch "$@.partial"
 	mv "$@.partial" "$@"
 
diff --git a/podman/rustinstall.sh b/podman/rustinstall.sh
index 49a26b4e8..b52f80171 100755
--- a/podman/rustinstall.sh
+++ b/podman/rustinstall.sh
@@ -4,8 +4,6 @@
 # in Podman after the image has been built
 
 curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
-echo "source $HOME/.cargo/env" >> $HOME/.bashrc
-source $HOME/.cargo/env
 
 cargo +stable install --force --version 0.1.1 cargo-config
 cargo +stable install --force --version 1.16.0 just