diff options
author | Adin Scannell <ascannell@google.com> | 2019-09-05 16:37:06 -0700 |
---|---|---|
committer | Adin Scannell <ascannell@google.com> | 2019-09-06 14:28:12 -0700 |
commit | 1a0a940587e4db8923ca81b78d7bba395eb56ce1 (patch) | |
tree | fb5f88fa840aab58273a9fc4f9018bf8eae784dd /tools | |
parent | 98f7fbb59fc5aca00f47a8145ce1227550869cb8 (diff) |
Fix repository build scripts
This has the following fixes:
* Packages are passed to the tools/make_repository.sh command.
* All matching tags are built, for commits with multiple.
* The binary path is generated by the build command.
* Output from signing the repository is supressed.
* Allow a release author.
Change-Id: I2d08954ba76e35612f352be99d5bb99080f80892
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/make_repository.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/make_repository.sh b/tools/make_repository.sh index bf9c50d74..ccebe27b3 100755 --- a/tools/make_repository.sh +++ b/tools/make_repository.sh @@ -37,10 +37,10 @@ cleanup() { rm -f "${keyring}" } trap cleanup EXIT -gpg --no-default-keyring --keyring "${keyring}" --import "${private_key}" +gpg --no-default-keyring --keyring "${keyring}" --import "${private_key}" >&2 # Export the public key from the keyring. -gpg --no-default-keyring --keyring "${keyring}" --armor --export "${signer}" > "${tmpdir}"/keyFile +gpg --no-default-keyring --keyring "${keyring}" --armor --export "${signer}" > "${tmpdir}"/keyFile >&2 # Copy the packages, and ensure permissions are correct. cp -a "$@" "${tmpdir}" && chmod 0644 "${tmpdir}"/* @@ -52,7 +52,7 @@ find "${tmpdir}" -type l -exec rm -f {} \; # Sign all packages. for file in "${tmpdir}"/*.deb; do - dpkg-sig -g "--no-default-keyring --keyring ${keyring}" --sign builder "${file}" + dpkg-sig -g "--no-default-keyring --keyring ${keyring}" --sign builder "${file}" >&2 done # Build the package list. @@ -62,8 +62,8 @@ done (cd "${tmpdir}" && apt-ftparchive release . > Release) # Sign the release. -(cd "${tmpdir}" && gpg --no-default-keyring --keyring "${keyring}" --clearsign -o InRelease Release) -(cd "${tmpdir}" && gpg --no-default-keyring --keyring "${keyring}" -abs -o Release.gpg Release) +(cd "${tmpdir}" && gpg --no-default-keyring --keyring "${keyring}" --clearsign -o InRelease Release >&2) +(cd "${tmpdir}" && gpg --no-default-keyring --keyring "${keyring}" -abs -o Release.gpg Release >&2) # Show the results. echo "${tmpdir}" |