Bug#982757: firmware-brcm80211: [REGRESSION] brcm/brcmfmac43340-sdio.bin missing in sid (20210208-1)
On Tue, Feb 16, 2021 at 11:46:26PM +0100, maximilian attems wrote:
> > Actually I think the problem is this commit:
> > https://salsa.debian.org/kernel-team/firmware-nonfree/-/commit/9c597cb850e77c2bff39378503849a92ff522353
>
> this commit is just fine, the debian package just needs to have the
> corresponding symlinks to the newer version.
FYI I've now tested reverting that commit and the symlinks are back:
Here's the sid vs sid+revert binary package content (files) diff:
--- fbr-sid-files.txt 2021-02-17 09:39:13.679336856 +0100
+++ fbr-sid-rev9c597cb850e7-files.txt 2021-02-17 10:00:12.730055901 +0100
@@ -63,4 +63,13 @@
./usr/share/doc/firmware-brcm80211/copyright
./usr/share/metainfo/
./usr/share/metainfo/firmware-brcm80211.metainfo.xml
+./lib/firmware/brcm/brcmfmac43340-sdio.bin
+./lib/firmware/brcm/brcmfmac43362-sdio.bin
+./lib/firmware/brcm/brcmfmac4339-sdio.bin
+./lib/firmware/brcm/brcmfmac43430-sdio.bin
+./lib/firmware/brcm/brcmfmac43455-sdio.bin
+./lib/firmware/brcm/brcmfmac4354-sdio.bin
+./lib/firmware/brcm/brcmfmac4356-pcie.bin
./lib/firmware/brcm/brcmfmac4356-sdio.bin
+./lib/firmware/brcm/brcmfmac43570-pcie.bin
+./lib/firmware/brcm/brcmfmac4373-sdio.bin
And yes, they are all symlinks... eg from the patched/rebuilt package:
$ dpkg -c patched/firmware-brcm80211_20210208-1_all.deb | grep brcmfmac43340-sdio
lrwxrwxrwx root/root 0 2021-02-17 09:58 ./lib/firmware/brcm/brcmfmac43340-sdio.bin -> ../cypress/cyfmac43340-sdio.bin
Note also that this is definitely not a general problem with symlinks
as even the existing package in sid has atleast one symlink in it still:
$ dpkg -c sid/firmware-brcm80211_20210208-1_all.deb | grep -- '->'
lrwxrwxrwx root/root 0 2021-02-09 11:15 ./lib/firmware/brcm/brcmfmac4356-sdio.bin -> ../cypress/cyfmac4356-sdio.bin
The problem is simply that the symlinks are being installed into
debian/build/install/ but then they are not moved over to the
debian/firmware-brcm80211 directory to be included in the binary package.
It might be helpful to improve the packaging logic so files are /moved/
from debian/build/install/ into the respective binary package directory
and then fail the build if debian/build/install/ still contains anything
(ie. similar to --fail-missing in generic dh packages).
Regards,
Andreas Henriksson
Reply to: