1 files changed, 23 insertions, 13 deletions
diff --git a/tools/make_repository.sh b/tools/make_repository.sh
index bf9c50d74..071f72b74 100755
--- a/tools/make_repository.sh
+++ b/tools/make_repository.sh
@@ -16,13 +16,14 @@
 
 # Parse arguments. We require more than two arguments, which are the private
 # keyring, the e-mail associated with the signer, and the list of packages.
-if [ "$#" -le 2 ]; then
-  echo "usage: $0 <private-key> <signer-email> <packages...>"
+if [ "$#" -le 3 ]; then
+  echo "usage: $0 <private-key> <signer-email> <component> <packages...>"
   exit 1
 fi
 declare -r private_key=$(readlink -e "$1")
 declare -r signer="$2"
-shift; shift
+declare -r component="$3"
+shift; shift; shift
 
 # Verbose from this point.
 set -xeo pipefail
@@ -37,13 +38,20 @@ cleanup() {
   rm -f "${keyring}"
 }
 trap cleanup EXIT
-gpg --no-default-keyring --keyring "${keyring}" --import "${private_key}"
-
-# Export the public key from the keyring.
-gpg --no-default-keyring --keyring "${keyring}" --armor --export "${signer}" > "${tmpdir}"/keyFile
+gpg --no-default-keyring --keyring "${keyring}" --import "${private_key}" >&2
 
 # Copy the packages, and ensure permissions are correct.
-cp -a "$@" "${tmpdir}" && chmod 0644 "${tmpdir}"/*
+for pkg in "$@"; do
+  name=$(basename "${pkg}" .deb)
+  name=$(basename "${name}" .changes)
+  arch=${name##*_}
+  if [[ "${name}" == "${arch}" ]]; then
+    continue # Not a regular package.
+  fi
+  mkdir -p "${tmpdir}"/"${component}"/binary-"${arch}"
+  cp -a "${pkg}" "${tmpdir}"/"${component}"/binary-"${arch}"
+done
+find "${tmpdir}" -type f -exec chmod 0644 {} \;
 
 # Ensure there are no symlinks hanging around; these may be remnants of the
 # build process. They may be useful for other things, but we are going to build
@@ -51,19 +59,21 @@ cp -a "$@" "${tmpdir}" && chmod 0644 "${tmpdir}"/*
 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}"
+for file in "${tmpdir}"/"${component}"/binary-*/*.deb; do
+  dpkg-sig -g "--no-default-keyring --keyring ${keyring}" --sign builder "${file}" >&2
 done
 
 # Build the package list.
-(cd "${tmpdir}" && apt-ftparchive packages . | gzip > Packages.gz)
+for dir in "${tmpdir}"/"${component}"/binary-*; do
+  (cd "${dir}" && apt-ftparchive packages . | gzip > Packages.gz)
+done
 
 # Build the release list.
 (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}"