Skip to content

Commit

Permalink
replace hashdeep with rhash
Browse files Browse the repository at this point in the history
hashdeep was removed from the arch package repositories
  • Loading branch information
anuejn committed Apr 11, 2024
1 parent 2adee8d commit 244c729
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions makefiles/in_chroot/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ sed -i 's/#IgnorePkg =/IgnorePkg = linux linux-*/' /etc/pacman.conf
echo 'Server = http://de3.mirror.archlinuxarm.org/$arch/$repo' > /etc/pacman.d/mirrorlist
pacman-key --init
pacman-key --populate archlinuxarm
pacman --noprogressbar --noconfirm --needed -Syu
pacman --noprogressbar --noconfirm --needed --overwrite '*' -Syu
pacman --noprogressbar --noconfirm -R linux-zedboard || true

# install dependencies
pacman --noprogressbar --noconfirm --needed -S $(grep -vE "^\s*#" makefiles/in_chroot/requirements_pacman.txt | tr "\n" " ")
pacman --noprogressbar --noconfirm --needed --overwrite '*' -S $(grep -vE "^\s*#" makefiles/in_chroot/requirements_pacman.txt | tr "\n" " ")
pip install --break-system-packages wheel
pip install --break-system-packages --progress-bar off -r makefiles/in_chroot/requirements_pip.txt

Expand Down Expand Up @@ -197,6 +197,6 @@ rm -f $HASH_LOCATION/hashes.txt; rm -f $HASH_LOCATION/files.txt
find $VERIFY_DIRECTORIES -type f > $HASH_LOCATION/files.txt
# also hash file list
echo "$HASH_LOCATION/files.txt" >> $HASH_LOCATION/files.txt
hashdeep -c sha256 -f $HASH_LOCATION/files.txt > $HASH_LOCATION/hashes.txt
sudo rhash --sha256 --file-list $HASH_LOCATION/files.txt -o $HASH_LOCATION/hashes.txt

echo "axiom-update finished. Software version is now $(git describe --always --abbrev=8 --dirty)."
2 changes: 1 addition & 1 deletion makefiles/in_chroot/requirements_pacman.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ base-devel
git
figlet
wget
hashdeep
rhash
pacman-contrib
rsync

Expand Down
2 changes: 1 addition & 1 deletion software/scripts/axiom_file_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
HASH_LOCATION="/opt/integrity_check"

echo "Checking Axiom system files... (this might take a while)"
output=$(hashdeep -c sha256 -x -f $HASH_LOCATION/files.txt -k $HASH_LOCATION/hashes.txt)
output=$(sudo rhash -c --skip-ok --brief $HASH_LOCATION/hashes.txt)

if [ -z "$output" ]; then
echo "No problems detected, all files are in factory state."
Expand Down

0 comments on commit 244c729

Please sign in to comment.