From addf05933c8a511b9e7364bbdc06c302bf992d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 13 Jan 2018 18:57:37 +0100 Subject: [PATCH] add references to stretch --- Makefile | 4 ++-- dput.cf | 3 +++ eobuildall | 2 +- eobuilder/cmdline.py | 6 +++--- eobuilder/settings.py | 3 +++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 02300fa..d266fd7 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ uninstall: rm /etc/cron.daily/eobuilder chroots: - for DIST in wheezy jessie; do \ + for DIST in wheezy jessie stretch; do \ for ARCH in i386 amd64; do \ mkdir -p /var/cache/pbuilder/$$DIST-$$ARCH/base.cow; \ DIST=$$DIST ARCH=$$ARCH cowbuilder --create --configfile ./pbuilderrc --keyring ./entrouvert.gpg; \ @@ -26,7 +26,7 @@ chroots: done chroots-update: - for DIST in wheezy jessie; do \ + for DIST in wheezy jessie stretch; do \ for ARCH in i386 amd64; do \ mkdir -p /var/cache/pbuilder/$$DIST-$$ARCH/base.cow; \ DIST=$$DIST ARCH=$$ARCH cowbuilder --update --configfile ./pbuilderrc --keyring ./entrouvert.gpg; \ diff --git a/dput.cf b/dput.cf index 3f0b981..8b36121 100644 --- a/dput.cf +++ b/dput.cf @@ -13,6 +13,9 @@ incoming = /var/vhosts/deb.entrouvert.org/incoming/wheezy-eobuilder [jessie-eobuilder] incoming = /var/vhosts/deb.entrouvert.org/incoming/jessie-eobuilder +[stretch-eobuilder] +incoming = /var/vhosts/deb.entrouvert.org/incoming/stretch-eobuilder + [wheezy-legacy] incoming = /var/vhosts/deb.entrouvert.org/incoming/wheezy-legacy diff --git a/eobuildall b/eobuildall index 2286fae..e1e8a6e 100755 --- a/eobuildall +++ b/eobuildall @@ -40,7 +40,7 @@ def build_module(config, module): try: dists = config.get('dists', module) except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): - dists = 'wheezy,jessie' + dists = 'wheezy,jessie,stretch' rc = os.system('/usr/local/bin/eobuilder -d %(dists)s %(module)s' % { 'dists': dists, 'module': module}) diff --git a/eobuilder/cmdline.py b/eobuilder/cmdline.py index 8e3fa11..b87e1eb 100644 --- a/eobuilder/cmdline.py +++ b/eobuilder/cmdline.py @@ -25,7 +25,7 @@ class MultipleOption(Option): def parse_cmdline(): parser = OptionParser(option_class=MultipleOption, - usage='usage: %prog [OPTIONS] -d [jessie,wheezy|jessie|wheezy|squeeze] GIT_REPOSITORY_NAME') + usage='usage: %prog [OPTIONS] -d [stretch|,jessie|,wheezy|,squeeze] GIT_REPOSITORY_NAME') parser.add_option("-a", "--architectures", action="extend", type="string", dest="architectures", metavar='ARCHITECTURES', @@ -34,7 +34,7 @@ def parse_cmdline(): parser.add_option("-d", "--distribution", action="extend", type="string", dest="distrib", metavar='DISTRIBUTIONS', - help="DISTRIBUTIONS: jessie, wheezy and / or squeeze") + help="DISTRIBUTIONS: stretch, jessie, wheezy and / or squeeze") parser.add_option("-f", "--force", action="store_true", dest="force", default=False, help="force a new build") @@ -57,7 +57,7 @@ def parse_cmdline(): action="extend", type="string", default=[], dest="repositories", metavar='DISTRIBUTION:REPOSITORY, DISTRIBUTION:REPOSITORY', - help="DISTRIBUTION:REPOSITORY: jessie:jessie-eobuilder, wheezy:wheezy-eobuilder") + help="DISTRIBUTION:REPOSITORY: strech:stretch-eobuilder, jessie:jessie-eobuilder, wheezy:wheezy-eobuilder") (options, args) = parser.parse_args() diff --git a/eobuilder/settings.py b/eobuilder/settings.py index 683c64f..23874cc 100644 --- a/eobuilder/settings.py +++ b/eobuilder/settings.py @@ -10,6 +10,7 @@ EOBUILDER_TMP = "/var/tmp/eobuilder" REPOSITORY_URL = "deb.entrouvert.org" GIT_REPOSITORY_URL = "git+ssh://git@repos.entrouvert.org" DEBIAN_VERSIONS = { + "stretch": "90", "jessie": "80", "wheezy": "70", "squeeze": "60", @@ -17,6 +18,7 @@ DEBIAN_VERSIONS = { } DEFAULT_UNSTABLE_REPOSITORIES = { + "stretch" : "stretch-eobuilder", "jessie" : "jessie-eobuilder", "wheezy" : "wheezy-eobuilder", "squeeze": "squeeze-eobuilder" @@ -25,6 +27,7 @@ DEFAULT_UNSTABLE_REPOSITORIES = { # Paste new tag into repositories # Automatically add new tag in this repositories DEFAULT_TESTING_REPOSITORIES = { + "stretch": ["stretch-testing"], "jessie": ["jessie-testing"], "wheezy": ["wheezy-testing"], "squeeze": ["squeeze-testing"]