[PATCH 1/1] sources.list: add non-free-firmware repository

[PATCH 1/1] sources.list: add non-free-firmware repository

[Felix Moessbauer]

The Debian project has taken the decision in 2022-10 to
create a new repository component non-free-firmware, and
include its content on installation media for the upcoming
Debian release bookworm. This has to be reflected in our
sources.list from bookworm on.

While the non-free-firmware repository contains only the
firmware parts, we could remove non-free as the intention
of adding non-free was just to get the non-free firmware
packages. However, still many firmware packages are not in
the correct repository, so better keep non-free for now.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/conf/distro/debian-bookworm.list | 12 ++++++------
 meta/conf/distro/debian-sid.list      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/conf/distro/debian-bookworm.list b/meta/conf/distro/debian-bookworm.list
index f47e46ef..cbc0ca3b 100644
--- a/meta/conf/distro/debian-bookworm.list
+++ b/meta/conf/distro/debian-bookworm.list
@@ -1,8 +1,8 @@
-deb	http://deb.debian.org/debian bookworm main contrib non-free
-deb-src	http://deb.debian.org/debian bookworm main contrib non-free
+deb	http://deb.debian.org/debian bookworm main contrib non-free-firmware non-free
+deb-src	http://deb.debian.org/debian bookworm main contrib non-free-firmware non-free
 
-deb	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free
-deb-src	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free
+deb	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free-firmware non-free
+deb-src	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free-firmware non-free
 
-deb	http://deb.debian.org/debian bookworm-updates main contrib non-free
-deb-src	http://deb.debian.org/debian bookworm-updates main contrib non-free
+deb	http://deb.debian.org/debian bookworm-updates main contrib non-free-firmware non-free
+deb-src	http://deb.debian.org/debian bookworm-updates main contrib non-free-firmware non-free
diff --git a/meta/conf/distro/debian-sid.list b/meta/conf/distro/debian-sid.list
index 2b8158cc..ccddf87d 100644
--- a/meta/conf/distro/debian-sid.list
+++ b/meta/conf/distro/debian-sid.list
@@ -1,2 +1,2 @@
-deb	http://deb.debian.org/debian sid main contrib non-free
-deb-src	http://deb.debian.org/debian sid main contrib non-free
+deb	http://deb.debian.org/debian sid main contrib non-free-firmware non-free
+deb-src	http://deb.debian.org/debian sid main contrib non-free-firmware non-free
-- 
2.34.1

Re: [PATCH 1/1] sources.list: add non-free-firmware repository

[Jan Kiszka]

On 02.02.23 10:51, Felix Moessbauer wrote:
> The Debian project has taken the decision in 2022-10 to
> create a new repository component non-free-firmware, and
> include its content on installation media for the upcoming
> Debian release bookworm. This has to be reflected in our
> sources.list from bookworm on.
> 
> While the non-free-firmware repository contains only the
> firmware parts, we could remove non-free as the intention
> of adding non-free was just to get the non-free firmware
> packages. However, still many firmware packages are not in
> the correct repository, so better keep non-free for now.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta/conf/distro/debian-bookworm.list | 12 ++++++------
>  meta/conf/distro/debian-sid.list      |  4 ++--
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/conf/distro/debian-bookworm.list b/meta/conf/distro/debian-bookworm.list
> index f47e46ef..cbc0ca3b 100644
> --- a/meta/conf/distro/debian-bookworm.list
> +++ b/meta/conf/distro/debian-bookworm.list
> @@ -1,8 +1,8 @@
> -deb	http://deb.debian.org/debian bookworm main contrib non-free
> -deb-src	http://deb.debian.org/debian bookworm main contrib non-free
> +deb	http://deb.debian.org/debian bookworm main contrib non-free-firmware non-free
> +deb-src	http://deb.debian.org/debian bookworm main contrib non-free-firmware non-free
>  
> -deb	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free
> -deb-src	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free
> +deb	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free-firmware non-free
> +deb-src	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free-firmware non-free
>  
> -deb	http://deb.debian.org/debian bookworm-updates main contrib non-free
> -deb-src	http://deb.debian.org/debian bookworm-updates main contrib non-free
> +deb	http://deb.debian.org/debian bookworm-updates main contrib non-free-firmware non-free
> +deb-src	http://deb.debian.org/debian bookworm-updates main contrib non-free-firmware non-free
> diff --git a/meta/conf/distro/debian-sid.list b/meta/conf/distro/debian-sid.list
> index 2b8158cc..ccddf87d 100644
> --- a/meta/conf/distro/debian-sid.list
> +++ b/meta/conf/distro/debian-sid.list
> @@ -1,2 +1,2 @@
> -deb	http://deb.debian.org/debian sid main contrib non-free
> -deb-src	http://deb.debian.org/debian sid main contrib non-free
> +deb	http://deb.debian.org/debian sid main contrib non-free-firmware non-free
> +deb-src	http://deb.debian.org/debian sid main contrib non-free-firmware non-free

