summaryrefslogtreecommitdiffstats
path: root/resources/scripts
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-02-15 19:33:56 (EST)
committer Francis Rowe <info@gluglug.org.uk>2015-02-15 19:33:56 (EST)
commit2a1e40fb992cf5fa297235db1eb1427ec3971b47 (patch)
tree7524588391a5edf3e664b602bb6eb634ce975b1d /resources/scripts
parent4ea4aad327afc409043e7232a33c3bbb3aa260a4 (diff)
downloadlibreboot-2a1e40fb992cf5fa297235db1eb1427ec3971b47.zip
libreboot-2a1e40fb992cf5fa297235db1eb1427ec3971b47.tar.gz
libreboot-2a1e40fb992cf5fa297235db1eb1427ec3971b47.tar.bz2
build/release/archives: create _docs after _src, not before
This fixes a bug where libreboot_docs.tar.xz was being distributed inside libreboot_src.tar.xz
Diffstat (limited to 'resources/scripts')
-rwxr-xr-xresources/scripts/helpers/build/release/archives47
1 files changed, 25 insertions, 22 deletions
diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/archives
index b3c90dd..64354c4 100755
--- a/resources/scripts/helpers/build/release/archives
+++ b/resources/scripts/helpers/build/release/archives
@@ -55,31 +55,9 @@ 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
-# ### Prepare libreboot_docs archive ready for release
-# ----------------------------------------------------------------------------------------------------------------------------
-
-cd release/
-
-mkdir libreboot_docs/
-
-cp -r ../docs/ libreboot_docs/
-cat ../commitid > libreboot_docs/commitid
-
-# create lzma compressed docs archive
-tar -c libreboot_docs | xz -9e >libreboot_docs.tar.xz
-
-# the directory is no longer needed
-rm -rf libreboot_docs/
-
-cd ../
-
# ### Prepare libreboot_src archive ready for release
# ----------------------------------------------------------------------------------------------------------------------------
@@ -100,6 +78,31 @@ cd libreboot_src/
# back to main checkout directory
cd ../
+# ### Create the release/ directory where the archives will go
+# ----------------------------------------------------------------------------------------------------------------------------
+
+# create directory for the release
+mkdir release/
+mkdir release/rom/
+
+# ### Prepare libreboot_docs archive ready for release
+# ----------------------------------------------------------------------------------------------------------------------------
+
+cd release/
+
+mkdir libreboot_docs/
+
+cp -r ../docs/ libreboot_docs/
+cat ../commitid > libreboot_docs/commitid
+
+# create lzma compressed docs archive
+tar -c libreboot_docs | xz -9e >libreboot_docs.tar.xz
+
+# the directory is no longer needed
+rm -rf libreboot_docs/
+
+cd ../
+
# ### Further work in libreboot_src: delete *.git and *.svn
# ### To save space since they are not useful in the release archives
# ### Changes to these projects should be submitted upstream