add references to stretch

This commit is contained in:
Frédéric Péters 2018-01-13 18:57:37 +01:00
parent 138d09e38e
commit addf05933c
5 changed files with 12 additions and 6 deletions

View File

@ -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; \

View File

@ -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

View File

@ -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})

View File

@ -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()

View File

@ -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"]