Merge the configuration and default-configuration directories,
using per-architecture overrides in package-list.
This requires a newer version of kernel-wedge to support
Depends_<arch> properly.
The only immediate change to debian/control is to remove the
different description for nic-modules on sparc64.
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAltG0zUACgkQ57/I7JWG
EQlb3Q//auZ2SJEu0MV/X+Mu7vjoUNZhi5VlPC2GBZaClEjrRG6iW0n2bO7fC1jd
H8HSfVXy9F3vPiTUcMXyKq6vosLh/9Ie7jH1fGOCBoT7YbLcuoVmAPpAePOv6qTX
gPdtWUvCT8lTviBX8LSFOG8zBewfcocU8MvNjIGKfu2b0CNykq5Z+yg9P7OAHaTt
cfUU44v91YYwn8eo1Asi909kK73IO0V3SpIPUvgv5K2shCS44xKI19F2FIOuWRuD
2COH0pSTV1oEjRGtkOJOzQqpEmO3sHZZfAUQTrKzxpTv43NzK80c148sd7/u6Hp1
c+CszjeI3RJSX/YDie5noyL4BfYxXb+NGcLa41YOr2l1MM01fDOxKk1L/2imr1kV
Ic73KR5h1fOD3JZmVTRwFpBgrxI9tNBQ7LP2fP666DqvMolRwr8vL5UvTqIF67l9
uf/765rIgOhg6gwW9GghbuN08gMUfB8DTlsJerNbh1LKLZ8uN+7HzXoYjn44IINn
Gbp09tQEx3lBl55zLH80MRUlo+mWlpxL2krDGrBTc/QxxDofl4ag+aRYTNmUut2+
b54PEEpe2H1h6poMVOIjQlwvhKlWEez+8Syh8XKab0ZnMHipf316pX9UMAJIBtyb
3iTjqMCgNQuraSzKT8/PfrMSV6HGfDN2FQo1vSf3kCQuigFsrA8=
=VAyl
-----END PGP SIGNATURE-----
Merge tag 'debian/4.17.6-1'
Release linux (4.17.6-1).
- Drop patches for ABI maintenance or that are already upstream
- Drop ABI reference files
This mostly affects armhf, but it should be safe to list all the
directories in the common usb-modules. The module list should now
match initramfs-tools.
Remove the redundant list of specific modules for armhf-armmp.
Many other filesystems need it but vfat no longer does. It calls
built-in UTF-8 functions directly, while nominally using nls_ascii
as its I/O charset.
So many module packages depend on core-modules already that almost
every installer image includes it.
The only obvious exceptions are the sh4 installer builds, as there
was no core-modules package on sh4. For consistency, include the
default set of modules in its kernel-image package now.
See commit 0e156c15e3 for the details
about utf8 vs. ascii iocharset for FAT. This fixes a regression with
EFI-related mounts within the Debian Installer.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
This reverts commits 80df13e527
and 742e40bb6e. They broke the build
on amd64 (and probably other architectures as well) as various
I2C bus drivers depend on modules already present in other udebs.
Karsten did a test-build on armhf and found failures due to missing modules
and directories.
* The wireless drivers from staging need to be optional; this requires
support for wildcards in optional-inclusion lines
* The check for a containing directory must only be done for non-optional
inclusion lines
Bump the kernel-wedge version requirement and add the optional-include
suffixes.
kernel-wedge is sensitive to the difference between '-' and '_' so
adding 'virtio-input ?' to input-modules had no effect.
If we really added virtio_input to input-modules then we would end up
with virtio and virtio_ring duplicated. Instead, add it to
virtio-modules like all the other virtio drivers.