From 29ffd399150d6beec56680f47b88abfdd2f5d3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 7 Sep 2019 16:16:56 +0200 Subject: [PATCH] declare buster as a potential target (#34578) --- Makefile | 4 ++-- eobuildall | 2 +- eobuilder/cmdline.py | 4 ++-- eobuilder/settings.py | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d266fd7..b5c72fa 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ uninstall: rm /etc/cron.daily/eobuilder chroots: - for DIST in wheezy jessie stretch; do \ + for DIST in wheezy jessie stretch buster; 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 stretch; do \ + for DIST in wheezy jessie stretch buster; 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/eobuildall b/eobuildall index e1e8a6e..a65a4d6 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,stretch' + dists = 'jessie,stretch,buster' 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 34a26ad..a207f27 100644 --- a/eobuilder/cmdline.py +++ b/eobuilder/cmdline.py @@ -27,7 +27,7 @@ class MultipleOption(Option): def parse_cmdline(): parser = OptionParser(option_class=MultipleOption, - usage='usage: %prog [OPTIONS] -d [stretch|,jessie|,wheezy|,squeeze] GIT_REPOSITORY_NAME') + usage='usage: %prog [OPTIONS] -d [buster|,stretch|,jessie|,wheezy|,squeeze] GIT_REPOSITORY_NAME') parser.add_option("-a", "--architectures", action="extend", type="string", dest="architectures", metavar='ARCHITECTURES', @@ -37,7 +37,7 @@ def parse_cmdline(): action="extend", type="string", dest="distrib", metavar='DISTRIBUTIONS', default=[], - help="DISTRIBUTIONS: stretch, jessie, wheezy and / or squeeze") + help="DISTRIBUTIONS: buster, stretch, jessie, wheezy and / or squeeze") parser.add_option("-f", "--force", action="store_true", dest="force", default=False, help="force a new build") diff --git a/eobuilder/settings.py b/eobuilder/settings.py index b08abec..e26152a 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 = { + "buster": "100", "stretch": "90", "jessie": "80", "wheezy": "70", @@ -18,6 +19,7 @@ DEBIAN_VERSIONS = { } DEFAULT_UNSTABLE_REPOSITORIES = { + "buster" : "buster-eobuilder", "stretch" : "stretch-eobuilder", "jessie" : "jessie-eobuilder", "wheezy" : "wheezy-eobuilder", @@ -27,6 +29,7 @@ DEFAULT_UNSTABLE_REPOSITORIES = { # Paste new tag into repositories # Automatically add new tag in this repositories DEFAULT_TESTING_REPOSITORIES = { + "buster": ["buster-testing"], "stretch": ["stretch-testing"], "jessie": ["jessie-testing"], "wheezy": ["wheezy-testing"], @@ -35,6 +38,7 @@ DEFAULT_TESTING_REPOSITORIES = { # Hotfix repositories HOTFIX_REPOSITORIES = { + "buster": "buster-hotfix", "stretch": "stretch-hotfix", "jessie": "jessie-hotfix", }