reduce supported versions to current debian versions (#51564)
This commit is contained in:
parent
1ea1c69c01
commit
b49cb75bc9
4
Makefile
4
Makefile
|
@ -18,7 +18,7 @@ uninstall:
|
|||
rm /etc/cron.daily/eobuilder
|
||||
|
||||
chroots:
|
||||
for DIST in wheezy jessie stretch buster; do \
|
||||
for DIST in stretch buster bullseye; 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 buster; do \
|
||||
for DIST in stretch buster bullseye; 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; \
|
||||
|
|
28
dput.cf
28
dput.cf
|
@ -2,25 +2,14 @@
|
|||
method = scp
|
||||
fqdn = deb.entrouvert.org
|
||||
|
||||
[squeeze-eobuilder]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/squeeze-eobuilder
|
||||
|
||||
[wheezy-eobuilder]
|
||||
method = scp
|
||||
fqdn = deb.entrouvert.org
|
||||
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
|
||||
|
||||
[buster-eobuilder]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-eobuilder
|
||||
|
||||
[jessie-hotfix]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/jessie-hotfix
|
||||
[bullseye-eobuilder]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/bullseye-eobuilder
|
||||
|
||||
[stretch-hotfix]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/stretch-hotfix
|
||||
|
@ -28,14 +17,5 @@ incoming = /var/vhosts/deb.entrouvert.org/incoming/stretch-hotfix
|
|||
[buster-hotfix]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-hotfix
|
||||
|
||||
[wheezy-legacy]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/wheezy-legacy
|
||||
|
||||
[squeeze-legacy]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/squeeze-legacy
|
||||
|
||||
[wheezy-wip-alfortville]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/wheezy-wip-alfortville
|
||||
|
||||
[wheezy-wip-wcs-django]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/wheezy-wip-wcs-django
|
||||
[bullseye-hotfix]
|
||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/bullseye-hotfix
|
||||
|
|
|
@ -50,7 +50,7 @@ def build_module(config, module):
|
|||
try:
|
||||
dists = config.get('dists', module)
|
||||
except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
|
||||
dists = 'jessie,stretch,buster'
|
||||
dists = 'stretch,buster,bullseye'
|
||||
rc = os.system('/usr/local/bin/eobuilder -d %(dists)s %(module)s' % {'dists': dists, 'module': module})
|
||||
if rc == 0:
|
||||
return 'ok'
|
||||
|
|
|
@ -27,7 +27,7 @@ class MultipleOption(Option):
|
|||
def parse_cmdline():
|
||||
parser = OptionParser(
|
||||
option_class=MultipleOption,
|
||||
usage='usage: %prog [OPTIONS] -d [buster|,stretch|,jessie|,wheezy|,squeeze] GIT_REPOSITORY_NAME',
|
||||
usage='usage: %prog [OPTIONS] -d [bullseye|,buster|,stretch] GIT_REPOSITORY_NAME',
|
||||
)
|
||||
parser.add_option(
|
||||
"-a",
|
||||
|
@ -47,7 +47,7 @@ def parse_cmdline():
|
|||
dest="distrib",
|
||||
metavar='DISTRIBUTIONS',
|
||||
default=[],
|
||||
help="DISTRIBUTIONS: buster, stretch, jessie, wheezy and / or squeeze",
|
||||
help="DISTRIBUTIONS: bullseye, buster and / or stretch",
|
||||
)
|
||||
parser.add_option(
|
||||
"-f", "--force", action="store_true", dest="force", default=False, help="force a new build"
|
||||
|
@ -104,7 +104,7 @@ def parse_cmdline():
|
|||
default=[],
|
||||
dest="repositories",
|
||||
metavar='DISTRIBUTION:REPOSITORY, DISTRIBUTION:REPOSITORY',
|
||||
help="DISTRIBUTION:REPOSITORY: strech:stretch-eobuilder, jessie:jessie-eobuilder, wheezy:wheezy-eobuilder",
|
||||
help="DISTRIBUTION:REPOSITORY: bullseye:bullseye-eobuilder, buster:buster-eobuilder, stretch:stretch-eobuilder",
|
||||
)
|
||||
parser.add_option(
|
||||
"--no-dput",
|
||||
|
|
|
@ -10,37 +10,30 @@ EOBUILDER_TMP = "/var/tmp/eobuilder"
|
|||
REPOSITORY_URL = "deb.entrouvert.org"
|
||||
GIT_REPOSITORY_URL = "git+ssh://git@repos.entrouvert.org"
|
||||
DEBIAN_VERSIONS = {
|
||||
"bullseye": "110",
|
||||
"buster": "100",
|
||||
"stretch": "90",
|
||||
"jessie": "80",
|
||||
"wheezy": "70",
|
||||
"squeeze": "60",
|
||||
"lenny": "50",
|
||||
}
|
||||
|
||||
DEFAULT_UNSTABLE_REPOSITORIES = {
|
||||
"bullseye": "bullseye-eobuilder",
|
||||
"buster": "buster-eobuilder",
|
||||
"stretch": "stretch-eobuilder",
|
||||
"jessie": "jessie-eobuilder",
|
||||
"wheezy": "wheezy-eobuilder",
|
||||
"squeeze": "squeeze-eobuilder",
|
||||
}
|
||||
|
||||
# Paste new tag into repositories
|
||||
# Automatically add new tag in this repositories
|
||||
DEFAULT_TESTING_REPOSITORIES = {
|
||||
"bullseye": ["bullseye-testing"],
|
||||
"buster": ["buster-testing"],
|
||||
"stretch": ["stretch-testing"],
|
||||
"jessie": ["jessie-testing"],
|
||||
"wheezy": ["wheezy-testing"],
|
||||
"squeeze": ["squeeze-testing"],
|
||||
}
|
||||
|
||||
# Hotfix repositories
|
||||
HOTFIX_REPOSITORIES = {
|
||||
"bullseye": "bullseye-hotfix",
|
||||
"buster": "buster-hotfix",
|
||||
"stretch": "stretch-hotfix",
|
||||
"jessie": "jessie-hotfix",
|
||||
}
|
||||
|
||||
# Specify the testing repository by source package name
|
||||
|
|
|
@ -1,17 +1,16 @@
|
|||
# Codenames for Debian suites according to their alias. Update these when
|
||||
# needed.
|
||||
UNSTABLE_CODENAME="sid"
|
||||
TESTING_CODENAME="buster"
|
||||
STABLE_CODENAME="stretch"
|
||||
OLDSTABLE_CODENAME="jessie"
|
||||
OLDOLDSTABLE_CODENAME="wheezy"
|
||||
TESTING_CODENAME="bullseye"
|
||||
STABLE_CODENAME="buster"
|
||||
OLDSTABLE_CODENAME="stretch"
|
||||
STABLE_BACKPORTS_SUITE="$STABLE_CODENAME-backports"
|
||||
|
||||
# Use cowbuilder
|
||||
PDEBUILD_PBUILDER="cowbuilder"
|
||||
|
||||
# List of Debian suites.
|
||||
DEBIAN_SUITES=($UNSTABLE_CODENAME $TESTING_CODENAME $STABLE_CODENAME $OLDSTABLE_CODENAME $OLDOLDSTABLE_CODENAME
|
||||
DEBIAN_SUITES=($UNSTABLE_CODENAME $TESTING_CODENAME $STABLE_CODENAME $OLDSTABLE_CODENAME
|
||||
"unstable" "testing" "stable" "oldstable")
|
||||
|
||||
# Mirrors to use. Update these to your preferred mirror.
|
||||
|
|
Loading…
Reference in New Issue