From fd9986da0b30e0ce025ebfea6abb5df06eba3ec3 Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Fri, 1 Dec 2023 17:18:12 +0100
Subject: [PATCH] Move releases from releases/<git describe> to releases.

This can simplify the overal structure of GNU Boot as we don't need to
compute some git tag everytime in the code.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
---
 resources/packages/roms/release | 16 +++++++---------
 resources/packages/src/release  |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/resources/packages/roms/release b/resources/packages/roms/release
index 2308013..4e919d7 100755
--- a/resources/packages/roms/release
+++ b/resources/packages/roms/release
@@ -42,12 +42,10 @@ fi
 
 [ ! -d "release/" ] && \
     mkdir -p release/
-[ ! -d "release/${version}/" ] && \
-    mkdir -p "release/${version}/"
-[ -d "release/${version}/roms/" ] && \
-    rm -Rf "release/${version}/roms/"
-[ ! -d "release/${version}/roms/" ] && \
-    mkdir -p "release/${version}/roms/"
+[ -d "release/roms/" ] && \
+    rm -Rf "release/roms/"
+[ ! -d "release/roms/" ] && \
+    mkdir -p "release/roms/"
 
 printf "Building ROM image archives for version %s\n" "${version}"
 
@@ -58,13 +56,13 @@ printf "Building ROM image archives for version %s\n" "${version}"
             continue
         fi
 
-        printf "Generating release/%s/roms/%s-%s_%s.tar.xz\n" "${version}" "${projectname}" "${version}" "${target##*/}"
+        printf "Generating release/roms/%s-%s_%s.tar.xz\n" "${projectname}" "${version}" "${target##*/}"
 	printf "%s\n" "${version}" > "${target}/version"
 	printf "%s\n" "${versiondate}" > "${target}/versiondate"
 	printf "%s\n" "${projectname}" > "${target}/projectname"
-        tar -c "${target}/" | xz -9e >"../release/${version}/roms/${projectname}-${version}_${target##*/}.tar.xz"
+        tar -c "${target}/" | xz -9e >"../release/roms/${projectname}-${version}_${target##*/}.tar.xz"
     done
 )
 
-printf "\nROM image release archives available at release/%s/roms/\n\n" "${version}"
+printf "\nROM image release archives available at release/roms/\n\n"
 
diff --git a/resources/packages/src/release b/resources/packages/src/release
index ed0eb20..7a8168b 100755
--- a/resources/packages/src/release
+++ b/resources/packages/src/release
@@ -36,7 +36,7 @@ if [ -f versiondate ]; then
 	versiondate="$(cat versiondate)"
 fi
 
-reldir="release/${version}"
+reldir="release/"
 dirname="${projectname}-${version}_src"
 srcdir="${reldir}/${dirname}"