From 1c93c89f3844ab7a774cb3fc0fbc7b517d7ae16c 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 | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 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 8cc1050be..b207ecbd2 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -134,7 +134,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" "$@"