sid-ports is not affected by this, right?

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH 1/1] sources.list: add non-free-firmware repository

[Moessbauer, Felix]

On Thu, 2023-02-02 at 13:51 +0100, Jan Kiszka wrote:
> On 02.02.23 10:51, Felix Moessbauer wrote:
> > The Debian project has taken the decision in 2022-10 to
> > create a new repository component non-free-firmware, and
> > include its content on installation media for the upcoming
> > Debian release bookworm. This has to be reflected in our
> > sources.list from bookworm on.
> > 
> > While the non-free-firmware repository contains only the
> > firmware parts, we could remove non-free as the intention
> > of adding non-free was just to get the non-free firmware
> > packages. However, still many firmware packages are not in
> > the correct repository, so better keep non-free for now.
> > 
> > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> > ---
> >  meta/conf/distro/debian-bookworm.list | 12 ++++++------
> >  meta/conf/distro/debian-sid.list      |  4 ++--
> >  2 files changed, 8 insertions(+), 8 deletions(-)
> > 
> > diff --git a/meta/conf/distro/debian-bookworm.list
> > b/meta/conf/distro/debian-bookworm.list
> > index f47e46ef..cbc0ca3b 100644
> > --- a/meta/conf/distro/debian-bookworm.list
> > +++ b/meta/conf/distro/debian-bookworm.list
> > @@ -1,8 +1,8 @@
> > -deb    http://deb.debian.org/debian bookworm main contrib non-free
> > -deb-src        http://deb.debian.org/debian bookworm main contrib
> > non-free
> > +deb    http://deb.debian.org/debian bookworm main contrib non-
> > free-firmware non-free
> > +deb-src        http://deb.debian.org/debian bookworm main contrib
> > non-free-firmware non-free
> >  
> > -deb    http://deb.debian.org/debian-security/ bookworm-security
> > main contrib non-free
> > -deb-src        http://deb.debian.org/debian-security/ bookworm-
> > security main contrib non-free
> > +deb    http://deb.debian.org/debian-security/ bookworm-security
> > main contrib non-free-firmware non-free
> > +deb-src        http://deb.debian.org/debian-security/ bookworm-
> > security main contrib non-free-firmware non-free
> >  
> > -deb    http://deb.debian.org/debian bookworm-updates main contrib
> > non-free
> > -deb-src        http://deb.debian.org/debian bookworm-updates main
> > contrib non-free
> > +deb    http://deb.debian.org/debian bookworm-updates main contrib
> > non-free-firmware non-free
> > +deb-src        http://deb.debian.org/debian bookworm-updates main
> > contrib non-free-firmware non-free
> > diff --git a/meta/conf/distro/debian-sid.list
> > b/meta/conf/distro/debian-sid.list
> > index 2b8158cc..ccddf87d 100644
> > --- a/meta/conf/distro/debian-sid.list
> > +++ b/meta/conf/distro/debian-sid.list
> > @@ -1,2 +1,2 @@
> > -deb    http://deb.debian.org/debian sid main contrib non-free
> > -deb-src        http://deb.debian.org/debian sid main contrib non-
> > free
> > +deb    http://deb.debian.org/debian sid main contrib non-free-
> > firmware non-free
> > +deb-src        http://deb.debian.org/debian sid main contrib non-
> > free-firmware non-free
> 
> sid-ports is not affected by this, right?

For sid-ports there is currently only main and non-free [1].
But as we only have main in our sources, no change is required (main
remains unchanged).

[1] http://deb.debian.org/debian-ports/dists/sid/

Felix
> 
> Jan
> 

Re: [PATCH 1/1] sources.list: add non-free-firmware repository

[Uladzimir Bely]

In the email from четверг, 2 февраля 2023 г. 12:51:15 +03 user Felix 
Moessbauer wrote:
> The Debian project has taken the decision in 2022-10 to
> create a new repository component non-free-firmware, and
> include its content on installation media for the upcoming
> Debian release bookworm. This has to be reflected in our
> sources.list from bookworm on.
> 
> While the non-free-firmware repository contains only the
> firmware parts, we could remove non-free as the intention
> of adding non-free was just to get the non-free firmware
> packages. However, still many firmware packages are not in
> the correct repository, so better keep non-free for now.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta/conf/distro/debian-bookworm.list | 12 ++++++------
>  meta/conf/distro/debian-sid.list      |  4 ++--
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 

Applied to next, thanks.