diff options
| author | Emilio Pozuelo Monfort <pochu@debian.org> | 2019-12-02 17:28:09 +0100 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <pochu@debian.org> | 2020-02-26 12:31:30 +0100 |
| commit | 23baa13154527d34ced94c80d7d18620c5ba80f2 (patch) | |
| tree | c41497f6829e73543f9ff925d4d7f8207e76aaca | |
| parent | 0d22e6b8aed18a81f2249376f6d78e2de8d25348 (diff) | |
Makefile: don't hardcode Debian releases
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | doc/README.releases | 7 | ||||
| -rw-r--r-- | lib/debian-releases.mk | 4 |
3 files changed, 4 insertions, 16 deletions
@@ -1,17 +1,8 @@ PYTHON_MODULES = $(wildcard lib/python/*.py) -# The following variables need to be kept up-to-date and can be adjusted -# currently unsupported releases can be commented out -OLDOLDSTABLE = jessie -OLDSTABLE = stretch -STABLE = buster -TESTING = bullseye - MIRROR = http://debian.csail.mit.edu/debian SECURITY_MIRROR = http://security.debian.org/debian-security -# The rest of the file should not need to be edited - # Include the definitions of the releases to be fetched include lib/*-releases.mk diff --git a/doc/README.releases b/doc/README.releases index 6754de0359..4dc50b1029 100644 --- a/doc/README.releases +++ b/doc/README.releases @@ -1,5 +1,7 @@ Checklist to perform when a new stable release is announced =========================================================== +See https://bugs.debian.org/783491 + General ------- @@ -9,11 +11,6 @@ General [ ] Update security-team.debian.org pages [ ] Update support information in static/distributions.json -Security Tracker code ---------------------- -See https://bugs.debian.org/783491 -[ ] Makefile - Security Tracker host --------------------- [ ] Check /srv/security-tracker.debian.org/website/bin diff --git a/lib/debian-releases.mk b/lib/debian-releases.mk index d09ac33be0..ecb72a23a6 100644 --- a/lib/debian-releases.mk +++ b/lib/debian-releases.mk @@ -9,8 +9,8 @@ endef # available. # Cf. as well https://bugs.debian.org/664866 #BACKPORT_RELEASES := $(OLDSTABLE) $(STABLE) -SECURITY_RELEASES := $(OLDOLDSTABLE) $(OLDSTABLE) $(STABLE) $(TESTING) -MAIN_RELEASES := $(SECURITY_RELEASES) sid +MAIN_RELEASES = $(call get_config, '.distributions | to_entries[] | select(.value.release) | .key') +SECURITY_RELEASES = $(filter-out sid, $(MAIN_RELEASES)) # Define the variables for the release on the main mirror define add_main_release = |