[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: Narrow scope of gcc special-casing.

[Vagrant Cascadian (@vagrant)]

Vagrant Cascadian pushed to branch master at Debian QA / jenkins.debian.net


Commits:
7a6b2e02 by Vagrant Cascadian at 2023-06-12T06:57:33-07:00
reproducible Debian: Narrow scope of gcc special-casing.

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -610,7 +610,7 @@ first_build() {
 	# Disable tests, PGO and LTO on some important packages
 	extra_deb_build_options=""
 	case "${SRCPACKAGE}" in
-		gcc-*|binutils) extra_deb_build_options="nocheck nopgo nolto" ;;
+		gcc-[0-9][0-9]|gcc-[0-9]|binutils) extra_deb_build_options="nocheck nopgo nolto" ;;
 	esac
 	local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
 	cat > "$TMPCFG" << EOF
@@ -650,7 +650,7 @@ EOF
 		esac
 	fi
 	case "${SRCPACKAGE}" in
-		gcc-*|binutils) PBUILDERTIMEOUT=19 ;;
+		gcc-[0-9][0-9]|gcc-[0-9]|binutils) PBUILDERTIMEOUT=19 ;;
 		*) PBUILDERTIMEOUT=18 ;;
 	esac
 	set +e
@@ -729,7 +729,7 @@ second_build() {
 	# Disable tests, PGO and LTO on some important packages
 	extra_deb_build_options=""
 	case "${SRCPACKAGE}" in
-		gcc-*|binutils) extra_deb_build_options="nocheck nopgo nolto" ;;
+		gcc-[0-9][0-9]|gcc-[0-9]|binutils) extra_deb_build_options="nocheck nopgo nolto" ;;
 	esac
 	cat > "$TMPCFG" << EOF
 BUILDUSERID=2222
@@ -778,7 +778,7 @@ EOF
 		esac
 	fi
 	case "${SRCPACKAGE}" in
-		gcc-*|binutils) PBUILDERTIMEOUT=26 ;;
+		gcc-[0-9][0-9]|gcc-[0-9]|binutils) PBUILDERTIMEOUT=26 ;;
 		*) PBUILDERTIMEOUT=24 ;;
 	esac
 	set +e



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/7a6b2e0235dd62b86886c5d46e7b7c53ea5779c1

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/7a6b2e0235dd62b86886c5d46e7b7c53ea5779c1
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/20230612/4cf1659d/attachment-0001.htm>