diff options
| author | Emilio Pozuelo Monfort <pochu@debian.org> | 2019-12-02 17:22:18 +0100 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <pochu@debian.org> | 2020-02-26 12:31:30 +0100 |
| commit | 0d22e6b8aed18a81f2249376f6d78e2de8d25348 (patch) | |
| tree | e3ae0346475b0418ae94ac5fe47c477a5189bbc0 | |
| parent | ad210ce2b8543a88371b3c2f0d1a668c002c195e (diff) | |
Don't hardcode architecture list in the Makefile
Move it to config.json instead and grab it from there.
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | data/config.json | 5 | ||||
| -rw-r--r-- | lib/debian-releases.mk | 6 |
3 files changed, 10 insertions, 7 deletions
@@ -10,12 +10,6 @@ TESTING = bullseye MIRROR = http://debian.csail.mit.edu/debian SECURITY_MIRROR = http://security.debian.org/debian-security -jessie_ARCHS = amd64 armel armhf i386 -stretch_ARCHS = amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x -buster_ARCHS = amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x -bullseye_ARCHS = amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x -sid_ARCHS = amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x - # The rest of the file should not need to be edited # Include the definitions of the releases to be fetched diff --git a/data/config.json b/data/config.json index 524f31de8d..59660ee0ed 100644 --- a/data/config.json +++ b/data/config.json @@ -59,6 +59,7 @@ "jessie-proposed-updates" ] }, + "architectures": [ "amd64", "armel", "armhf", "i386" ], "release": "oldoldstable" }, "stretch": { @@ -71,6 +72,7 @@ "stretch-proposed-updates" ] }, + "architectures": [ "amd64", "arm64", "armel", "armhf", "i386", "mips", "mips64el", "mipsel", "ppc64el", "s390x" ], "release": "oldstable" }, "buster": { @@ -83,6 +85,7 @@ "buster-proposed-updates" ] }, + "architectures": [ "amd64", "arm64", "armel", "armhf", "i386", "mips", "mips64el", "mipsel", "ppc64el", "s390x" ], "release": "stable" }, "bullseye": { @@ -95,6 +98,7 @@ "bullseye-proposed-updates" ] }, + "architectures": [ "amd64", "arm64", "armel", "armhf", "i386", "mips64el", "mipsel", "ppc64el", "s390x" ], "release": "testing" }, "bookworm": { @@ -114,6 +118,7 @@ "sid" ] }, + "architectures": [ "amd64", "arm64", "armel", "armhf", "i386", "mips64el", "mipsel", "ppc64el", "s390x" ], "release": "unstable" } }, diff --git a/lib/debian-releases.mk b/lib/debian-releases.mk index c868d6edfd..d09ac33be0 100644 --- a/lib/debian-releases.mk +++ b/lib/debian-releases.mk @@ -1,6 +1,10 @@ # This file defines the variables describing all Debian repositories # that need to be fetched in the "update-packages" process +define get_config = +$(shell jq -r $(1) 'data/config.json') +endef + # backports suites only have Sources.xz and respective Packages.xz # available. # Cf. as well https://bugs.debian.org/664866 @@ -12,7 +16,7 @@ MAIN_RELEASES := $(SECURITY_RELEASES) sid define add_main_release = $(1)_MIRROR = $$(MIRROR) $(1)_DIST = $(1) -$(1)_ARCHS ?= amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x +$(1)_ARCHS = $(call get_config, '.distributions.$(1).architectures[]') $(1)_RELEASE = $(1) $(1)_SUBRELEASE = RELEASES += $(1) |