From a6a1bc47eef14ee2a435a5f9261be7ee0ad2fa83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Sat, 18 Feb 2023 14:10:12 +0100 Subject: [PATCH] debian >= bookworm: split non-free into separate files, use non-free-firmware in default repos instead --- sources.list.d/debian-12-bookworm-debug.list | 8 +++---- .../debian-12-bookworm-non-free.list | 20 ++++++++++++++++++ sources.list.d/debian-12-bookworm-src.list | 10 ++++----- sources.list.d/debian-12-bookworm.list | 12 +++++------ sources.list.d/debian-13-trixie-debug.list | 8 +++---- sources.list.d/debian-13-trixie-non-free.list | 21 +++++++++++++++++++ sources.list.d/debian-13-trixie-src.list | 10 ++++----- sources.list.d/debian-13-trixie.list | 12 +++++------ sources.list.d/debian-experimental-debug.list | 2 +- .../debian-experimental-non-free.list | 8 +++++++ sources.list.d/debian-experimental-src.list | 2 +- sources.list.d/debian-experimental.list | 2 +- sources.list.d/debian-sid-debug.list | 2 +- sources.list.d/debian-sid-non-free.list | 8 +++++++ sources.list.d/debian-sid-src.list | 2 +- sources.list.d/debian-sid.list | 2 +- 16 files changed, 93 insertions(+), 36 deletions(-) create mode 100644 sources.list.d/debian-12-bookworm-non-free.list create mode 100644 sources.list.d/debian-13-trixie-non-free.list create mode 100644 sources.list.d/debian-experimental-non-free.list create mode 100644 sources.list.d/debian-sid-non-free.list diff --git a/sources.list.d/debian-12-bookworm-debug.list b/sources.list.d/debian-12-bookworm-debug.list index d50ec0f..bae45fe 100644 --- a/sources.list.d/debian-12-bookworm-debug.list +++ b/sources.list.d/debian-12-bookworm-debug.list @@ -1,4 +1,4 @@ -deb http://debug.mirrors.debian.org/debian-debug bookworm-debug main contrib non-free -deb http://debug.mirrors.debian.org/debian-debug bookworm-proposed-updates-debug main contrib non-free -deb http://debug.mirrors.debian.org/debian-debug bookworm-backports-debug main contrib non-free -# deb http://debug.mirrors.debian.org/debian-debug bookworm-backports-debug-sloppy main contrib non-free +deb http://debug.mirrors.debian.org/debian-debug bookworm-debug main contrib non-free-firmware +deb http://debug.mirrors.debian.org/debian-debug bookworm-proposed-updates-debug main contrib non-free-firmware +deb http://debug.mirrors.debian.org/debian-debug bookworm-backports-debug main contrib non-free-firmware +# deb http://debug.mirrors.debian.org/debian-debug bookworm-backports-debug-sloppy main contrib non-free-firmware diff --git a/sources.list.d/debian-12-bookworm-non-free.list b/sources.list.d/debian-12-bookworm-non-free.list new file mode 100644 index 0000000..db80ce5 --- /dev/null +++ b/sources.list.d/debian-12-bookworm-non-free.list @@ -0,0 +1,20 @@ +# packages +deb http://ftp.de.debian.org./debian bookworm non-free +deb http://ftp.de.debian.org./debian bookworm-updates non-free +deb http://ftp.de.debian.org./debian bookworm-proposed-updates non-free +deb http://security.debian.org./debian-security bookworm-security non-free +deb http://ftp.de.debian.org./debian bookworm-backports non-free +# deb http://ftp.de.debian.org./debian bookworm-backports-sloppy non-free + +# debug +deb http://debug.mirrors.debian.org/debian-debug bookworm-debug non-free +deb http://debug.mirrors.debian.org/debian-debug bookworm-proposed-updates-debug non-free +deb http://debug.mirrors.debian.org/debian-debug bookworm-backports-debug non-free +# deb http://debug.mirrors.debian.org/debian-debug bookworm-backports-debug-sloppy non-free + +# src +deb-src http://ftp.de.debian.org./debian bookworm non-free +deb-src http://ftp.de.debian.org./debian bookworm-updates non-free +deb-src http://ftp.de.debian.org./debian bookworm-proposed-updates non-free +deb-src http://security.debian.org./debian-security bookworm-security non-free +deb-src http://ftp.de.debian.org./debian bookworm-backports non-free diff --git a/sources.list.d/debian-12-bookworm-src.list b/sources.list.d/debian-12-bookworm-src.list index 197c9e6..f7fe01d 100644 --- a/sources.list.d/debian-12-bookworm-src.list +++ b/sources.list.d/debian-12-bookworm-src.list @@ -1,5 +1,5 @@ -deb-src http://ftp.de.debian.org./debian bookworm main contrib non-free -deb-src http://ftp.de.debian.org./debian bookworm-updates main contrib non-free -deb-src http://ftp.de.debian.org./debian bookworm-proposed-updates main contrib non-free -deb-src http://security.debian.org./debian-security bookworm-security main contrib non-free -deb-src http://ftp.de.debian.org./debian bookworm-backports main contrib non-free +deb-src http://ftp.de.debian.org./debian bookworm main contrib non-free-firmware +deb-src http://ftp.de.debian.org./debian bookworm-updates main contrib non-free-firmware +deb-src http://ftp.de.debian.org./debian bookworm-proposed-updates main contrib non-free-firmware +deb-src http://security.debian.org./debian-security bookworm-security main contrib non-free-firmware +deb-src http://ftp.de.debian.org./debian bookworm-backports main contrib non-free-firmware diff --git a/sources.list.d/debian-12-bookworm.list b/sources.list.d/debian-12-bookworm.list index 62f4e5e..128cefb 100644 --- a/sources.list.d/debian-12-bookworm.list +++ b/sources.list.d/debian-12-bookworm.list @@ -1,6 +1,6 @@ -deb http://ftp.de.debian.org./debian bookworm main contrib non-free -deb http://ftp.de.debian.org./debian bookworm-updates main contrib non-free -deb http://ftp.de.debian.org./debian bookworm-proposed-updates main contrib non-free -deb http://security.debian.org./debian-security bookworm-security main contrib non-free -deb http://ftp.de.debian.org./debian bookworm-backports main contrib non-free -# deb http://ftp.de.debian.org./debian bookworm-backports-sloppy main contrib non-free +deb http://ftp.de.debian.org./debian bookworm main contrib non-free-firmware +deb http://ftp.de.debian.org./debian bookworm-updates main contrib non-free-firmware +deb http://ftp.de.debian.org./debian bookworm-proposed-updates main contrib non-free-firmware +deb http://security.debian.org./debian-security bookworm-security main contrib non-free-firmware +deb http://ftp.de.debian.org./debian bookworm-backports main contrib non-free-firmware +# deb http://ftp.de.debian.org./debian bookworm-backports-sloppy main contrib non-free-firmware diff --git a/sources.list.d/debian-13-trixie-debug.list b/sources.list.d/debian-13-trixie-debug.list index 8e21ff5..1445019 100644 --- a/sources.list.d/debian-13-trixie-debug.list +++ b/sources.list.d/debian-13-trixie-debug.list @@ -1,4 +1,4 @@ -deb http://debug.mirrors.debian.org/debian-debug trixie-debug main contrib non-free -deb http://debug.mirrors.debian.org/debian-debug trixie-proposed-updates-debug main contrib non-free -deb http://debug.mirrors.debian.org/debian-debug trixie-backports-debug main contrib non-free -# deb http://debug.mirrors.debian.org/debian-debug trixie-backports-debug-sloppy main contrib non-free +deb http://debug.mirrors.debian.org/debian-debug trixie-debug main contrib non-free-firmware +deb http://debug.mirrors.debian.org/debian-debug trixie-proposed-updates-debug main contrib non-free-firmware +deb http://debug.mirrors.debian.org/debian-debug trixie-backports-debug main contrib non-free-firmware +# deb http://debug.mirrors.debian.org/debian-debug trixie-backports-debug-sloppy main contrib non-free-firmware diff --git a/sources.list.d/debian-13-trixie-non-free.list b/sources.list.d/debian-13-trixie-non-free.list new file mode 100644 index 0000000..9cd0761 --- /dev/null +++ b/sources.list.d/debian-13-trixie-non-free.list @@ -0,0 +1,21 @@ +# packages +deb http://ftp.de.debian.org./debian trixie non-free +deb http://ftp.de.debian.org./debian trixie-updates non-free +deb http://ftp.de.debian.org./debian trixie-proposed-updates non-free +deb http://security.debian.org./debian-security trixie-security non-free +deb http://ftp.de.debian.org./debian trixie-backports non-free +# deb http://ftp.de.debian.org./debian trixie-backports-sloppy non-free + +# debug +deb http://debug.mirrors.debian.org/debian-debug trixie-debug non-free +deb http://debug.mirrors.debian.org/debian-debug trixie-proposed-updates-debug non-free +deb http://debug.mirrors.debian.org/debian-debug trixie-backports-debug non-free +# deb http://debug.mirrors.debian.org/debian-debug trixie-backports-debug-sloppy non-free + +# src +deb http://ftp.de.debian.org./debian trixie non-free +deb http://ftp.de.debian.org./debian trixie-updates non-free +deb http://ftp.de.debian.org./debian trixie-proposed-updates non-free +deb http://security.debian.org./debian-security trixie-security non-free +deb http://ftp.de.debian.org./debian trixie-backports non-free +# deb http://ftp.de.debian.org./debian trixie-backports-sloppy non-free diff --git a/sources.list.d/debian-13-trixie-src.list b/sources.list.d/debian-13-trixie-src.list index 5a01e07..4ef89e0 100644 --- a/sources.list.d/debian-13-trixie-src.list +++ b/sources.list.d/debian-13-trixie-src.list @@ -1,5 +1,5 @@ -deb-src http://ftp.de.debian.org./debian trixie main contrib non-free -deb-src http://ftp.de.debian.org./debian trixie-updates main contrib non-free -deb-src http://ftp.de.debian.org./debian trixie-proposed-updates main contrib non-free -deb-src http://security.debian.org./debian-security trixie-security main contrib non-free -deb-src http://ftp.de.debian.org./debian trixie-backports main contrib non-free +deb-src http://ftp.de.debian.org./debian trixie main contrib non-free-firmware +deb-src http://ftp.de.debian.org./debian trixie-updates main contrib non-free-firmware +deb-src http://ftp.de.debian.org./debian trixie-proposed-updates main contrib non-free-firmware +deb-src http://security.debian.org./debian-security trixie-security main contrib non-free-firmware +deb-src http://ftp.de.debian.org./debian trixie-backports main contrib non-free-firmware diff --git a/sources.list.d/debian-13-trixie.list b/sources.list.d/debian-13-trixie.list index e8459d6..072eeb2 100644 --- a/sources.list.d/debian-13-trixie.list +++ b/sources.list.d/debian-13-trixie.list @@ -1,6 +1,6 @@ -deb http://ftp.de.debian.org./debian trixie main contrib non-free -deb http://ftp.de.debian.org./debian trixie-updates main contrib non-free -deb http://ftp.de.debian.org./debian trixie-proposed-updates main contrib non-free -deb http://security.debian.org./debian-security trixie-security main contrib non-free -deb http://ftp.de.debian.org./debian trixie-backports main contrib non-free -# deb http://ftp.de.debian.org./debian trixie-backports-sloppy main contrib non-free +deb http://ftp.de.debian.org./debian trixie main contrib non-free-firmware +deb http://ftp.de.debian.org./debian trixie-updates main contrib non-free-firmware +deb http://ftp.de.debian.org./debian trixie-proposed-updates main contrib non-free-firmware +deb http://security.debian.org./debian-security trixie-security main contrib non-free-firmware +deb http://ftp.de.debian.org./debian trixie-backports main contrib non-free-firmware +# deb http://ftp.de.debian.org./debian trixie-backports-sloppy main contrib non-free-firmware diff --git a/sources.list.d/debian-experimental-debug.list b/sources.list.d/debian-experimental-debug.list index ebb5790..6447cf4 100644 --- a/sources.list.d/debian-experimental-debug.list +++ b/sources.list.d/debian-experimental-debug.list @@ -1 +1 @@ -deb http://debug.mirrors.debian.org/debian-debug experimental-debug main contrib non-free +deb http://debug.mirrors.debian.org/debian-debug experimental-debug main contrib non-free-firmware diff --git a/sources.list.d/debian-experimental-non-free.list b/sources.list.d/debian-experimental-non-free.list new file mode 100644 index 0000000..2ab693b --- /dev/null +++ b/sources.list.d/debian-experimental-non-free.list @@ -0,0 +1,8 @@ +# packages +deb http://ftp.de.debian.org./debian experimental non-free + +# debug +deb http://debug.mirrors.debian.org/debian-debug experimental-debug non-free + +# src +deb-src http://ftp.de.debian.org./debian experimental non-free diff --git a/sources.list.d/debian-experimental-src.list b/sources.list.d/debian-experimental-src.list index e3e1532..2cda9a5 100644 --- a/sources.list.d/debian-experimental-src.list +++ b/sources.list.d/debian-experimental-src.list @@ -1 +1 @@ -deb-src http://ftp.de.debian.org./debian experimental main contrib non-free +deb-src http://ftp.de.debian.org./debian experimental main contrib non-free-firmware diff --git a/sources.list.d/debian-experimental.list b/sources.list.d/debian-experimental.list index 2f4b457..d7d02dc 100644 --- a/sources.list.d/debian-experimental.list +++ b/sources.list.d/debian-experimental.list @@ -1 +1 @@ -deb http://ftp.de.debian.org./debian experimental main contrib non-free +deb http://ftp.de.debian.org./debian experimental main contrib non-free-firmware diff --git a/sources.list.d/debian-sid-debug.list b/sources.list.d/debian-sid-debug.list index eae67ee..93d441a 100644 --- a/sources.list.d/debian-sid-debug.list +++ b/sources.list.d/debian-sid-debug.list @@ -1 +1 @@ -deb http://debug.mirrors.debian.org/debian-debug sid-debug main contrib non-free +deb http://debug.mirrors.debian.org/debian-debug sid-debug main contrib non-free-firmware diff --git a/sources.list.d/debian-sid-non-free.list b/sources.list.d/debian-sid-non-free.list new file mode 100644 index 0000000..830cd0f --- /dev/null +++ b/sources.list.d/debian-sid-non-free.list @@ -0,0 +1,8 @@ +# packages +deb http://ftp.de.debian.org./debian sid non-free + +# debug +deb http://debug.mirrors.debian.org/debian-debug sid-debug non-free + +# src +deb-src http://ftp.de.debian.org./debian sid non-free diff --git a/sources.list.d/debian-sid-src.list b/sources.list.d/debian-sid-src.list index cfa0632..eb18d6c 100644 --- a/sources.list.d/debian-sid-src.list +++ b/sources.list.d/debian-sid-src.list @@ -1 +1 @@ -deb-src http://ftp.de.debian.org./debian sid main contrib non-free +deb-src http://ftp.de.debian.org./debian sid main contrib non-free-firmware diff --git a/sources.list.d/debian-sid.list b/sources.list.d/debian-sid.list index 87cda85..33fa616 100644 --- a/sources.list.d/debian-sid.list +++ b/sources.list.d/debian-sid.list @@ -1 +1 @@ -deb http://ftp.de.debian.org./debian sid main contrib non-free +deb http://ftp.de.debian.org./debian sid main contrib non-free-firmware