vcswatch reports that
this package seems to have a new changelog entry (version
20241110-1, distribution
UNRELEASED) and new commits
in its VCS. You should consider whether it's time to make
an upload.
Here are the relevant commit messages:
commit 5757a4892077a33860c5698b44719c5f5080ceb6
Merge: e758341 09dcc23
Author: Ben Hutchings <benh@debian.org>
Date: Sun Dec 1 03:55:39 2024 +0000
Merge branch 'update' into 'debian/latest'
Update to current upstream and linux-support versions
See merge request kernel-team/firmware-free!5
commit 09dcc23d33dbf9ca4cd575bc9d1edf4cf2840f49
Author: Ben Hutchings <benh@debian.org>
Date: Mon Nov 25 17:54:05 2024 +0100
Update to linux-support-6.11.10
commit 9e636012fa1f261d4ede1454f2146ee56624457c
Author: Ben Hutchings <benh@debian.org>
Date: Mon Oct 7 23:49:35 2024 +0200
Update to linux-support-6.11.2
d/b/gencontrol.py: Delete GenControl.do_extra now that the superclass
implementation is fixed.
[Cherry-picked from firmware-nonfree commit
54daab9becda0c17a2e3e8ae58e7f826d5810da6]
commit b74da60a8578ce553d95322d5202dd010d4248f9
Author: Ben Hutchings <benh@debian.org>
Date: Sat Sep 21 22:50:11 2024 +0200
d/salsa-ci.yml: Use uscan option to speed up Git export with Files-Excluded
uscan currently does both:
1. Generate a tarball from Git, since the upstream for a Debian
source package must be a tarball.
2. Generate a second tarball with file exclusions applied.
This is rather inefficient. However, the latest version added the
option to make the first tarball uncompressed. Since we don't store
the first tarball, this is fine for us.
Use the environment variable to enable this option, since (a) we don't
run uscan directly but through origtargz (b) this will be safely
ignored when building in an older suite where uscan doesn't support
this.
[Cherry-picked from firmware-nonfree commit
33a5936a8e85e1d09a24092c92dd86257ff9715a. Set the variable globally
here since we don't customise the jobs.]
commit 25db868aa44a73e0825e16f7868ffadc05110666
Author: Ben Hutchings <benh@debian.org>
Date: Sat Sep 21 22:35:14 2024 +0200
d/watch: Tighten tag regexp to work with upstream as a remote
When debian/watch uses the 'git' method, and the current directory is
a Git repository with the upstream URL as a remote, uscan will scan
the local repository rather than cloning from that URL.
Currently this doesn't work because we match tags with arbitary names
as versions, which would include Debian tagged versions. Change the
regexp to only match upstream tags.
[Cherry-picked from firmware-nonfree commit
c587ff9bb30de08c3fc12ba053075f7e67dafb4b]
commit 8a71acdb0805ea308ce8d2cc06ba22822d77a784
Author: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Date: Fri Sep 6 05:03:42 2024 +0300
d/bin/check_upstream: allow Apache-2.0 licence
The Apache-2.0 licence allows distributing files in binary form, without
corresponding source, so add it as a licence permitting redistribution.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
[Cherry-picked from firmware-nonfree commit
1f37e2c305ab9a96b8da7160854a54e74cfa015e]
commit 556f231fafae6c9e231266e41323abae924cb7ea
Author: Ben Hutchings <benh@debian.org>
Date: Sat Aug 31 21:22:08 2024 +0200
Update to linux-support-6.10.6
* d/rules.defs: Update KERNELVERSION.
* d/b/gencontrol.py:
- Use dataclasses for BinaryPackage and Template.
- Use read_deb822 and write_deb822 functions; delete write_rfc822
method.
- Define BinaryPackage subclass adding the 'Homepage' field missing
from BinaryPackage in linux-support.
- Override do_extra method because this is currently broken in
linux-support.
* d/t/extra.control.in: Delete 'Meta-Rules-Target' fields which are
now set by gencontrol.
[Cherry-picked from firmware-nonfree commit
2840e5a7697e909d2b58b1a9a6a3bedaf95f3854. Dropped changes in
debian/templates/extra.control.in which was empty here.]
commit 19269ad8a34e31fe7649561fa90acdb5ceea4aec
Author: Ben Hutchings <benh@debian.org>
Date: Sat Aug 31 21:14:59 2024 +0200
Use linux-support bundle API to replace much custom logic
In preparation for updating to a new version of linux-support, stop
overriding so many Gencontrol methods and use the new(ish) bundle API.
* d/rules.real: Replace 'binary-indep' target with 'binary_generic'
and 'binary_meta' targets, following the convention required by
bundles.
* d/templates:
- Rename control template files to follow the convention required by
bundles.
- Add 'Meta-Rules-Target' field to each control stanza.
* d/b/gencontrol.py:
- Move custom logic from __call__() down to do_main().
- In do_package(), use self.add_packages() to add the package.
Drop makefile and packages parameters.
- In do_main(), stop adding now-redundantmakefile rules.
- Delete now-redundant __call__(), do_source(), do_extra(),
write(), write_conrol(), and write_makefile() functions.
* d/b/gencontrol.py, d/rules.real: Substitute commas in FILES and
LINKS variables. As each command is wrapped in an if_package macro
invocation, we can't include commas in the command.
[Cherry-picked from firmware-nonfree commit
45a42e28f92c7fb66b92420670436e5cae974450. Dropped changes in
debian/templates/control.extra.in which was empty here.]
commit d504582389e7e87a61f58da729d2ab341f759f50
Author: Ben Hutchings <benh@debian.org>
Date: Sat Aug 31 17:16:43 2024 +0200
d/b/gencontrol.py: Stop using unnecessary PackageDescription subclass
This subclass was necessary to include file lists in the description
without wrapping them as a single paragraph. Now we don't include
file lists and it is not needed.
[Cherry-picked from firmware-nonfree commit
36eb65eeb88e915b4bc93c7a2980ebeff9209d63]
commit d759aa3b212e63bf3fb57eb370f227f20c09fd06
Author: Ben Hutchings <benh@debian.org>
Date: Fri Jul 26 18:43:44 2024 +0200
d/b/update-modinfo: Support reading from multiple kernel directories
So far we've been adding modinfo from the amd64 flavour, but there are
many drivers that want firmware and are only included on other
architectures.
- Maintain the module aliases and firmware names as sets, so they can
easily be combined.
- Add a JSONEncoder subclass that handles sets by converting them to
sorted lists, and use it.
- Accept multiple kernel directory/release arguments, iterating over
them all and combining information when the same module name is
found repeatedly.
[Cherry-picked from firmware-nonfree commit
1602494624ba0d00a1aae15c1e7d7af27a1abfda]
commit b252bab551db40056444f95961d50e3f1bd9e368
Author: Ben Hutchings <benh@debian.org>
Date: Sat Jul 6 01:31:28 2024 +0200
d/b/check_upstream.py: Match another wording of permission to redistribute
This is needed to make the go7007 licence text acceptable.
commit bf986681afaa239ba3980f119c609c2f0312a092
Author: Ben Hutchings <benh@debian.org>
Date: Sat Jul 6 01:28:18 2024 +0200
d/b/check_upstream.py: Treat .txt files as being source code
Some driver configuration files loaded as firmware are actually plain
text files, and some of those are under GPL v2. As with .cis files,
assume that files with the extension .txt are the "preferred form for
modification", and so are redistributable without a separate source
file.
[Cherry-picked from firmware-nonfree commit
26bae8082d6c6f4d4dd247dd6e1d22a001763320]
commit 9d3f282891177dac9fed2548d20891ae4f0ff9cf
Author: Ben Hutchings <benh@debian.org>
Date: Sun Jun 30 22:10:53 2024 +0200
d/b/check_upstream.py: Handle missing Licen[cs]e field
There is now an entry in WHENCE with no licence stated. Treat
this as undistributable.
[Cherry-picked from firmware-nonfree commit
04f1eedc76f4044762cacb389c48edbed5589981]
commit e860dcd321a39f9384ec98b64dbd08d8ae487b12
Author: Ben Hutchings <benh@debian.org>
Date: Tue Jun 18 01:58:59 2024 +0200
Remove file lists from package descriptions
Remove generation of file lists in debian/bin/gencontrol.py, and the
file descriptions in debian/config, because:
- Firmware packages are now usually found through the AppStream/
DEP-11 metadata. It is no longer important to also list files in
package descriptions.
- The descriptions of individual files also required a large amount of
manual effort to keep up-to-date.
- The grouping of files and symlinks to them in the description no
longer works as intended, because copy-firmware.sh now also de-dupes
files using symlinks.
[Cherry-picked from firmware-nonfree commit
0a3c14827c2f9d193c6363bc5965c02eb0f7cb39. Deleted descriptions from
debian/config/linux-free/defines.]
commit 454c43e3c2860fa4f104ec544170b080f64bf14d
Author: Ben Hutchings <benh@debian.org>
Date: Tue Jun 18 01:40:27 2024 +0200
d/b/gencontrol.py: Delete unused files_real template variable
The 'files_real' variable is now being set to a list of file patterns,
which is not very useful. But it hasn't been used for over 15 years,
so delete it.
[Cherry-picked from firmware-nonfree commit
0583a55d7d0229c1269a5f0a254aff488aa3ae88]
commit 552abe206b4e3a7d96ceca95a4b28a03ecdd4cf9
Author: Ben Hutchings <benh@debian.org>
Date: Tue Jun 18 01:09:37 2024 +0200
Build-Depend on rdfind, needed by new version of copy-firmware.sh
It turns out that there are duplicate firmware files in linux-firmware
with different names, that aren't just symlinks defined in WHENCE.
copy-firmware.sh will now de-duplicate these at installation time
using rdfind, so add it to Build-Depends.
Also update salsa-ci.yml to install it in the extract-source job.
[Cherry-picked from firmware-nonfree commit
e537ea31709bdeb537fb609547863d1f90edbbb4. Added rdfind to
debian/bin/gbp-postexport-hook instead of debian/salsa-ci.yml.]
commit f0f801136f6549edf389971936842f1d8a71deb3
Author: Ben Hutchings <benh@debian.org>
Date: Fri Jun 28 23:38:05 2024 +0200
Change maintainer script templating to support multiple templates per script
Currently we assume there is only one template for each maintainer
script that produces the whole file, but that assumption is about to
break. To allow for multiple templates per script:
- In gencontrol.py, build up per-script lists of template expansions
and write the script files only after we've processed all the
script templates.
- Generate the fixed top (shebang and set -e) and bottom (debhelper
placeholder and exit) of the script in gencontrol.py, not in the
templates.
These changes are extracted from Helmut Grohne's patch in bug #1073832.
[Cherry-picked from firmware-nonfree commit
5fa04fa64243457dc96242e6d765089c3c628ae4. Dropped change to
debian/templates/preinst.license.in which does not exist here.]
commit 689f776fe5dd97d2c158606b2f47005ca293ce8d
Author: Ben Hutchings <benh@debian.org>
Date: Mon Nov 25 18:29:27 2024 +0100
d/config: Use wildcard in file list
Replace the file list in debian/config/linux-free/defines with '**/*',
as all firmware that hasn't been excluded should go into this package.
This doesn't make any immediate functional change.
commit 37cfaba28389069809163389dc690f55cf30270a
Author: Ben Hutchings <benh@debian.org>
Date: Thu May 16 18:11:13 2024 +0200
d/b/{gencontrol,check_upstream}.py: Support wildcards in file lists
Add support for wildcards in the files list, so it's not necessary to
list every single file that's added. Also add a files-excluded field,
to allow excluding unwanted files that match a broad pattern.
This is more complicated than it ought to be because:
- pathlib.Path.glob() currently uses the wrong stat() variant and does
not list the dangling symlinks that are present in some per-package
config directories. We already do a directory walk to find all
files and report unused ones, so match against that file list rather
than globbing.
- pathlib.Path.glob() supports the '**' wildcard but the match()
method does not. Implement our own translation of patterns to
regexps instead of using match().
Update the generation of FILES and LINKS variables in rules.gen to
work for filenames that have spaces in them, which could not be
specified in file lists but can now be matched by wildcards.
Thanks: James Addison <jay@jp-hosting.net>
Closes: #1035505
[Cherry-picked from firmware-nonfree commit
e93e3156d922238517cb922f1099625e8e22a412. Don't close the bug here
since it was not filed against firmware-free.]
commit 12086426c87ce086f595f3b69195d22e4ac1f0c6
Author: Ben Hutchings <benh@debian.org>
Date: Thu May 16 17:39:37 2024 +0200
d/b/gencontrol.py: Use path objects where possible
[Cherry-picked from firmware-nonfree commit
7b6aad4187217ed3172c6be5f9477826c61106fe]
commit 71dd010c8c824a224a87e01d2f6db325553ff686
Author: Ben Hutchings <benh@debian.org>
Date: Thu May 16 17:09:02 2024 +0200
d/b/gencontrol.py: Remove check for .svn directories
I don't think we need to bother with Subversion support any more.
[Cherry-picked from firmware-nonfree commit
5c3e6973289cb010c6f4071dda5dee4cdb474fee]
commit d32dbc7b2eaedd99d691f6121ce1e3a48d72b6f4
Author: Ben Hutchings <benh@debian.org>
Date: Thu May 16 16:39:45 2024 +0200
d/b/gencontrol.py: Remove support for encoding file version in filename
When firmware-nonfree was a native package, some firmware was included
with its version included in the filename. The version would be
included in package metadata but not in the installed filename.
This feature is no longer used and would complicate support for
including files by wildcard, so remove it.
[Cherry-picked from firmware-nonfree commit
658f5e733956a87bf392eafd2c54938c3ce9d6f5]
commit d78d6e20060f78eb288c07833be031a025ebcba6
Author: Diederik de Haas <didi.debian@cknow.org>
Date: Sat Jan 13 17:35:16 2024 +0100
d/README.source: Update description wrt upstream
Previously it mentioned that upstream did not make tagged releases, but
that has changed (since 20190312), so update the description to reflect
that.
Also change the upstream URL from git to https protocol.
The https variant is easier to use for most people, it's used in
``debian/watch`` and via that URL one can find the git variant too.
Also remove "``" which is used in Markdown to indicate code, but this is
not Markdown.
[Cherry-picked from firmware-nonfree commit
9bd9a1fc4b785dc2f969fa9e07023b47e0b5396d]
commit c0a1b9336e7cdcc4c3c6c750137695b3ba529029
Author: Diederik de Haas <didi.debian@cknow.org>
Date: Mon Feb 12 14:13:42 2024 +0100
d/bin/update-modinfo: Add compressed modules support
Since kernel version 6.6.3-1_exp1 the kernel modules get xz-compressed,
so check ``.ko.xz`` files first. If they don't exist, check ``.ko``
files as before for backward compatibility.
[Cherry-picked from firmware-nonfree commit
87bd7c03ee8fd54751c8f3cd6e4be2ca430ad4d2]
commit 18aab45e85d98243c8310bae97153fbb32417824
Author: Ben Hutchings <benh@debian.org>
Date: Sun May 17 23:46:49 2020 +0100
debian/rules, debian/bin/gencontrol.py: Run copy-firmware.sh to create symlinks
Doing this at source preparation time is nasty, but to improve on this
I would have to first update the WHENCE parser which for silly reasons
lives in src:linux.
[Cherry-picked from firmware-nonfree commit
ddd89bd0a2450e84f06e7a5ac3b534672e2e65c4]
commit 9cc29f4a2c1bb5fb153f6a869236be92fbe01a92
Author: Ben Hutchings <benh@debian.org>
Date: Mon Nov 25 21:07:49 2024 +0100
d/b/gbp-postexport-hook: Apply patches before invoking debian/rules
We need to apply the previously added patches before running
"debian/rules debian/control-real", which will in future run
copy-firmware.sh.
commit 6509d6816068f406347cf74b19682fef5a819019
Author: Ben Hutchings <benh@debian.org>
Date: Mon Nov 25 18:58:17 2024 +0100
Add WHENCE file
We need a WHENCE file to run copy-firmware.sh, but the license of
WHENCE is unclear so it's not currently included in the orig tarball.
Add a simple file list that's enough for copy-firmware.sh to work.
commit fa668b1677ecdd645cca10039dc0df89da702961
Author: Ben Hutchings <benh@debian.org>
Date: Mon Nov 25 18:57:26 2024 +0100
Revert "copy-firmware.sh: call ./check_whence.py before parsing the file"
check_whence.py will fail when run in firmware-free, due to the
addition of the debian/ directory and the exclusion of many files.
Also, we currently exclude check_whence.py itself from the orig
tarball.
commit e761e12f294c197548522f9089df2b3f2d014b45
Author: Ben Hutchings <benh@debian.org>
Date: Mon Nov 25 18:06:11 2024 +0100
Update to 20241110
We need a new orig tarball including copy-firmware.sh. Update to the
latest upstream version, although this doesn't include any changes to
the free firmware.
commit f64194cb3008e73bf15c47bfbadfc4b38d6ab34e
Author: Ben Hutchings <benh@debian.org>
Date: Mon Nov 25 18:00:52 2024 +0100
d/copyright: Include copy-firmware.sh under GPL-2
We need to run copy-firmware.sh to be consistent with
firmware-nonfree. The license of copy-firmware.sh is now explciitly
GPL-2 so this is no longer a problem.
commit 18bdac597378e05d9192ae0877db225b844d2976
Author: Ben Hutchings <benh@debian.org>
Date: Mon Nov 25 18:23:51 2024 +0100
d/copyright: Add paragraph for contrib/templates/debian.*
![[bug history graph]](https://qa.debian.org/data/bts/graphs/f/firmware-free.png){kind=link}