colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

moby: build w/o full config -- just pmos + nixpkgs

Browse Source 
this *should* make iteration (of reducing kernel patches) a little quicker

this is the eventual goal, though in the meantime it may be quicker iteration to build with *only* pmos config and no full config
This commit is contained in:
Colin
2024-09-16 07:50:24 +00:00
parent 9fcbd6e7e2
commit e23429eebe
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/modules/hal/pine64/kernel.nix
View File

@@ -41,7 +41,7 @@ in
boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux-armbian.override { boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux-armbian.override {
usePmosConfig = true; usePmosConfig = true;
withNixpkgsConfig = true; withNixpkgsConfig = true;
withFullConfig = true; withFullConfig = false;
withModemPower = true; withModemPower = true;
}); });

34
pkgs/additional/linux-armbian/default.nix
View File

@@ -9,7 +9,7 @@
sane-kernel-tools, sane-kernel-tools,
usePmosConfig ? true, usePmosConfig ? true,
withNixpkgsConfig ? true, withNixpkgsConfig ? true,
withFullConfig ? true, withFullConfig ? false,
withModemPower ? true, withModemPower ? true,
#VVV nixpkgs calls `.override` on the kernel to configure additional things, but we don't care about those things #VVV nixpkgs calls `.override` on the kernel to configure additional things, but we don't care about those things
... ...
@@ -311,23 +311,23 @@ linux_latest.override {
# byName."Update-defconfigs" # byName."Update-defconfigs"
] ++ ] ++
lib.optionals withFullConfig [ lib.optionals withFullConfig [
{ # {
name = "fix-compilation-specific-to-megi"; # name = "fix-compilation-specific-to-megi";
patch = null; # patch = null;
extraStructuredConfig = with lib.kernel; { # extraStructuredConfig = with lib.kernel; {
### BUILD FIXES, NOT SPECIFIC TO MY PREFERENCES # ### BUILD FIXES, NOT SPECIFIC TO MY PREFERENCES
# # #
# disabling the sun5i_eink driver avoids this compilation error: # # disabling the sun5i_eink driver avoids this compilation error:
# CC [M] drivers/video/fbdev/sun5i-eink-neon.o # # CC [M] drivers/video/fbdev/sun5i-eink-neon.o
# aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfloat-abi=softfp' # # aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfloat-abi=softfp'
# aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfpu=neon' # # aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfpu=neon'
# make[3]: *** [../scripts/Makefile.build:289: drivers/video/fbdev/sun5i-eink-neon.o] Error 1 # # make[3]: *** [../scripts/Makefile.build:289: drivers/video/fbdev/sun5i-eink-neon.o] Error 1
FB_SUN5I_EINK = no; # FB_SUN5I_EINK = no;
BES2600 = no; # fails to compile (implicit declaration of function 'ieee80211_tx_status'; did you mean 'ieee80211_tx_status_ni') # BES2600 = no; # fails to compile (implicit declaration of function 'ieee80211_tx_status'; did you mean 'ieee80211_tx_status_ni')
# SUN8I_DE2_CCU = lib.mkForce module; #< want:y, got:M # # SUN8I_DE2_CCU = lib.mkForce module; #< want:y, got:M
}; # };
} # }
# { # {
# name = "fix-no-display"; # name = "fix-no-display";
# patch = null; # patch = null;