diff --git a/.gitmodules b/.gitmodules index f48dbf6f..f4e226fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "tools/bk_tools"] - path = tools/bk_tools - url = https://github.com/MittenzHugg/bk_tools.git [submodule "tools/asm-differ"] path = tools/asm-differ url = https://github.com/simonlindholm/asm-differ.git diff --git a/Dockerfile b/Dockerfile index 943029d7..797a089c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,8 @@ ENV DEBIAN_FRONTEND=noninteractive COPY packages.txt / RUN apt-get update && apt-get install -y $(cat packages.txt) +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + COPY requirements.txt / RUN python3 -m pip install -r requirements.txt diff --git a/Makefile b/Makefile index 5f451229..7781de77 100644 --- a/Makefile +++ b/Makefile @@ -185,11 +185,6 @@ $(addprefix progress-,$(OVERLAYS)) : progress-% : progress/progress.%.csv @$(PROGRESS_READ) $< $(VERSION) $* # Verify that the roms match, also sets up diff_settings -verify-decompressed: $(DECOMPRESSED_BASEROM) $(Z64) - @$(DIFF) $(DECOMPRESSED_BASEROM) $(Z64) > /dev/null && \ - $(PRINT) "$(YELLOW) _\n _( )_\n [ ]_\n ) _ _)\n [_( )_]\n$(BLUE)$(BASENAME).$(VERSION).uncompressed.z64$(NO_COL): $(GREEN)OK$(NO_COL)\n" || \ - $(PRINT) "$(BLUE)$(BASEROM) $(RED)differs$(NO_COL)\n" - verify: $(BASEROM) $(FINAL_Z64) @$(DIFF) $(BASEROM) $(FINAL_Z64) > /dev/null && \ $(PRINT) "$(YELLOW) _\n _( )_\n [ ]_\n ) _ _)\n [_( )_]\n$(BLUE)$(BASENAME).$(VERSION).z64$(NO_COL): $(GREEN)OK$(NO_COL)\n" || \ @@ -433,7 +428,7 @@ MAKEFLAGS += -r .SUFFIXES: # Phony targets -.PHONY: all clean verify verify-decompressed $(OVERLAYS) progress $(addprefix progress-,$(OVERLAYS)) +.PHONY: all clean verify $(OVERLAYS) progress $(addprefix progress-,$(OVERLAYS)) # Set up pipefail SHELL = /bin/bash -e -o pipefail diff --git a/README.md b/README.md index 36b87c20..b409adb5 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,8 @@ Ubuntu 18.04 or higher. ```sh sudo apt-get update && sudo apt-get install -y $(cat packages.txt) +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + python3 -m pip install -r requirements.txt ``` diff --git a/packages.txt b/packages.txt index c298e896..cd64f4fb 100644 --- a/packages.txt +++ b/packages.txt @@ -3,6 +3,7 @@ build-essential cmake gcc-mips-linux-gnu less +curl libglib2.0-0 libssl-dev python3 diff --git a/tools/bk_tools b/tools/bk_tools deleted file mode 160000 index 5a880b49..00000000 --- a/tools/bk_tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5a880b4978b9c8c7954ef0dc5d3faeeca754229b