HackENS/liminix-fork
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211 use correct arch

Browse source
This commit is contained in:
Daniel Barlow 2023-09-24 00:17:32 +01:00
parent 119d6ad379
commit 3205a38ac9
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/kernel-modules/default.nix
View file

@ -11,6 +11,11 @@
}: }:
let let
writeConfig = import ../kernel/write-kconfig.nix { inherit lib writeText; }; writeConfig = import ../kernel/write-kconfig.nix { inherit lib writeText; };
arch = if stdenv.isMips
then "mips"
else if stdenv.isAarch64
then "arm64"
else throw "unknown arch";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "kernel-modules"; name = "kernel-modules";
@ -25,7 +30,7 @@ in stdenv.mkDerivation {
HOST_EXTRACFLAGS = with buildPackages.pkgs; HOST_EXTRACFLAGS = with buildPackages.pkgs;
"-I${buildPackages.openssl.dev}/include -L${buildPackages.openssl.out}/lib"; "-I${buildPackages.openssl.dev}/include -L${buildPackages.openssl.out}/lib";
CROSS_COMPILE = stdenv.cc.bintools.targetPrefix; CROSS_COMPILE = stdenv.cc.bintools.targetPrefix;
ARCH = "mips"; # kernel uses "mips" here for both mips and mipsel ARCH = arch;
KBUILD_BUILD_HOST = "liminix.builder"; KBUILD_BUILD_HOST = "liminix.builder";
buildPhase = '' buildPhase = ''

7
pkgs/mac80211/default.nix
View file

@ -14,6 +14,11 @@
, lib , lib
}: }:
let let
arch = if stdenv.isMips
then "mips"
else if stdenv.isAarch64
then "arm64"
else throw "unknown arch";
openwrtSrc = fetchFromGitHub { openwrtSrc = fetchFromGitHub {
name = "openwrt-source"; name = "openwrt-source";
repo = "openwrt"; repo = "openwrt";
@ -98,7 +103,7 @@ let
which kmod cpio which kmod cpio
]); ]);
inherit CC CROSS_COMPILE; inherit CC CROSS_COMPILE;
ARCH = "mips"; # kernel uses "mips" here for both mips and mipsel ARCH = arch;
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
phases = [ phases = [