From 2a1e40fb992cf5fa297235db1eb1427ec3971b47 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Mon, 16 Feb 2015 00:33:56 +0000 Subject: 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 --- resources/scripts/helpers/build/release/archives | 47 +++++++++++++----------- 1 file changed, 25 insertions(+), 22 deletions(-) (limited to 'resources/scripts/helpers') diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/archives index b3c90dd2..64354c41 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 -- cgit v1.2.3-70-g09d2