From 465793c516c583030207220ad80f1bfcb387adc3 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sun, 15 Feb 2015 04:58:49 +0000
Subject: build-release: Move the release archives to release/

---
 .gitignore                                       |  1 +
 docs/git/index.html                              |  8 ++++++--
 resources/scripts/helpers/build/release/archives | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd00a39e..82cf2dbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
 /libreboot_x60.tar.xz
 /libreboot_util/
 /libreboot_src/
+/release/
 /resources/utilities/ich9deblob/factory.rom
 /resources/utilities/ich9deblob/deblobbed_descriptor.bin
 /resources/utilities/ich9deblob/libreboot.rom
diff --git a/docs/git/index.html b/docs/git/index.html
index 320f309f..de8c0467 100644
--- a/docs/git/index.html
+++ b/docs/git/index.html
@@ -677,12 +677,16 @@
 					<p>
 						The command that you used for generating the release archives will also run the following command:<br/>
 						$ <b>./build external source</b><br/>
-						The archive <b>tobuild.tar.xz</b> will have been created, containing bucts, flashrom and all other required
+						The archive <b>tobuild.tar.xz</b> will have been created under <b>release/</b>, containing bucts, flashrom and all other required
 						resources for building them.
 					</p>
 
 					<p>
-						You'll find that the files libreboot_util.tar.xz and libreboot_src.tar.xz have been created.
+						You'll find that the files libreboot_util.tar.xz and libreboot_src.tar.xz have been created, under <b>release/</b>.
+					</p>
+					
+					<p>
+						The ROM images will be stored in separate archives for each machine, under <b>release/rom/</b>.
 					</p>
 			
 			</div>
diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/archives
index 49a1d4dc..791db756 100755
--- a/resources/scripts/helpers/build/release/archives
+++ b/resources/scripts/helpers/build/release/archives
@@ -47,6 +47,11 @@ echo "Deleting old release archives"
 
 rm -f libreboot_*.tar.xz
 rm -f tobuild.tar.xz
+rm -rf release/
+
+# create directory for the release
+mkdir release/
+mkdir release/rom/
 
 # Get manifest which will be used to copy everything
 find -maxdepth 1 > releasefilelist
@@ -130,6 +135,9 @@ do
 	
 	# delete. no longer needed
 	rm -f "$board"/commitid
+	
+	# move the ROM images to the release/ directory
+	mv ../libreboot_"$board".tar.xz ../release/rom/
 done
 cd ../
 
@@ -370,6 +378,15 @@ tar -c libreboot_src | xz -9e >libreboot_src.tar.xz
 # create lzma compressed util archive
 tar -c libreboot_util | xz -9e >libreboot_util.tar.xz
 
+# Move the archives to the release directory
+mv libreboot_src.tar.xz release/
+mv libreboot_util.tar.xz release/
+
+# Create a symlink to the commitid file, in release/
+cd release/
+ln -s ../commitid commitid
+cd ../
+
 # ### Delete the uncompressed release directories
 # ----------------------------------------------------------------------------------------------------------------------------
 
@@ -380,6 +397,9 @@ rm -rf libreboot_util
 # For those utilities that have to be built on the target
 ./build external source
 
+# Move the archive to the release directory
+mv tobuild.tar.xz release/
+
 # DONE. See libreboot_src.tar.xz and libreboot_util.tar.xz
 # NOTE FOR FCHMMR: don't forget to add ARM binaries for flashrom
 # NOTE FOR FCHMMR: don't forget to add i386 binaries for flashrom/bucts
-- 
cgit v1.2.3-70-g09d2