GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/release/build-release: Update script 

- Add more help text.
- Remove braces from variables where the variable is isolated.
- Remove --recurse-submodules from clone.  This breaks on old coreboot
versions.
- Add some whitespace between blocks.
- Fix all shellcheck warnings.
- Verify tar version and fail if it doesn't support --sort.

Change-Id: I4a49df99532d9a92a4a05bceff16f96a4fc3e205
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/16883
Tested-by: build bot (Jenkins)
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@googlemail.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Martin Roth 2016-10-04 16:45:17 -06:00
parent 135eae91d5
commit dd78aa665a
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
util/release/build-release
View File

@ -3,10 +3,10 @@
# ${GPG_KEY_ID}: gpg key id (if not don't sign) # ${GPG_KEY_ID}: gpg key id (if not don't sign)
# ${USERNAME}: username (if not default to https) # ${USERNAME}: username (if not default to https)
# ${COMMIT_ID}: commit id (if not master) # ${COMMIT_ID}: commit id (if not master)
VERSION_NAME=${1} VERSION_NAME=$1
COMMIT_ID=${2} COMMIT_ID=$2
USERNAME=${3} USERNAME=$3
GPG_KEY_ID=${4} GPG_KEY_ID=$4
set -e set -e
@ -16,32 +16,50 @@ LANG=C
TZ=UTC TZ=UTC
export LC_ALL LANG TZ export LC_ALL LANG TZ
if [ -z "${VERSION_NAME}" ] || [ "${VERSION_NAME}" = "--help" ]; then if [ -z "$VERSION_NAME" ] || [ "$VERSION_NAME" = "--help" ]; then
echo "usage: $0 <version> [commit id] [gpg key id] [username]" echo "usage: $0 <version> [commit id] [gpg key id] [username]"
echo "tags a new coreboot version and creates a tar archive" echo "Tags a new coreboot version and creates a tar archive"
echo
echo "version: New version name to tag the tree with"
echo "commit id: check out this commit-id after cloning the coreboot tree"
echo "gpg key id: used to tag the version, and generate a gpg signature"
echo "username: clone the tree using ssh://USERNAME - defaults to https://"
exit 1 exit 1
fi fi
# Verify that tar supports --sort
if ! tar --sort=name -cf /dev/null /dev/null 2>/dev/null ; then
echo "Error: The installed version of tar does not support --sort"
echo " GNU tar version 1.28 or greater is required. Exiting."
exit 1
fi
if [ -n "${USERNAME}" ]; then if [ -n "${USERNAME}" ]; then
git clone --recurse-submodules ssh://${USERNAME}@review.coreboot.org:29418/coreboot.git coreboot-${VERSION_NAME} git clone "ssh://${USERNAME}@review.coreboot.org:29418/coreboot.git" "coreboot-${VERSION_NAME}"
else else
git clone --recurse-submodules https://review.coreboot.org/coreboot.git coreboot-${VERSION_NAME} git clone https://review.coreboot.org/coreboot.git "coreboot-${VERSION_NAME}"
fi fi
cd coreboot-${VERSION_NAME}
if [ -n "${COMMIT_ID}" ]; then cd "coreboot-${VERSION_NAME}" || exit 1
git reset --hard ${COMMIT_ID} if [ -n "$COMMIT_ID" ]; then
git reset --hard "$COMMIT_ID"
fi fi
git submodule update --init --checkout git submodule update --init --checkout
if [ -n "${GPG_KEY_ID}" ]; then if [ -n "$GPG_KEY_ID" ]; then
git tag -a -s -u ${GPG_KEY_ID} --force ${VERSION_NAME} -m "coreboot version ${VERSION_NAME}" git tag -a -s -u "$GPG_KEY_ID" --force "$VERSION_NAME" -m "coreboot version $VERSION_NAME"
else else
git tag -a --force ${VERSION_NAME} -m "coreboot version ${VERSION_NAME}" git tag -a --force "$VERSION_NAME" -m "coreboot version $VERSION_NAME"
fi fi
printf "${VERSION_NAME}-$(git log --pretty=%H|head -1)\n" > .coreboot-version
printf "%s-%s\n" "$VERSION_NAME" "$(git log --pretty=%H|head -1)" > .coreboot-version
tstamp=$(git log --pretty=format:%ci -1) tstamp=$(git log --pretty=format:%ci -1)
cd .. cd ..
tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude-vcs --exclude=coreboot-${VERSION_NAME}/3rdparty/blobs -cvf - coreboot-${VERSION_NAME} |xz -9 > coreboot-${VERSION_NAME}.tar.xz
tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude-vcs -cvf - coreboot-${VERSION_NAME}/3rdparty/blobs |xz -9 > coreboot-blobs-${VERSION_NAME}.tar.xz tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude-vcs --exclude="coreboot-${VERSION_NAME}/3rdparty/blobs" -cvf - "coreboot-${VERSION_NAME}" |xz -9 > "coreboot-${VERSION_NAME}.tar.xz"
tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude-vcs -cvf - "coreboot-${VERSION_NAME}/3rdparty/blobs" |xz -9 > "coreboot-blobs-${VERSION_NAME}.tar.xz"
if [ -n "${GPG_KEY_ID}" ]; then if [ -n "${GPG_KEY_ID}" ]; then
gpg2 --armor --local-user ${GPG_KEY_ID} --output coreboot-${VERSION_NAME}.tar.xz.sig --detach-sig coreboot-${VERSION_NAME}.tar.xz gpg2 --armor --local-user "$GPG_KEY_ID" --output "coreboot-${VERSION_NAME}.tar.xz.sig" --detach-sig "coreboot-${VERSION_NAME}.tar.xz"
gpg2 --armor --local-user ${GPG_KEY_ID} --output coreboot-blobs-${VERSION_NAME}.tar.xz.sig --detach-sig coreboot-blobs-${VERSION_NAME}.tar.xz gpg2 --armor --local-user "$GPG_KEY_ID" --output "coreboot-blobs-${VERSION_NAME}.tar.xz.sig" --detach-sig "coreboot-blobs-${VERSION_NAME}.tar.xz"
fi fi