entrouvert
/
eobuilder
17
0
Fork 0
Code Issues Pull Requests Releases Activity

declare buster as a potential target (#34578)

This commit is contained in:
Frédéric Péters 2019-09-07 16:16:56 +02:00
parent deae95af3f
commit 29ffd39915
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -18,7 +18,7 @@ uninstall:
rm /etc/cron.daily/eobuilder rm /etc/cron.daily/eobuilder
chroots: chroots:
for DIST in wheezy jessie stretch; do \ for DIST in wheezy jessie stretch buster; do \
for ARCH in i386 amd64; do \ for ARCH in i386 amd64; do \
mkdir -p /var/cache/pbuilder/$$DIST-$$ARCH/base.cow; \ mkdir -p /var/cache/pbuilder/$$DIST-$$ARCH/base.cow; \
DIST=$$DIST ARCH=$$ARCH cowbuilder --create --configfile ./pbuilderrc --keyring ./entrouvert.gpg; \ DIST=$$DIST ARCH=$$ARCH cowbuilder --create --configfile ./pbuilderrc --keyring ./entrouvert.gpg; \
@ -26,7 +26,7 @@ chroots:
done done
chroots-update: chroots-update:
for DIST in wheezy jessie stretch; do \ for DIST in wheezy jessie stretch buster; do \
for ARCH in i386 amd64; do \ for ARCH in i386 amd64; do \
mkdir -p /var/cache/pbuilder/$$DIST-$$ARCH/base.cow; \ mkdir -p /var/cache/pbuilder/$$DIST-$$ARCH/base.cow; \
DIST=$$DIST ARCH=$$ARCH cowbuilder --update --configfile ./pbuilderrc --keyring ./entrouvert.gpg; \ DIST=$$DIST ARCH=$$ARCH cowbuilder --update --configfile ./pbuilderrc --keyring ./entrouvert.gpg; \

2
eobuildall
View File

@ -40,7 +40,7 @@ def build_module(config, module):
try: try:
dists = config.get('dists', module) dists = config.get('dists', module)
except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): 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' % { rc = os.system('/usr/local/bin/eobuilder -d %(dists)s %(module)s' % {
'dists': dists, 'dists': dists,
'module': module}) 'module': module})

4
eobuilder/cmdline.py
View File

@ -27,7 +27,7 @@ class MultipleOption(Option):
def parse_cmdline(): def parse_cmdline():
parser = OptionParser(option_class=MultipleOption, 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", parser.add_option("-a", "--architectures",
action="extend", type="string", action="extend", type="string",
dest="architectures", metavar='ARCHITECTURES', dest="architectures", metavar='ARCHITECTURES',
@ -37,7 +37,7 @@ def parse_cmdline():
action="extend", type="string", action="extend", type="string",
dest="distrib", metavar='DISTRIBUTIONS', dest="distrib", metavar='DISTRIBUTIONS',
default=[], 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", parser.add_option("-f", "--force", action="store_true",
dest="force", default=False, dest="force", default=False,
help="force a new build") help="force a new build")

4
eobuilder/settings.py
View File

@ -10,6 +10,7 @@ EOBUILDER_TMP = "/var/tmp/eobuilder"
REPOSITORY_URL = "deb.entrouvert.org" REPOSITORY_URL = "deb.entrouvert.org"
GIT_REPOSITORY_URL = "git+ssh://git@repos.entrouvert.org" GIT_REPOSITORY_URL = "git+ssh://git@repos.entrouvert.org"
DEBIAN_VERSIONS = { DEBIAN_VERSIONS = {
"buster": "100",
"stretch": "90", "stretch": "90",
"jessie": "80", "jessie": "80",
"wheezy": "70", "wheezy": "70",
@ -18,6 +19,7 @@ DEBIAN_VERSIONS = {
} }
DEFAULT_UNSTABLE_REPOSITORIES = { DEFAULT_UNSTABLE_REPOSITORIES = {
"buster" : "buster-eobuilder",
"stretch" : "stretch-eobuilder", "stretch" : "stretch-eobuilder",
"jessie" : "jessie-eobuilder", "jessie" : "jessie-eobuilder",
"wheezy" : "wheezy-eobuilder", "wheezy" : "wheezy-eobuilder",
@ -27,6 +29,7 @@ DEFAULT_UNSTABLE_REPOSITORIES = {
# Paste new tag into repositories # Paste new tag into repositories
# Automatically add new tag in this repositories # Automatically add new tag in this repositories
DEFAULT_TESTING_REPOSITORIES = { DEFAULT_TESTING_REPOSITORIES = {
"buster": ["buster-testing"],
"stretch": ["stretch-testing"], "stretch": ["stretch-testing"],
"jessie": ["jessie-testing"], "jessie": ["jessie-testing"],
"wheezy": ["wheezy-testing"], "wheezy": ["wheezy-testing"],
@ -35,6 +38,7 @@ DEFAULT_TESTING_REPOSITORIES = {
# Hotfix repositories # Hotfix repositories
HOTFIX_REPOSITORIES = { HOTFIX_REPOSITORIES = {
"buster": "buster-hotfix",
"stretch": "stretch-hotfix", "stretch": "stretch-hotfix",
"jessie": "jessie-hotfix", "jessie": "jessie-hotfix",
} }