Review the kernel builder ergonomics

devices/asus-dumo/kernel/default.nix

@@ -2,15 +2,12 @@
   mobile-nixos
 , fetchFromGitHub
 , fetchgit
-, kernelPatches ? [] # FIXME
 }:
 
-(mobile-nixos.kernel-builder {
+mobile-nixos.kernel-builder {
   version = "5.8.0";
   configfile = ./config.aarch64;
 
-  hasDTB = true;
-
   src = fetchFromGitHub {
     owner = "torvalds";
     repo = "linux";
@@ -26,4 +23,4 @@
   ];
 
   isModular = false;
-})
+}

devices/asus-flo/default.nix

@@ -16,7 +16,7 @@
   };
 
   mobile.boot.stage-1 = {
-    kernel.package = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
+    kernel.package = pkgs.callPackage ./kernel { };
   };
 
   mobile.system.android.bootimg = {

devices/asus-flo/kernel/default.nix

@@ -1,15 +1,12 @@
 {
   mobile-nixos
 , fetchFromGitHub
-, kernelPatches ? [] # FIXME
 }:
 
-(mobile-nixos.kernel-builder-gcc6 {
+mobile-nixos.kernel-builder-gcc6 {
   version = "3.4.113";
   configfile = ./config.armv7;
 
-  file = "zImage";
-
   src = fetchFromGitHub {
     owner = "LineageOS";
     repo = "android_kernel_google_msm";
@@ -27,30 +24,6 @@
     ./99_framebuffer.patch
   ];
 
+  enableCompilerGcc6Quirk = true;
   isModular = false;
-
-  postPatch = ''
-    cp -v "${./compiler-gcc6.h}" "./include/linux/compiler-gcc6.h"
-  '';
-}).overrideAttrs({ postInstall ? "", ... }: {
-  installTargets = [ "zinstall" ];
-  postInstall = postInstall + ''
-    mkdir -p "$out/boot"
-
-    # FIXME factor this out properly
-    # Copies all potential output files.
-    for f in zImage-dtb Image.gz-dtb zImage Image.gz Image; do
-      f=arch/arm/boot/$f
-      [ -e "$f" ] || continue
-      echo "zImage found: $f"
-      cp -v "$f" "$out/"
-      break
-    done
-
-    mkdir -p $out/dtb
-    for f in arch/*/boot/dts/*.dtb; do
-      cp -v "$f" $out/dtb/
-    done
-
-  '';
-})
+}

devices/asus-x018d/default.nix

@@ -17,7 +17,7 @@
   };
 
   mobile.boot.stage-1 = {
-    kernel.package = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
+    kernel.package = pkgs.callPackage ./kernel { };
   };
 
   mobile.system.android = {

devices/asus-x018d/kernel/default.nix

@@ -1,21 +1,14 @@
 {
   mobile-nixos
 , fetchFromGitHub
-, kernelPatches ? [] # FIXME
 , python2
 , buildPackages
 }:
 
-let
-  inherit (buildPackages) dtc;
-in
-(mobile-nixos.kernel-builder-gcc49 {
+mobile-nixos.kernel-builder-gcc49 {
   version = "3.18.35";
   configfile = ./config.aarch64;
 
-  file = "Image.gz-dtb";
-  hasDTB = true;
-
   src = fetchFromGitHub {
     owner = "mobile-nixos";
     repo = "linux";
@@ -32,23 +25,11 @@ in
     ./0002-E262L-Green-LED-now-defaults-to-on.patch
   ];
 
-  makeFlags = [
-    "DTC_EXT=${dtc}/bin/dtc"
-  ];
-
-  isModular = false;
-
-  postPatch = ''
-    patchShebangs tools
-  '';
-
   nativeBuildInputs = [
+    # Needed for tools/dct/DrvGen.py
     python2
   ];
-}).overrideAttrs({ postInstall ? "", ... }: {
-  installTargets = [ "zinstall" "Image.gz-dtb" "install" ];
 
-  postInstall = postInstall + ''
-    cp -v "$buildRoot/arch/arm64/boot/Image.gz-dtb" "$out/"
-  '';
-})
+  isImageGzDtb = true;
+  isModular = false;
+}

devices/asus-z00t/default.nix

@@ -19,13 +19,12 @@
   };
 
   mobile.boot.stage-1 = {
-    kernel.package = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
+    kernel.package = pkgs.callPackage ./kernel { };
   };
 
   mobile.device.firmware = pkgs.callPackage ./firmware {};
 
   mobile.system.android.bootimg = {
-    dt = "${config.mobile.boot.stage-1.kernel.package}/dtbs/asus-z00t.img";
     flash = {
       offset_base = "0x10000000";
       offset_kernel = "0x00008000";

devices/asus-z00t/kernel/default.nix

@@ -1,17 +1,12 @@
 {
   mobile-nixos
 , fetchFromGitHub
-, kernelPatches ? [] # FIXME
-, dtbTool
 }:
 
-(mobile-nixos.kernel-builder-gcc6 {
+mobile-nixos.kernel-builder-gcc6 {
   version = "3.10.108";
   configfile = ./config.aarch64;
 
-  file = "Image.gz";
-  hasDTB = true;
-
   src = fetchFromGitHub {
     owner = "LineageOS";
     repo = "android_kernel_asus_msm8916";
@@ -40,27 +35,7 @@
     ./90_dtbs-install.patch
     ./99_framebuffer.patch
   ];
-
+  qcdt_dtbs = "arch/arm/boot/";
   isModular = false;
-
-  postPatch = ''
-    cp -v "${./compiler-gcc6.h}" "./include/linux/compiler-gcc6.h"
-  '';
-}).overrideAttrs({ postInstall ? "", ... }: {
-  installTargets = [ "zinstall" ];
-  postInstall = postInstall + ''
-    ${dtbTool}/bin/dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm64/boot/asus-z00t.img" "arch/arm/boot/"
-    cp "arch/arm64/boot/asus-z00t.img" "$out/dtbs/asus-z00t.img"
-
-    mkdir -p $out/dtb
-    for f in arch/*/boot/dts/*.dtb; do
-      cp -v "$f" $out/dtb/
-    done
-
-#    # FIXME: understand the specifics of why this needs to be catted together.
-#    (
-#    cd $out
-#    cat Image.gz dtb/*.dtb > vmlinuz-dtb
-#    )
-  '';
-})
+  isQcdt = true;
+}

devices/google-marlin/default.nix

@@ -16,7 +16,7 @@
   };
 
   mobile.boot.stage-1 = {
-    kernel.package = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
+    kernel.package = pkgs.callPackage ./kernel { };
   };
 
   mobile.system.android = {

devices/google-marlin/kernel/default.nix

@@ -1,20 +1,11 @@
 {
   mobile-nixos
 , fetchFromGitHub
-, kernelPatches ? [] # FIXME
-, buildPackages
 }:
 
-let
-  inherit (buildPackages) dtc;
-in
-
-(mobile-nixos.kernel-builder-gcc6 {
+mobile-nixos.kernel-builder-gcc6 {
   configfile = ./config.aarch64;
 
-  file = "Image.gz-dtb";
-  hasDTB = true;
-
   version = "3.18.140";
   src = fetchFromGitHub {
     owner = "android-linux-stable";
@@ -29,31 +20,7 @@ in
     ./99_framebuffer.patch
   ];
 
+  enableRemovingWerror = true;
+  isImageGzDtb = true;
   isModular = false;
-
-  postPatch = ''
-    # FIXME : factor out
-    (
-    # Remove -Werror from all makefiles
-    local i
-    local makefiles="$(find . -type f -name Makefile)
-    $(find . -type f -name Kbuild)"
-    for i in $makefiles; do
-      sed -i 's/-Werror-/-W/g' "$i"
-      sed -i 's/-Werror=/-W/g' "$i"
-      sed -i 's/-Werror//g' "$i"
-    done
-    )
-
-    # Remove google's default dm-verity certs
-    rm -f *.x509
-  '';
-}).overrideAttrs({ postInstall ? "", nativeBuildInputs, ... }: {
-  installTargets = [ "zinstall" "Image.gz-dtb" "install" ];
-
-  nativeBuildInputs = nativeBuildInputs ++ [ dtc ];
-
-  postInstall = postInstall + ''
-    cp -v "$buildRoot/arch/arm64/boot/Image.gz-dtb" "$out/"
-  '';
-})
+}

devices/google-walleye/default.nix

@@ -16,7 +16,7 @@
   };
 
   mobile.boot.stage-1 = {
-    kernel.package = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
+    kernel.package = pkgs.callPackage ./kernel { };
   };
 
   mobile.system.android = {