adt-sbuild: Look at DEB_PACKAGE instead of PACKAGE.

diff --git a/debian/changelog b/debian/changelog
index d59ccf9925bb005b53a9440ef80d10384f2ee327..6a5d5a47ce84317ecc8c9fe1a2209e267bfbe935 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pgdg-buildenv (31) sid-pgdg; urgency=medium
+
+  * adt-sbuild: Look at DEB_PACKAGE instead of PACKAGE.
+
+ -- Christoph Berg <myon@debian.org>  Tue, 18 Aug 2020 15:33:10 +0200
+
 pgdg-buildenv (30) sid-pgdg; urgency=medium
 
   * adt-sbuild: Install plpython3 for postgresql-multicorn.

diff --git a/jenkins/adt-sbuild b/jenkins/adt-sbuild
index 9142cd4eb5d6d3ed8b4e55129cb23b2cbc9cb5b2..55420f91055b1099eb12035eb1416179e0502822 100755 (executable)
--- a/jenkins/adt-sbuild
+++ b/jenkins/adt-sbuild
@@ -8,7 +8,7 @@
 #  %SBUILD_BUILD_DIR %SBUILD_PKGBUILD_DIR
 #  DEB_ADT_SUMMARY (possibly unset)
 #  DEB_PG_SUPPORTED_VERSIONS (required)
-#  PACKAGE (required)
+#  DEB_PACKAGE (required)
 # Output:
 #  xml test results (or dummy result) in DEB_ADT_SUMMARY
 # Requirements:
@@ -35,7 +35,7 @@ if [ ! -f debian/files ]; then
        exit 1
 fi
 
-case $PACKAGE in
+case $DEB_PACKAGE in
   postgresql-multicorn) sudo apt-get install -y postgresql-plpython3-$DEB_PG_SUPPORTED_VERSIONS ;;
 esac
 

diff --git a/jenkins/sbuild-package b/jenkins/sbuild-package
index f1981719931a8845093938b92e6ded700ebc2e38..3cb7a98d516700871bbc93336e13cf8eb9c3b3d5 100755 (executable)
--- a/jenkins/sbuild-package
+++ b/jenkins/sbuild-package
@@ -90,7 +90,8 @@ export DEB_BUILD_OPTIONS="parallel=1${DEB_BUILD_OPTIONS:+ $DEB_BUILD_OPTIONS}"
 
 # set DEB_PG_SUPPORTED_VERSIONS
 : ${DEB_PG_SUPPORTED_VERSIONS:=pgdg}
-export DEB_PG_SUPPORTED_VERSIONS PACKAGE # needed by adt-sbuild
+: ${DEB_PACKAGE:=$PACKAGE}
+export DEB_PG_SUPPORTED_VERSIONS DEB_PACKAGE # needed by adt-sbuild
 
 if [ "$DEB_PG_SUPPORTED_VERSIONS" != "pgdg" ]; then
   # extra build dependencies