This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=9a49b82b7b72ab0dd69862185da6797bd753974e commit 9a49b82b7b72ab0dd69862185da6797bd753974e Author: Guillem Jover <guil...@debian.org> AuthorDate: Sat Mar 4 22:56:51 2023 +0100 dselect: Add non-free-firmware archive area support In Debian this is a new archive area added after the vote for non-free firmware <https://www.debian.org/vote/2022/vote_003>. --- dselect/methods/Dselect/Ftp.pm | 12 +++++++++--- dselect/methods/file/desc.file | 3 ++- dselect/methods/file/setup.sh | 3 +++ dselect/methods/media/README.media | 7 ++++++- dselect/methods/media/setup.sh | 4 ++++ 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dselect/methods/Dselect/Ftp.pm b/dselect/methods/Dselect/Ftp.pm index 733087e2c..5f684ab8e 100644 --- a/dselect/methods/Dselect/Ftp.pm +++ b/dselect/methods/Dselect/Ftp.pm @@ -181,9 +181,15 @@ sub add_site { chomp $email; my $dir = '/debian'; - push (@{$CONFIG{site}}, [ '', $dir, [ 'dists/stable/main', - 'dists/stable/contrib', - 'dists/stable/non-free' ], + push (@{$CONFIG{site}}, [ + '', + $dir, + [ + 'dists/stable/main', + 'dists/stable/contrib', + 'dists/stable/non-free-firmware', + 'dists/stable/non-free', + ], $pas, $user, $email ]); edit_site($CONFIG{site}[@{$CONFIG{site}} - 1]); } diff --git a/dselect/methods/file/desc.file b/dselect/methods/file/desc.file index 5f5acf91e..028d099d9 100644 --- a/dselect/methods/file/desc.file +++ b/dselect/methods/file/desc.file @@ -2,7 +2,8 @@ Installation from a directory on the filesystem. The area you are installing from should contain the Packages.gz file from each distribution area being installed (usually main and optionally -contrib and non-free) as well as the corresponding binary/*/*.deb files. +contrib, non-free-firmware and non-free) as well as the corresponding +binary/*/*.deb files. The easiest way to do get this is to make a (partial) copy of the distribution site's directory hierarchy, if possible. diff --git a/dselect/methods/file/setup.sh b/dselect/methods/file/setup.sh index 2f04aa2ea..a7212f49e 100755 --- a/dselect/methods/file/setup.sh +++ b/dselect/methods/file/setup.sh @@ -278,6 +278,7 @@ Where is the _$1_ 'Packages' file (if none is available, say 'none') find_area main main main "$p_main_binary" "$p_main_packages" find_area contrib ctb contrib "$p_ctb_binary" "$p_ctb_packages" +find_area non-free-firmware nff non-free-firmware "$p_nff_binary" "$p_nff_packages" find_area non-free nf non-free "$p_nf_binary" "$p_nf_packages" find_area local lcl local "$p_lcl_binary" "$p_lcl_packages" @@ -297,6 +298,8 @@ outputparam p_ctb_packages "$ctb_packages" outputparam p_ctb_binary "$ctb_binary" outputparam p_nf_packages "$nf_packages" outputparam p_nf_binary "$nf_binary" +outputparam p_nff_packages "$nff_packages" +outputparam p_nff_binary "$nff_binary" outputparam p_lcl_packages "$lcl_packages" outputparam p_lcl_binary "$lcl_binary" diff --git a/dselect/methods/media/README.media b/dselect/methods/media/README.media index 468daa85f..42be9418e 100644 --- a/dselect/methods/media/README.media +++ b/dselect/methods/media/README.media @@ -8,10 +8,12 @@ Installation method for multiple binary media Acquiring package data --------------------- - It is possible to access up to four binary directories within «dists/stable»: + It is possible to access the following binary directories within + «dists/stable»: . main . contrib + . non-free-firmware . non-free . local @@ -67,6 +69,7 @@ Sample Layout binary-amd64/Packages.cd.gz binary-amd64/net/foo.deb contrib/binary-amd64/Packages.cd.gz + non-free-firmware/binary-amd64/Packages.cd.gz non-free/binary-amd64/Packages.cd.gz Media disc 2 .disk/info = "Debian GNU/Linux contrib-amd64" @@ -74,11 +77,13 @@ Sample Layout contrib/binary-all/ binary-amd64/Packages.cd.gz binary-amd64/net/foo.deb + non-free-firmware/binary-amd64/Packages.cd.gz non-free/binary-amd64/Packages.cd.gz Media disc 3 .disk/info = "Debian GNU/Linux non-free-amd64" dists/stable/main/binary-amd64/Packages.cd.gz contrib/binary-amd64/Packages.cd.gz + non-free-firmware/binary-amd64/Packages.cd.gz non-free/binary-all/ binary-amd64/Packages.cd.gz binary-amd64/net/foo.deb diff --git a/dselect/methods/media/setup.sh b/dselect/methods/media/setup.sh index aad55a111..5bf36422c 100755 --- a/dselect/methods/media/setup.sh +++ b/dselect/methods/media/setup.sh @@ -452,6 +452,7 @@ Where is the _$1_ 'Packages.cd' file (if none is available, say 'none') find_area main main "$distribution" "$p_main_binary" "$p_main_packages" find_area contrib ctb "$distribution" "$p_ctb_binary" "$p_ctb_packages" +find_area non-free-firmware nff "$distribution" "$p_nff_binary" "$p_nff_packages" find_area non-free nf "$distribution" "$p_nf_binary" "$p_nf_packages" find_area local lcl local "$p_lcl_binary" "$p_lcl_packages" @@ -472,6 +473,9 @@ outputparam p_main_disk "$main_disk" outputparam p_ctb_packages "$ctb_packages" outputparam p_ctb_binary "$ctb_binary" outputparam p_ctb_disk "$ctb_disk" +outputparam p_nff_packages "$nff_packages" +outputparam p_nff_binary "$nff_binary" +outputparam p_nff_disk "$nff_disk" outputparam p_nf_packages "$nf_packages" outputparam p_nf_binary "$nf_binary" outputparam p_nf_disk "$nf_disk" -- Dpkg.Org's dpkg
