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

remove stretch from default repositories/targets

This commit is contained in:
Frédéric Péters 2021-08-15 14:59:16 +02:00
parent a441c38f01
commit ca7fb97ba0
4 changed files with 6 additions and 12 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 stretch buster bullseye; do \ for DIST in buster bullseye; 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 stretch buster bullseye; do \ for DIST in buster bullseye; 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; \

6
dput.cf
View File

@ -2,18 +2,12 @@
method = scp method = scp
fqdn = deb.entrouvert.org fqdn = deb.entrouvert.org
[stretch-eobuilder]
incoming = /var/vhosts/deb.entrouvert.org/incoming/stretch-eobuilder
[buster-eobuilder] [buster-eobuilder]
incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-eobuilder incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-eobuilder
[bullseye-eobuilder] [bullseye-eobuilder]
incoming = /var/vhosts/deb.entrouvert.org/incoming/bullseye-eobuilder incoming = /var/vhosts/deb.entrouvert.org/incoming/bullseye-eobuilder
[stretch-hotfix]
incoming = /var/vhosts/deb.entrouvert.org/incoming/stretch-hotfix
[buster-hotfix] [buster-hotfix]
incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-hotfix incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-hotfix

2
eobuildall
View File

@ -50,7 +50,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 = 'stretch,buster,bullseye' dists = 'buster,bullseye'
rc = os.system('/usr/local/bin/eobuilder -d %(dists)s %(module)s' % {'dists': dists, 'module': module}) rc = os.system('/usr/local/bin/eobuilder -d %(dists)s %(module)s' % {'dists': dists, 'module': module})
if rc == 0: if rc == 0:
return 'ok' return 'ok'

6
eobuilder/cmdline.py
View File

@ -27,7 +27,7 @@ class MultipleOption(Option):
def parse_cmdline(): def parse_cmdline():
parser = OptionParser( parser = OptionParser(
option_class=MultipleOption, option_class=MultipleOption,
usage='usage: %prog [OPTIONS] -d [bullseye|,buster|,stretch] GIT_REPOSITORY_NAME', usage='usage: %prog [OPTIONS] -d [bullseye|,buster] GIT_REPOSITORY_NAME',
) )
parser.add_option( parser.add_option(
"-a", "-a",
@ -47,7 +47,7 @@ def parse_cmdline():
dest="distrib", dest="distrib",
metavar='DISTRIBUTIONS', metavar='DISTRIBUTIONS',
default=[], default=[],
help="DISTRIBUTIONS: bullseye, buster and / or stretch", help="DISTRIBUTIONS: bullseye and/or buster",
) )
parser.add_option( parser.add_option(
"-f", "--force", action="store_true", dest="force", default=False, help="force a new build" "-f", "--force", action="store_true", dest="force", default=False, help="force a new build"
@ -104,7 +104,7 @@ def parse_cmdline():
default=[], default=[],
dest="repositories", dest="repositories",
metavar='DISTRIBUTION:REPOSITORY, DISTRIBUTION:REPOSITORY', metavar='DISTRIBUTION:REPOSITORY, DISTRIBUTION:REPOSITORY',
help="DISTRIBUTION:REPOSITORY: bullseye:bullseye-eobuilder, buster:buster-eobuilder, stretch:stretch-eobuilder", help="DISTRIBUTION:REPOSITORY: bullseye:bullseye-eobuilder, buster:buster-eobuilder",
) )
parser.add_option( parser.add_option(
"--no-dput", "--no-dput",