Skip to content

Commit

Permalink
fix binwalk - sasquatch installation
Browse files Browse the repository at this point in the history
  • Loading branch information
m-1-k-3 committed Apr 5, 2023
1 parent 9a78bb1 commit cf9cbab
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
8 changes: 4 additions & 4 deletions helpers/helpers_emba_dependency_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ dependency_check()
# patool extractor - https://wummel.github.io/patool/
check_dep_tool "patool"

# Freetz-NG
check_dep_file "Freetz-NG fwmod" "$EXT_DIR""/freetz-ng/fwmod"
# Freetz-NG - replaced by unblob
# check_dep_file "Freetz-NG fwmod" "$EXT_DIR""/freetz-ng/fwmod"

# AVM fitimg extraction script
check_dep_file "fitimg script" "$EXT_DIR""/fitimg-0.8/fitimg"
# AVM fitimg extraction script - replaced by unblob
# check_dep_file "fitimg script" "$EXT_DIR""/fitimg-0.8/fitimg"

# EnGenius decryptor - https://gist.github.com/ryancdotorg/914f3ad05bfe0c359b79716f067eaa99
check_dep_file "EnGenius decryptor" "$EXT_DIR""/engenius-decrypt.py"
Expand Down
8 changes: 5 additions & 3 deletions installer/IP99_binwalk_default.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ IP99_binwalk_default() {
fi

if ! [[ -d external/binwalk/sasquatch ]]; then
git clone https://github.com/EMBA-support-repos/sasquatch external/binwalk/sasquatch
# git clone https://github.com/EMBA-support-repos/sasquatch external/binwalk/sasquatch
git clone --quiet --depth 1 --branch "master" https://github.com/devttys0/sasquatch external/binwalk/sasquatch
fi
cd external/binwalk/sasquatch || ( echo "Could not install EMBA component sasquatch" && exit 1 )
# https://github.com/ReFirmLabs/binwalk/issues/618#issuecomment-1432373715
wget https://github.com/devttys0/sasquatch/pull/47.patch
patch -p1 < 47.patch
# wget https://github.com/devttys0/sasquatch/pull/47.patch
# patch -p1 < 47.patch
wget https://github.com/devttys0/sasquatch/pull/51.patch && patch -p1 <51.patch
CFLAGS="-fcommon -Wno-misleading-indentation" ./build.sh -y
cd "$HOME_PATH" || ( echo "Could not install EMBA component sasquatch" && exit 1 )

Expand Down

0 comments on commit cf9cbab

Please sign in to comment.