google-walleye: Update usage of kernel builder
mobile-nixos
, fetchFromGitHub
, kernelPatches ? [] # FIXME
-, buildPackages
}:
-let
- inherit (buildPackages) dtc;
-in
-
-(mobile-nixos.kernel-builder {
+mobile-nixos.kernel-builder {
configfile = ./config.aarch64;
- file = "Image.gz-dtb";
- hasDTB = true;
-
version = "4.4.230";
src = fetchFromGitHub {
owner = "android-linux-stable";
@@ -30,28 +22,7 @@ in
./0003-arch-arm64-Add-config-option-to-fix-bootloader-cmdli.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
- )
- '';
-}).overrideAttrs({ postInstall ? "", nativeBuildInputs, ... }: {
- installTargets = [ "zinstall" "Image.gz-dtb" "install" ];
-
- nativeBuildInputs = nativeBuildInputs ++ [ dtc ];
-
- postInstall = postInstall + ''
- cp -v "$buildRoot/arch/arm64/boot/Image.gz-dtb" "$out/"
- '';
-})
+}
