From ec8aabb5030646d3f2c9d6909513bb073de0cbcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dylan=20A=C3=AFssi?= <dylan.aissi@collabora.com>
Date: Mon, 15 Jan 2024 13:08:53 +0100
Subject: [PATCH] sources: simplify DEBIAN_COMPONENTS* anchor name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Make the past an exception instead of the future.
Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
---
data/sources.yaml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/sources.yaml b/data/sources.yaml
index 3afb053..50ab37c 100644
--- a/data/sources.yaml
+++ b/data/sources.yaml
@@ -1,10 +1,10 @@
.templates:
- &DEBIAN_SUITE_URL_TEMPLATE http://deb.debian.org/debian/dists/{suite}
- &DEBIAN_SECURITY_SUITE_URL_TEMPLATE http://deb.debian.org/debian-security/dists/{suite}/updates
- - &DEBIAN_COMPONENTS
+ - &DEBIAN_COMPONENTS_BULLSEYE
- main
- non-free
- - &DEBIAN_COMPONENTS_BOOKWORM
+ - &DEBIAN_COMPONENTS
- main
- non-free
- non-free-firmware
@@ -17,7 +17,7 @@ sources:
suite: bullseye
base: debian/bullseye
url_template: *DEBIAN_SUITE_URL_TEMPLATE
- components: *DEBIAN_COMPONENTS
+ components: *DEBIAN_COMPONENTS_BULLSEYE
debian/bullseye-security:
<<: *bullseye
suite: bullseye-security
@@ -36,7 +36,7 @@ sources:
suite: bookworm
base: debian/bookworm
url_template: *DEBIAN_SUITE_URL_TEMPLATE
- components: *DEBIAN_COMPONENTS_BOOKWORM
+ components: *DEBIAN_COMPONENTS
debian/bookworm-security:
<<: *bookworm
suite: bookworm-security
@@ -55,7 +55,7 @@ sources:
suite: trixie
base: debian/trixie
url_template: *DEBIAN_SUITE_URL_TEMPLATE
- components: *DEBIAN_COMPONENTS_BOOKWORM
+ components: *DEBIAN_COMPONENTS
debian/sid:
<<: &sid
distribution: debian
@@ -63,4 +63,4 @@ sources:
suite: sid
base: debian/sid
url_template: *DEBIAN_SUITE_URL_TEMPLATE
- components: *DEBIAN_COMPONENTS_BOOKWORM
+ components: *DEBIAN_COMPONENTS
--
GitLab