Skip to content
Snippets Groups Projects
Verified Commit 98b6b773 authored by Karel Koci's avatar Karel Koci :metal:
Browse files

Merge branch 'hotfix/new_release-authoritative-hash' into v4.1

parents ffb2a32c 525b5a98
Branches
Tags
1 merge request!123Turris OS 5.0 (HBK)
......@@ -6,6 +6,16 @@
* webapps: switch to https if possible
* mox: i2c-1 on GPIO pinheader is now enabled
4.0.3
-----
* Merry Christmas!
🔔🔔🔔
* kernel: updated to version 4.14.158
* foris-controller-subordinates-module: limit custom name length
* tvheadend: ensure the first setup works
* libvpx: fix CVE-2019-9232, CVE-2019-9325, CVE-2019-9371, CVE-2019-9433
4.0.2
-----
......
......@@ -95,9 +95,9 @@ tb_hash() {
for board in "${BOARDS[@]}"; do
l_hash="$(cat "$GIT_HASH_LISTS-$board")"
b_hash="$(git_hash "$board" "turris-build")"
[ -n "$p_hash" ] || p_hash="$l_hash" # First board is considered primary and lists are authoritative
[ "$p_hash" = "$l_hash" ] || {
error "Turris build used to generate lists is not same as for ${BOARDS[0]} board: $board ($l_hash / $p_hash)"
[ -n "$p_hash" ] || p_hash="$b_hash" # First board is considered primary and packages are authoritative
[ "$p_hash" = "$b_hash" ] || {
error "Turris build used to generate packages is not same as for ${BOARDS[0]} board: $board ($b_hash / $p_hash)"
ec=1
}
[ "$b_hash" = "$l_hash" ] || {
......@@ -105,7 +105,7 @@ tb_hash() {
ec=1
}
done
echo "$l_hash"
echo "$p_hash"
return $ec
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment