DGNum/liminix
14
0
Fork 2
Code Issues 15 Pull requests 7 Projects Releases Packages Wiki Activity Actions

move regulatory.db to wlan module

Browse source
This commit is contained in:
Daniel Barlow 2023-03-07 21:32:21 +00:00
parent b65a405a43
commit e8d5e4c788
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devices/gl-ar750/default.nix
View file

@ -58,7 +58,6 @@
phases = ["installPhase"]; phases = ["installPhase"];
installPhase = '' installPhase = ''
mkdir -p $out/ath10k/QCA9887/hw1.0/ mkdir -p $out/ath10k/QCA9887/hw1.0/
cp ${pkgs.wireless-regdb}/lib/firmware/regulatory.db* $out/
blobdir=${firmwareBlobs}/QCA9887/hw1.0 blobdir=${firmwareBlobs}/QCA9887/hw1.0
cp $blobdir/10.2.4-1.0/firmware-5.bin_10.2.4-1.0-00047 $out/ath10k/QCA9887/hw1.0/firmware-5.bin cp $blobdir/10.2.4-1.0/firmware-5.bin_10.2.4-1.0-00047 $out/ath10k/QCA9887/hw1.0/firmware-5.bin
cp $blobdir/board.bin $out/ath10k/QCA9887/hw1.0/ cp $blobdir/board.bin $out/ath10k/QCA9887/hw1.0/
@ -120,7 +119,6 @@
filesystem = dir { filesystem = dir {
lib = dir { lib = dir {
firmware = dir { firmware = dir {
"regulatory.db" = symlink "${firmware}/regulatory.db";
ath10k = dir { ath10k = dir {
QCA9887 = symlink "${firmware}/ath10k/QCA9887"; QCA9887 = symlink "${firmware}/ath10k/QCA9887";
"cal-pci-0000:00:00.0.bin" = symlink "${ath10k_cal_data}/.outputs/data"; "cal-pci-0000:00:00.0.bin" = symlink "${ath10k_cal_data}/.outputs/data";

4
devices/gl-mt300a/default.nix
View file

@ -13,8 +13,8 @@
description = '' description = ''
WiFi on this device is provided by the rt2800soc module. It WiFi on this device is provided by the rt2800soc module. It
expects firmware to be present in the "???" MTD partition, so - expects firmware to be present in the "factory" MTD partition, so
assuming we want to use the wireless - we need to build MTD - assuming we want to use the wireless - we need to build MTD
support into the kernel even if we're using TFTP root support into the kernel even if we're using TFTP root
''; '';

17
modules/wlan.nix
View file

@ -2,9 +2,24 @@
let let
inherit (lib) mkEnableOption mkOption types isDerivation hasAttr ; inherit (lib) mkEnableOption mkOption types isDerivation hasAttr ;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
inherit (pkgs) busybox; inherit (pkgs) stdenv busybox wireless-regdb;
regulatory = stdenv.mkDerivation {
name = "regulatory.db";
phases = ["installPhase"];
installPhase = ''
mkdir -p $out
cp ${wireless-regdb}/lib/firmware/regulatory.db $out/
'';
};
in { in {
config = { config = {
filesystem = dir {
lib = dir {
firmware = dir {
"regulatory.db" = symlink "${regulatory}/regulatory.db";
};
};
};
kernel = rec { kernel = rec {
config = { config = {
# Most of this is necessary infra to allow wireless stack/ # Most of this is necessary infra to allow wireless stack/