From 17d99c500b93c773bbbe6c3706724f38063ee96c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 11 Oct 2023 13:13:59 +0200 Subject: [PATCH] linux_hardkernel_4_14: remove --- .../linux/kernel/linux-hardkernel-4.14.nix | 41 ------------------- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 4 -- pkgs/top-level/linux-kernels.nix | 11 ----- 4 files changed, 57 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix deleted file mode 100644 index 69bbdf648d22..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ buildPackages, fetchFromGitHub, fetchurl, perl, buildLinux, libelf, util-linux, kernelPatches ? [], ... } @ args: - -buildLinux (args // rec { - version = "4.14.180-176"; - - # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.180"; - - # branchVersion needs to be x.y. - extraMeta.branch = "4.14"; - - src = fetchFromGitHub { - owner = "hardkernel"; - repo = "linux"; - rev = version; - sha256 = "0n7i7a2bkrm9p1wfr20h54cqm32fbjvwyn703r6zm1f6ivqhk43v"; - }; - - kernelPatches = args.kernelPatches ++ [{ - name = "usbip-tools-fno-common"; - patch = fetchurl { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a"; - hash = "sha256-1CXYCV5zMLA4YdbCr8cO2N4CHEDzQChS9qbKYHPm3U4="; - }; - }]; - - defconfig = "odroidxu4_defconfig"; - - # This extraConfig is (only) required because the gator module fails to build as-is. - extraConfig = '' - - GATOR n - - # This attempted fix applies correctly but does not fix the build. - #GATOR_MALI_MIDGARD_PATH ${src}/drivers/gpu/arm/midgard - - '' + (args.extraConfig or ""); - - extraMeta.platforms = [ "armv7l-linux" ]; - -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index baf87b73eb1d..4d2682440cef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -472,7 +472,6 @@ mapAliases ({ linuxPackages_6_3 = linuxKernel.packages.linux_6_3; linuxPackages_6_4 = linuxKernel.packages.linux_6_4; linuxPackages_6_5 = linuxKernel.packages.linux_6_5; - linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f1948a96786..3458231d38e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28127,10 +28127,6 @@ with pkgs; linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened; linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened; - # Hardkernel (Odroid) kernels. - linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; - linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel; - # GNU Linux-libre kernels linuxPackages-libre = linuxKernel.packages.linux_libre; linux-libre = linuxPackages-libre.kernel; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 507c5a75f1f9..d796fa7164d0 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -205,14 +205,6 @@ in { ]; }; - linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708 zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix; @@ -628,8 +620,6 @@ in { linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); - hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14); - linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre); linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); @@ -647,7 +637,6 @@ in { linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_1; - linux_hardkernel_latest = packages.hardkernel_4_14; }; manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {};