From d71140b08a4d16d7df3fb44026df060d37909cfe Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Sun, 30 Oct 2022 23:46:17 +0100 Subject: [PATCH] Move 'contrib' removal comment to git commit msg Previous commit not only replaced 'non-free' with 'non-free-firmware', it also removed the 'contrib' archive area from the sources.list. It added a note about it in the code comments, which I think is the wrong place. The 'why' of a change belongs in a git commit message, where one can be as verbose as needed. Code comments should be used to clarify the 'what' (it does) in case it would not be immediately obvious. The removal of 'contrib' totally makes sense though. We did not use it and 'contrib' and 'non-free' are not part of (official) Debian, whereas 'non-free-firmware' is now part of Debian (official media) as a consequence of the change to the Debian Social Contract following the GR vote. With this change, we only use what Debian itself would only use. Fixes: 1ffce8e6bb75dd8f2fff33d5e760184956502d10 --- generate-recipe.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/generate-recipe.py b/generate-recipe.py index 18c7d71..5f24df2 100755 --- a/generate-recipe.py +++ b/generate-recipe.py @@ -57,10 +57,6 @@ else: if suite == 'bookworm': firmware_component = 'non-free-firmware' else: - # We only need "non-free". "Contrib" was before included as well, - # as they are usually enabled together, but adding a second YAML - # element... makes the resulting code ugly and brittle. Besides, - # we don't use anything from contrib! firmware_component = 'non-free' # Extra wireless firmware: