[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian rebuilder 'thing': add hackish fix for a yet to be filed...

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
b89d482f by Holger Levsen at 2020-05-01T01:14:02+02:00
reproducible Debian rebuilder 'thing': add hackish fix for a yet to be filed bug against debrebuild in devscripts...

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
af874937 by Holger Levsen at 2020-05-01T01:16:06+02:00
reproducible Debian rebuilder 'thing': download the source early to fail early if it's not available

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/rb-debrebuild
- bin/reproducible_debian_rebuilder_prototype.sh


Changes:

=====================================
bin/rb-debrebuild
=====================================
@@ -525,3 +525,5 @@ if ($build_archall) {
 }
 print " -d $base_dist";
 print " $dsc_fname\n";
+
+print "\nBASE_DIST=$base_dist\n";


=====================================
bin/reproducible_debian_rebuilder_prototype.sh
=====================================
@@ -80,6 +80,12 @@ cat $FILE
 # a successful build might overwrite the original .buildinfo file...
 cp $FILE $FILE.orig
 
+# download the source early to fail early if it's not available...
+# I guess I think it would be nice if debrebuild would also do this:
+# FIXME: file another wishlist bug?
+output_echo "fetching source package $PKG"
+dget https://deb.debian.org/debian/pool/main/$POOLPATH/$PKG/${PKG}_$VERSION.dsc
+
 # prepare rebuild command
 DEBREBUILD=$(mktemp -t debrebuild.XXXXXXXX)
 output_echo "trying to debrebuild $PKG"
@@ -88,20 +94,15 @@ output_echo "trying to debrebuild $PKG"
 
 # FIXME: file a bug like '#955123 debrebuild: please provide --sbuild-output-only option' but with --output-only-base-release
 # (parsing the debrebuild output to gather this information is way to fragile)
-DISTRO=bullseye # NOPE
+DISTRO=$(tail -1 $DEBREBUILD | grep '^BASE_DIST=' | cut -d '=' -f2)
 output_echo "preparing chroot for $DISTRO"
-# "|| true" is dummy code for regenerating this chroot every other week or so
+# FIXME: "|| true" is dummy code for regenerating this chroot every other week or so
 sudo sbuild-createchroot $DISTRO /schroots/debrebuild-$DISTRO-amd64 http://deb.debian.org/debian || true
 
 # I'm a bit surprised this was needed, as debrebuild has code for this...
 # FIXME: a bug should probably be file for this as well
 echo 'Acquire::Check-Valid-Until "false";' | sudo tee /schroots/debrebuild-$DISTRO-amd64/etc/apt/apt.conf.d/23-rebuild
 
-# I guess I think it would be nice if debrebuild would also do this:
-# FIXME: file another wishlist bug?
-output_echo "fetching source package $PKG"
-dget https://deb.debian.org/debian/pool/main/$POOLPATH/$PKG/${PKG}_$VERSION.dsc
-
 # actually run sbuild
 # - workaround #955123 in devscripts: debrebuild: please provide --sbuild-output-only option
 #   - using tail



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/63f4cdc680d043a2e94f22c3d02cd2f0c8bb80b4...af874937d5973c443d27e755c932b27599613b12

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/63f4cdc680d043a2e94f22c3d02cd2f0c8bb80b4...af874937d5973c443d27e755c932b27599613b12
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20200430/3332da4e/attachment-0001.html>