summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2019-11-19 17:12:05 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-22 21:47:40 +0000
commit85678b8419b71eddf93aaa1579099a871ac80bbb (patch)
tree5ef0688b6ee756dbc97ef8c78e1e00a485757f1f
parent54cabb977d2729d766e6751c61073ab1adb4c2f8 (diff)
downloadcoreboot-85678b8419b71eddf93aaa1579099a871ac80bbb.tar.xz
util/release: Refactor blobs list
We had two _very_ long lines containing arguments that enumerate the paths where blobs are stored: Now there's a variable containing them. Change-Id: I501b27158d00ba00d1c9b9e2f00a17a8b9c3f682 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36955 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rwxr-xr-xutil/release/build-release12
1 files changed, 10 insertions, 2 deletions
diff --git a/util/release/build-release b/util/release/build-release
index 464388b198..0d90d162e3 100755
--- a/util/release/build-release
+++ b/util/release/build-release
@@ -67,8 +67,16 @@ printf "%s-%s\n" "$VERSION_NAME" "$(git log --pretty=%H|head -1)" > .coreboot-v
tstamp=$(git log --pretty=format:%ci -1)
cd ..
-tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude=*/.git --exclude=*/.gitignore --exclude="coreboot-${VERSION_NAME}/3rdparty/blobs" --exclude="coreboot-${VERSION_NAME}/3rdparty/fsp" --exclude="coreboot-${VERSION_NAME}/3rdparty/intel-microcode" -cvf - "coreboot-${VERSION_NAME}" |xz -9 > "coreboot-${VERSION_NAME}.tar.xz"
-tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude=*/.git --exclude=*/.gitignore -cvf - "coreboot-${VERSION_NAME}/3rdparty/blobs" "coreboot-${VERSION_NAME}/3rdparty/fsp" "coreboot-${VERSION_NAME}/3rdparty/intel-microcode" |xz -9 > "coreboot-blobs-${VERSION_NAME}.tar.xz"
+exclude_paths="3rdparty/blobs "
+exclude_paths+="3rdparty/fsp "
+exclude_paths+="3rdparty/intel-microcode "
+for i in ${exclude_paths}; do
+ blobs_paths+="coreboot-${VERSION_NAME}/${i} "
+ exclude_opts+="--exclude=coreboot-${VERSION_NAME}/${i} "
+done
+
+tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude=*/.git --exclude=*/.gitignore ${exclude_opts} -cvf - "coreboot-${VERSION_NAME}" |xz -9 > "coreboot-${VERSION_NAME}.tar.xz"
+tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude=*/.git --exclude=*/.gitignore -cvf - ${blobs_paths} |xz -9 > "coreboot-blobs-${VERSION_NAME}.tar.xz"
if [ -n "${GPG_KEY_ID}" ]; then
gpg --armor --local-user "$GPG_KEY_ID" --output "coreboot-${VERSION_NAME}.tar.xz.sig" --detach-sig "coreboot-${VERSION_NAME}.tar.xz"