build/release/*: version in file names no longer optional

(also, rename archives to util)

5 files changed, 4 insertions, 20 deletions

diff --git a/resources/scripts/helpers/build/release/crossgcc b/resources/scripts/helpers/build/release/crossgcc
index 80defb5e..d76947b8 100755
--- a/resources/scripts/helpers/build/release/crossgcc
+++ b/resources/scripts/helpers/build/release/crossgcc
@@ -26,11 +26,7 @@ set -u -e
 printf 'Building the coreboot crossgcc archives\n'
 
 version="$(git describe --tags HEAD)"
-if [ "x${VERSION_IN_FILENAMES+set}" = 'xset' ]; then
-	distdir="crossgcc_${version}"
-else
-	distdir='crossgcc'
-fi
+distdir="crossgcc_${version}"
 
 printf 'Deleting old coreboot crossgcc archives\n'
 rm -Rf "release/${distdir}/"
diff --git a/resources/scripts/helpers/build/release/docs b/resources/scripts/helpers/build/release/docs
index 93aa4a2e..a1f7b963 100755
--- a/resources/scripts/helpers/build/release/docs
+++ b/resources/scripts/helpers/build/release/docs
@@ -26,11 +26,7 @@ set -u -e
 printf 'Building the documentation release archive\n'
 
 version="$(git describe --tags HEAD)"
-if [ "x${VERSION_IN_FILENAMES+set}" = 'xset' ]; then
-	distdir="libreboot_${version}_docs"
-else
-	distdir='libreboot_docs'
-fi
+distdir="libreboot_${version}_docs"
 
 [ -d release/ ] || mkdir release/
 
diff --git a/resources/scripts/helpers/build/release/roms b/resources/scripts/helpers/build/release/roms
index 13629b73..eb58a51e 100755
--- a/resources/scripts/helpers/build/release/roms
+++ b/resources/scripts/helpers/build/release/roms
@@ -29,11 +29,7 @@ if [ ! -d bin/ ]; then
 fi
 
 version="$(git describe --tags HEAD)"
-if [ "x${VERSION_IN_FILENAMES+set}" = 'xset' ]; then
-	distname="libreboot_${version}"
-else
-	distname='libreboot'
-fi
+distname="libreboot_${version}"
 
 [ -d release/rom/ ] || mkdir -p release/rom/
 
diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src
index 29c0ee02..4663c1b7 100755
--- a/resources/scripts/helpers/build/release/src
+++ b/resources/scripts/helpers/build/release/src
@@ -26,11 +26,7 @@ set -u -e
 printf 'Building the source release archive\n'
 
 version="$(git describe --tags HEAD)"
-if [ "x${VERSION_IN_FILENAMES+set}" = 'xset' ]; then
-	distdir="libreboot_${version}_src"
-else
-	distdir='libreboot_src'
-fi
+distdir="libreboot_${version}_src"
 
 printf 'Deleting old source release archives\n'
 rm -f "release/${distdir}.tar.xz"
diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/util
index 1795df02..1795df02 100755
--- a/resources/scripts/helpers/build/release/archives
+++ b/resources/scripts/helpers/build/release/util