From c980356561ffd6ea55c4dca812f429c1f38479b8 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Wed, 9 Jun 2021 10:25:26 -0400
Subject: [PATCH] packaging: Deploy the Ubuntu debug symbol packages.
* scripts/build-package-debian.sh: Revert glob pattern to *deb and add comment.
* scripts/deploy-packages.sh (package_deb): Rename .ddeb to .deb.
Change-Id: I46bd9855bec451102a5ef5046f9ac52b161559c5
---
scripts/build-package-debian.sh | 2 +-
scripts/deploy-packages.sh | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/scripts/build-package-debian.sh b/scripts/build-package-debian.sh
index fc99a94e..bfb7a51c 100755
--- a/scripts/build-package-debian.sh
+++ b/scripts/build-package-debian.sh
@@ -119,5 +119,5 @@ ln -s packaging/rules/debian .
dpkg-buildpackage -b -uc -us ${DPKG_BUILD_OPTIONS}
# Move the artifacts to the output.
-mv ../*.deb /opt/output
+mv ../*deb /opt/output # .deb and .ddeb packages
chown -R ${CURRENT_UID}:${CURRENT_UID} /opt/output
diff --git a/scripts/deploy-packages.sh b/scripts/deploy-packages.sh
index a713671a..ca3e413d 100755
--- a/scripts/deploy-packages.sh
+++ b/scripts/deploy-packages.sh
@@ -68,14 +68,17 @@ EOF
####################################
## Add packages to the repository ##
####################################
- packages="packages/${DISTRIBUTION}*/*.deb"
-
- for package in ${packages}; do
- # Sign the deb
+ # Note: reprepro currently only accepts .deb files as input, but
+ # Ubuntu generates their debug symbol packages as .ddeb (see:
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730572). As
+ # these are just regular Debian packages, simply append the .deb
+ # extension to their file name to work around this.
+ find ./packages -type f -name '*.ddeb' -print0 | xargs -0 -I{} mv {} {}.deb
+
+ for package in packages/${DISTRIBUTION}*/*.deb; do
echo "## signing: ${package} ##"
dpkg-sig -k ${KEYID} --sign builder ${package}
- # Include the deb
echo "## including ${package} ##"
package_name=$(dpkg -I ${package} | grep -m 1 Package: | awk '{print $2}')
package_arch=$(dpkg -I ${package} | grep -m 1 Architecture: | awk '{print $2}')
--
GitLab