add bookworm support (and remove buster) (#78329)
gitea/eobuilder/pipeline/head This commit looks good
Details
gitea/eobuilder/pipeline/head This commit looks good
Details
This commit is contained in:
parent
e9f99260f2
commit
fa3d05039b
4
Makefile
4
Makefile
|
@ -18,7 +18,7 @@ uninstall:
|
||||||
rm /etc/cron.daily/eobuilder
|
rm /etc/cron.daily/eobuilder
|
||||||
|
|
||||||
chroots:
|
chroots:
|
||||||
for DIST in buster bullseye; do \
|
for DIST in bullseye bookworm; 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 buster bullseye; do \
|
for DIST in bullseye bookworm; 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; \
|
||||||
|
|
10
dput.cf
10
dput.cf
|
@ -2,14 +2,14 @@
|
||||||
method = scp
|
method = scp
|
||||||
fqdn = deb.entrouvert.org
|
fqdn = deb.entrouvert.org
|
||||||
|
|
||||||
[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
|
||||||
|
|
||||||
[buster-hotfix]
|
[bookworm-eobuilder]
|
||||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-hotfix
|
incoming = /var/vhosts/deb.entrouvert.org/incoming/bookworm-eobuilder
|
||||||
|
|
||||||
[bullseye-hotfix]
|
[bullseye-hotfix]
|
||||||
incoming = /var/vhosts/deb.entrouvert.org/incoming/bullseye-hotfix
|
incoming = /var/vhosts/deb.entrouvert.org/incoming/bullseye-hotfix
|
||||||
|
|
||||||
|
[bookworm-hotfix]
|
||||||
|
incoming = /var/vhosts/deb.entrouvert.org/incoming/bookworm-hotfix
|
||||||
|
|
|
@ -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] GIT_REPOSITORY_NAME',
|
usage='usage: %prog [OPTIONS] -d [bullseye|,bookworm] 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 and/or buster",
|
help="DISTRIBUTIONS: bullseye and/or bookworm",
|
||||||
)
|
)
|
||||||
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",
|
help="DISTRIBUTION:REPOSITORY: bullseye:bullseye-eobuilder, bookworm:bookworm-eobuilder",
|
||||||
)
|
)
|
||||||
parser.add_option(
|
parser.add_option(
|
||||||
"--no-dput",
|
"--no-dput",
|
||||||
|
|
|
@ -10,12 +10,14 @@ 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 = {
|
||||||
|
"bookworm": "120",
|
||||||
"bullseye": "110",
|
"bullseye": "110",
|
||||||
"buster": "100",
|
"buster": "100",
|
||||||
"stretch": "90",
|
"stretch": "90",
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFAULT_UNSTABLE_REPOSITORIES = {
|
DEFAULT_UNSTABLE_REPOSITORIES = {
|
||||||
|
"bookworm": "bookworm-eobuilder",
|
||||||
"bullseye": "bullseye-eobuilder",
|
"bullseye": "bullseye-eobuilder",
|
||||||
"buster": "buster-eobuilder",
|
"buster": "buster-eobuilder",
|
||||||
"stretch": "stretch-eobuilder",
|
"stretch": "stretch-eobuilder",
|
||||||
|
@ -24,6 +26,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 = {
|
||||||
|
"bookworm": ["bookworm-testing"],
|
||||||
"bullseye": ["bullseye-testing"],
|
"bullseye": ["bullseye-testing"],
|
||||||
"buster": ["buster-testing"],
|
"buster": ["buster-testing"],
|
||||||
"stretch": ["stretch-testing"],
|
"stretch": ["stretch-testing"],
|
||||||
|
@ -31,6 +34,7 @@ DEFAULT_TESTING_REPOSITORIES = {
|
||||||
|
|
||||||
# Hotfix repositories
|
# Hotfix repositories
|
||||||
HOTFIX_REPOSITORIES = {
|
HOTFIX_REPOSITORIES = {
|
||||||
|
"bookworm": "bookworm-hotfix",
|
||||||
"bullseye": "bullseye-hotfix",
|
"bullseye": "bullseye-hotfix",
|
||||||
"buster": "buster-hotfix",
|
"buster": "buster-hotfix",
|
||||||
"stretch": "stretch-hotfix",
|
"stretch": "stretch-hotfix",
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# Codenames for Debian suites according to their alias. Update these when
|
# Codenames for Debian suites according to their alias. Update these when
|
||||||
# needed.
|
# needed.
|
||||||
UNSTABLE_CODENAME="sid"
|
UNSTABLE_CODENAME="sid"
|
||||||
TESTING_CODENAME="bookworm"
|
TESTING_CODENAME="trixie"
|
||||||
STABLE_CODENAME="bullseye"
|
STABLE_CODENAME="bookworm"
|
||||||
OLDSTABLE_CODENAME="buster"
|
OLDSTABLE_CODENAME="bullseye"
|
||||||
STABLE_BACKPORTS_SUITE="$STABLE_CODENAME-backports"
|
STABLE_BACKPORTS_SUITE="$STABLE_CODENAME-backports"
|
||||||
|
|
||||||
# Use cowbuilder
|
# Use cowbuilder
|
||||||
|
|
Loading…
Reference in New Issue