From 47a130b0858702e8d3215e3545078cdf1dbff182 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 25 May 2023 22:40:08 +0000 Subject: linux.configfile: remove unused kernelTarget attr As far as I can tell this is unused since f95d214cfdf. Fixes: f95d214cfdf ("Implement generic kernel build via manual-config") Fixes: https://github.com/NixOS/nixpkgs/issues/234084 --- pkgs/os-specific/linux/kernel/generic.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs/os-specific/linux/kernel/generic.nix') diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 56d89f67c64..86da8a81bd4 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -131,8 +131,6 @@ let platformName = stdenv.hostPlatform.linux-kernel.name; # e.g. "defconfig" kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig; - # e.g. "bzImage" - kernelTarget = stdenv.hostPlatform.linux-kernel.target; makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags ++ extraMakeFlags; -- cgit 1.4.1 From 673605c4e4223b68709dc8603675c0e651c93c3a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 30 Apr 2023 23:25:46 -0700 Subject: linux: allow to omit the common-config.nix --- pkgs/os-specific/linux/kernel/generic.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/os-specific/linux/kernel/generic.nix') diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a21890a38ca..74c47db6256 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -25,6 +25,10 @@ # Additional make flags passed to kbuild , extraMakeFlags ? [] +, # enables the options in ./common-config.nix; if `false` then only + # `structuredExtraConfig` is used + enableCommonConfig ? true + , # kernel intermediate config overrides, as a set structuredExtraConfig ? {} @@ -183,7 +187,9 @@ let moduleStructuredConfig = (lib.evalModules { modules = [ module + ] ++ lib.optionals enableCommonConfig [ { settings = commonStructuredConfig; _file = "pkgs/os-specific/linux/kernel/common-config.nix"; } + ] ++ [ { settings = structuredExtraConfig; _file = "structuredExtraConfig"; } ] ++ structuredConfigFromPatches -- cgit 1.4.1