diff --git a/Makefile b/Makefile index e551a6d..8fb7425 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ uninstall: rm /etc/cron.daily/eobuilder chroots: - for DIST in buster bullseye; do \ + for DIST in bullseye bookworm; 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 buster bullseye; do \ + for DIST in bullseye bookworm; 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/dput.cf b/dput.cf index 5daabef..67007b5 100644 --- a/dput.cf +++ b/dput.cf @@ -2,14 +2,14 @@ method = scp fqdn = deb.entrouvert.org -[buster-eobuilder] -incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-eobuilder - [bullseye-eobuilder] incoming = /var/vhosts/deb.entrouvert.org/incoming/bullseye-eobuilder -[buster-hotfix] -incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-hotfix +[bookworm-eobuilder] +incoming = /var/vhosts/deb.entrouvert.org/incoming/bookworm-eobuilder [bullseye-hotfix] incoming = /var/vhosts/deb.entrouvert.org/incoming/bullseye-hotfix + +[bookworm-hotfix] +incoming = /var/vhosts/deb.entrouvert.org/incoming/bookworm-hotfix diff --git a/eobuilder/cmdline.py b/eobuilder/cmdline.py index 95b27ac..fee3c05 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 [bullseye|,buster] GIT_REPOSITORY_NAME', + usage='usage: %prog [OPTIONS] -d [bullseye|,bookworm] GIT_REPOSITORY_NAME', ) parser.add_option( "-a", @@ -47,7 +47,7 @@ def parse_cmdline(): dest="distrib", metavar='DISTRIBUTIONS', default=[], - help="DISTRIBUTIONS: bullseye and/or buster", + help="DISTRIBUTIONS: bullseye and/or bookworm", ) 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: bullseye:bullseye-eobuilder, buster:buster-eobuilder", + help="DISTRIBUTION:REPOSITORY: bullseye:bullseye-eobuilder, bookworm:bookworm-eobuilder", ) parser.add_option( "--no-dput", diff --git a/eobuilder/settings.py b/eobuilder/settings.py index 371d0e6..a8d4765 100644 --- a/eobuilder/settings.py +++ b/eobuilder/settings.py @@ -10,12 +10,14 @@ EOBUILDER_TMP = "/var/tmp/eobuilder" REPOSITORY_URL = "deb.entrouvert.org" GIT_REPOSITORY_URL = "git+ssh://git@repos.entrouvert.org" DEBIAN_VERSIONS = { + "bookworm": "120", "bullseye": "110", "buster": "100", "stretch": "90", } DEFAULT_UNSTABLE_REPOSITORIES = { + "bookworm": "bookworm-eobuilder", "bullseye": "bullseye-eobuilder", "buster": "buster-eobuilder", "stretch": "stretch-eobuilder", @@ -24,6 +26,7 @@ DEFAULT_UNSTABLE_REPOSITORIES = { # Paste new tag into repositories # Automatically add new tag in this repositories DEFAULT_TESTING_REPOSITORIES = { + "bookworm": ["bookworm-testing"], "bullseye": ["bullseye-testing"], "buster": ["buster-testing"], "stretch": ["stretch-testing"], @@ -31,6 +34,7 @@ DEFAULT_TESTING_REPOSITORIES = { # Hotfix repositories HOTFIX_REPOSITORIES = { + "bookworm": "bookworm-hotfix", "bullseye": "bullseye-hotfix", "buster": "buster-hotfix", "stretch": "stretch-hotfix", diff --git a/pbuilderrc b/pbuilderrc index 35727b7..2bc840c 100644 --- a/pbuilderrc +++ b/pbuilderrc @@ -1,9 +1,9 @@ # Codenames for Debian suites according to their alias. Update these when # needed. UNSTABLE_CODENAME="sid" -TESTING_CODENAME="bookworm" -STABLE_CODENAME="bullseye" -OLDSTABLE_CODENAME="buster" +TESTING_CODENAME="trixie" +STABLE_CODENAME="bookworm" +OLDSTABLE_CODENAME="bullseye" STABLE_BACKPORTS_SUITE="$STABLE_CODENAME-backports" # Use cowbuilder