From d4b8a32456b327c5f5c865fd618c470c85d5d695 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Sat, 31 May 2025 14:23:50 +0700
Subject: [PATCH] Revert some changes and remove osxfuse in podman deps

---
 mk/prefix.mk          | 24 ++++++++++++------------
 podman/rustinstall.sh |  1 -
 podman_bootstrap.sh   |  2 --
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index 669430211..3a3078e23 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -70,10 +70,19 @@ $(PREFIX)/relibc-install.tar.gz: $(PREFIX)/relibc-install
 		--directory="$<" \
 		.
 
-$(PREFIX)/libtool: $(PREFIX)/libtool.tar.gz
+$(PREFIX)/libtool:
 	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"
 	echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version
 	mv "$@.partial" "$@"
@@ -124,16 +133,7 @@ $(PREFIX)/rust-install.tar.gz:
 $(PREFIX)/rust-install: $(PREFIX)/rust-install.tar.gz
 	rm -rf "$@.partial" "$@"
 	mkdir -p "$@.partial"
-
-	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
+	tar --extract --file "$<" --directory "$@.partial" --strip-components=1
 	touch "$@.partial"
 	mv "$@.partial" "$@"
 
diff --git a/podman/rustinstall.sh b/podman/rustinstall.sh
index b52f80171..2fce22bdb 100755
--- a/podman/rustinstall.sh
+++ b/podman/rustinstall.sh
@@ -4,7 +4,6 @@
 # in Podman after the image has been built
 
 curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
-
 cargo +stable install --force --version 0.1.1 cargo-config
 cargo +stable install --force --version 1.16.0 just
 cargo +stable install --force --version 0.27.0 cbindgen
diff --git a/podman_bootstrap.sh b/podman_bootstrap.sh
index 6cccaebd7..3fab479ee 100755
--- a/podman_bootstrap.sh
+++ b/podman_bootstrap.sh
@@ -100,7 +100,6 @@ osx_macports()
     install_macports_pkg "git"
 	install_macports_pkg "gmake"
 	install_macports_pkg "curl"
-	install_macports_pkg "osxfuse"
 	install_macports_pkg "podman"
 	install_macports_pkg "gdb +multiarch"
 
@@ -130,7 +129,6 @@ osx_homebrew()
     install_brew_pkg "git"
 	install_brew_pkg "make"
 	install_brew_pkg "curl"
-	install_brew_pkg "osxfuse"
 	install_brew_pkg "fuse-overlayfs"
 	install_brew_pkg "slirp4netns"
 	install_brew_pkg "podman"