From 9dd481861e74c7b328a39853c919a619c292aa60 Mon Sep 17 00:00:00 2001 From: fig02 Date: Sun, 5 Apr 2020 15:18:43 -0400 Subject: [PATCH 1/2] fix make setup --- fixbaserom.py | 4 ++-- makefile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fixbaserom.py b/fixbaserom.py index 3cc67be0a8..df84332bae 100644 --- a/fixbaserom.py +++ b/fixbaserom.py @@ -48,10 +48,10 @@ print("Patching header...") strippedContent[0x3E] = 0x50 # Check to see if the ROM is a "vanilla" Debug ROM -md5Hash = hashlib.md5(bytearray(strippedContent)).hexdigest() +md5Hash = hashlib.md5(bytes(strippedContent)).hexdigest() if (str(md5Hash) != "f0b7f35375f9cc8ca1b2d59d78e35405"): - print("Error: Expected a hash of f0b7f35375f9cc8ca1b2d59d78e35405 but got " + str(md5Hash) + ". The baserom is probably not \"vanilla\"") + print("Error: Expected a hash of f0b7f35375f9cc8ca1b2d59d78e35405 but got " + str(md5Hash) + ". The baserom has probably been tampered, find a new one") sys.exit(1) # Write out our new ROM diff --git a/makefile b/makefile index 2272230b53..9b663e20b8 100644 --- a/makefile +++ b/makefile @@ -130,6 +130,7 @@ clean: $(RM) $(ROM) $(ELF) -r build setup: + git submodule update --init --recursive make -C tools python3 fixbaserom.py python3 extract_baserom.py From 147bbe0a4163c798ed8580558f2116c29acff92c Mon Sep 17 00:00:00 2001 From: fig02 Date: Sun, 5 Apr 2020 17:55:49 -0400 Subject: [PATCH 2/2] remove zap2 step from jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f07d196083..a0e36fd423 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,6 @@ pipeline { steps { echo 'Setting up...' sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom_original.z64' - sh 'git submodule update --init --recursive' sh 'cp -r /usr/local/etc/ido/ido7.1_compiler tools/ido7.1_compiler' sh 'chmod +x -R tools/ido*' sh 'make -j`nproc` setup'