Skip to content

Commit b804b56

Browse files
committed
replace hashdeep with rhash
hashdeep was removed from the arch package repositories
1 parent fe199a5 commit b804b56

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

makefiles/in_chroot/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ sed -i 's/#IgnorePkg =/IgnorePkg = linux linux-*/' /etc/pacman.conf
1717
echo 'Server = http://de3.mirror.archlinuxarm.org/$arch/$repo' > /etc/pacman.d/mirrorlist
1818
pacman-key --init
1919
pacman-key --populate archlinuxarm
20-
pacman --noprogressbar --noconfirm --needed -Syu
20+
pacman --noprogressbar --noconfirm --needed --overwrite '*' -Syu
2121
pacman --noprogressbar --noconfirm -R linux-zedboard || true
2222

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

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

202202
echo "axiom-update finished. Software version is now $(git describe --always --abbrev=8 --dirty)."

makefiles/in_chroot/requirements_pacman.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ base-devel
99
git
1010
figlet
1111
wget
12-
hashdeep
12+
rhash
1313
pacman-contrib
1414
rsync
1515

software/scripts/axiom_file_check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
HASH_LOCATION="/opt/integrity_check"
33

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

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

0 commit comments

Comments
 (0)