From bde79616d2795fcedc2d88161933713a9f37e3a7 Mon Sep 17 00:00:00 2001 From: mexisme Date: Tue, 2 Feb 2021 23:58:35 +1300 Subject: [PATCH] Remove kernel 5.10.2 --- .../surface/kernel/linux-5.10.2/default.nix | 112 ------------------ .../kernel/linux-5.10.2/linux-5.10.2.nix | 18 --- 2 files changed, 130 deletions(-) delete mode 100644 microsoft/surface/kernel/linux-5.10.2/default.nix delete mode 100644 microsoft/surface/kernel/linux-5.10.2/linux-5.10.2.nix diff --git a/microsoft/surface/kernel/linux-5.10.2/default.nix b/microsoft/surface/kernel/linux-5.10.2/default.nix deleted file mode 100644 index d4f6eb4..0000000 --- a/microsoft/surface/kernel/linux-5.10.2/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ config, lib, pkgs, ... }: -let - repos = (pkgs.callPackage ../../repos.nix {}); - # TODO: Can I append the path ./patches instead of a string? - patches = repos.linux-surface + "/patches"; - surface_kernelPatches = [ - { name = "microsoft-surface-patches-linux-5.10.2"; - patch = null; - extraConfig = '' - # - # Surface Aggregator Module - # - SURFACE_AGGREGATOR m - SURFACE_AGGREGATOR_ERROR_INJECTION n - SURFACE_AGGREGATOR_BUS y - SURFACE_AGGREGATOR_CDEV m - SURFACE_AGGREGATOR_REGISTRY m - SURFACE_ACPI_NOTIFY m - SURFACE_BATTERY m - SURFACE_DTX m - SURFACE_HID m - SURFACE_PERFMODE m - - # - # These built-in modules are required for the Surface Aggregator Module - # See: https://github.com/linux-surface/surface-aggregator-module/wiki/Testing-and-Installing - # - SERIAL_DEV_BUS y - SERIAL_DEV_CTRL_TTYPORT y - - # - # Surface Hotplug - # - SURFACE_HOTPLUG m - - # - # IPTS touchscreen - # - # This only enables the user interface for IPTS data. - # For the touchscreen to work, you need to install iptsd. - # - MISC_IPTS m - - # - # Cameras: IPU3 - # - ## TODO: Fix for kernel 5.10.2: - ##VIDEO_IPU3_IMGU m - VIDEO_IPU3_CIO2 m - CIO2_BRIDGE y - INT3472 m - - # - # Cameras: Sensor drivers - # - VIDEO_OV5693 m - ## TODO: Fix for kernel 5.10.2: - ##VIDEO_OV8865 m - - # - # Other Drivers - # - INPUT_SOC_BUTTON_ARRAY m - SURFACE_3_BUTTON m - SURFACE_3_POWER_OPREGION m - SURFACE_PRO3_BUTTON m - SURFACE_GPE m - SURFACE_BOOK1_DGPU_SWITCH m - ''; - } - { - name = "ms-surface/0001-surface3-oemb"; - patch = patches + "/5.10/0001-surface3-oemb.patch"; - } - { - name = "ms-surface/0002-wifi"; - patch = patches + "/5.10/0002-wifi.patch"; - } - { - name = "ms-surface/0003-ipts"; - patch = patches + "/5.10/0003-ipts.patch"; - } - { - name = "ms-surface/0004-surface-gpe"; - patch = patches + "/5.10/0004-surface-gpe.patch"; - } - { - name = "ms-surface/0005-surface-sam-over-hid"; - patch = patches + "/5.10/0005-surface-sam-over-hid.patch"; - } - { - name = "ms-surface/0006-surface-sam"; - patch = patches + "/5.10/0006-surface-sam.patch"; - } - { - name = "ms-surface/0007-surface-hotplug"; - patch = patches + "/5.10/0007-surface-hotplug.patch"; - } - { - name = "ms-surface/0008-surface-typecover"; - patch = patches + "/5.10/0008-surface-typecover.patch"; - } - { - name = "ms-surface/0009-cameras"; - patch = patches + "/5.10/0009-cameras.patch"; - } - ]; -in (with pkgs; recurseIntoAttrs (linuxPackagesFor ( - callPackage ./linux-5.10.2.nix { - kernelPatches = surface_kernelPatches; - } - ))) diff --git a/microsoft/surface/kernel/linux-5.10.2/linux-5.10.2.nix b/microsoft/surface/kernel/linux-5.10.2/linux-5.10.2.nix deleted file mode 100644 index 411a88d..0000000 --- a/microsoft/surface/kernel/linux-5.10.2/linux-5.10.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.10.2"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "18l1ywp99inm90434fm74w8rjfl4yl974kfcpizg2sp2p8xf311v"; - }; -} // (args.argsOverride or {}))