From 96a86e14cc40ca3ea9df6126759bf22ddb00649a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 26 Apr 2015 09:30:58 +0200 Subject: [PATCH] debian+=1 --- modules/buildd/manifests/init.pp | 7 ++++--- .../files/schroot-setup.d/99porterbox-extra-sources | 2 +- modules/schroot/files/setup-all-dchroots | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index a58d1f360..8fa6c2363 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -32,9 +32,10 @@ class buildd ($ensure=present) { } $suite = $::lsbdistcodename ? { - squeeze => $::lsbdistcodename, - wheezy => $::lsbdistcodename, - jessie => $::lsbdistcodename, + squeeze => $::lsbdistcodename, + wheezy => $::lsbdistcodename, + jessie => $::lsbdistcodename, + stretch => $::lsbdistcodename, undef => 'squeeze', default => 'wheezy' } diff --git a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources index 08dab86fc..8c5e919d6 100755 --- a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources +++ b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources @@ -33,7 +33,7 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then echo "deb $mirror sid main" >> "$SRCL" echo "deb-src $mirror sid main" >> "$SRCL" ;; - sid|jessie) + sid|stretch) ;; *) echo "deb http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL" diff --git a/modules/schroot/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots index 66fd9ebb0..6204dbd6c 100755 --- a/modules/schroot/files/setup-all-dchroots +++ b/modules/schroot/files/setup-all-dchroots @@ -44,7 +44,7 @@ fi get_suites() { case "$1" in armhf|s390x) - echo "sid jessie wheezy" + echo "sid stretch jessie wheezy" ;; ia64|s390) echo "wheezy" @@ -53,13 +53,13 @@ get_suites() { echo "sid wheezy" ;; arm64|ppc64el) - echo "sid jessie" + echo "sid stretch jessie" ;; amd64|i386) - echo "sid jessie wheezy squeeze" + echo "sid stretch jessie wheezy squeeze" ;; *) - echo "sid jessie wheezy" + echo "sid stretch jessie wheezy" ;; esac } -- 2.20.1