git.iko.soy/typeable/nixpkgs
on master help sign in
linux-libre: fixing build / deblobbing (#68844)

Build was failing because we were depending on tagged versions of the deblobbing scripts. The tags are not updated and thus newer changes required won't be reflected unless the tag is re-created, which might not be reliably the case. So bumping revision and switching to use the branches to access the deblob scripts. For context, in our case the missing change is: --- /nix/store/sfc0rrhj5l44zpqgpsymq5750k5wzg8p-tags-r16790/4.19-gnu/deblob-4.19 1970-01-01 01:00:01.000000000 +0100 +++ ../deblob-4.19 2019-09-14 14:53:44.637404289 +0200 @@ -1879,7 +1879,11 @@ announce BRCMFMAC - "Broadcom IEEE802.11n embedded FullMAC WLAN driver" reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +if grep -q firmware_request_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c; then + reject_firmware_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +else + reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +fi clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h

commit2a8f7d71ce88983f14936b76a1d18ef432d65883 authorDima <43349662+d-goldin@users.noreply.github.com> dateSun 15 Sep 2019, 19:42 (7 years ago) parente6b249c
1 file changed+5−5
pkgs/os-specific/linux/kernel/linux-libre.nix+5−5
pkgs/os-specific/linux/kernel/linux-libre.nix+5−5
@@ -1,11 +1,11 @@
11{ stdenv, lib, fetchsvn, linux
22, scripts ? fetchsvn {
3− url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
3+ url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
44
55 # Update this if linux_latest-libre fails to build.
6− # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
7− rev = "16604";
8− sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51";
6+ # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ | grep -Eo 'Revision [0-9]+'
7+ rev = "16791";
8+ sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j";
99 }
1010, ...
1111}:
@@ -25,7 +25,7 @@ in linux.override {
2525 name = "${linux.name}-libre-src";
2626 src = linux.src;
2727 buildPhase = ''
28− ${scripts}/${majorMinor}-gnu/deblob-${majorMinor} \
28+ ${scripts}/${majorMinor}/deblob-${majorMinor} \
2929 ${major} ${minor} ${patch}
3030 '';
3131 checkPhase = ''