From 0e232a79091282b90782520f4a9ff81b3e8a145b Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 31 May 2025 14:23:50 +0700 Subject: [PATCH] Revert some changes and remove osxfuse in podman deps --- mk/prefix.mk | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index b207ecbd2..b6991dab9 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -70,7 +70,7 @@ $(PREFIX)/relibc-install.tar.gz: $(PREFIX)/relibc-install --directory="$<" \ . -$(PREFIX)/libtool: $(PREFIX)/libtool.tar.gz +$(PREFIX)/libtool: rm -rf "$@.partial" "$@" mkdir -p "$@.partial" @@ -82,6 +82,8 @@ $(PREFIX)/libtool: $(PREFIX)/libtool.tar.gz --depth 2 \ "$@.partial" + # rootless podman problem + chmod -R u+w $@.partial touch "$@.partial" echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version mv "$@.partial" "$@" @@ -134,16 +136,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" "$@"