From da1f78bd2bd0c7b7c3fc8c902c314c0c391cfaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Nov 2018 20:03:34 +0000 Subject: [PATCH] linux_beagleboard: remove The package is out-of-date and has no maintainer. It should be now possible to just mainline kernel. Support for that could be added by copying the right dtb file in our linux_rpi kernel. I do not have the hardware to test this. cc @dezgeg @dhess --- .../linux/kernel/linux-beagleboard.nix | 34 ------------------- pkgs/top-level/all-packages.nix | 9 ----- 2 files changed, 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-beagleboard.nix diff --git a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix deleted file mode 100644 index e98104f11ca9..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ubootTools, dtc, ... } @ args: - -let - modDirVersion = "4.14.12"; - tag = "r23"; -in -stdenv.lib.overrideDerivation (buildLinux (args // rec { - version = "${modDirVersion}-ti-${tag}"; - inherit modDirVersion; - - src = fetchFromGitHub { - owner = "beagleboard"; - repo = "linux"; - rev = "${version}"; - sha256 = "07hdv2h12gsgafxsqqr7b0fir10rv9k66riklpjba2cg6x0p2nr4"; - }; - - kernelPatches = args.kernelPatches; - - features = { - efiBootStub = false; - } // (args.features or {}); - - extraMeta.hydraPlatforms = [ "armv7l-linux" ]; -} // (args.argsOverride or {}))) (oldAttrs: { - - # This kernel will run mkuboot.sh. - postPatch = '' - patchShebangs scripts/ - ''; - - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ dtc ubootTools ]; - -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38f3264838cf..0962ba73555c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14213,14 +14213,6 @@ with pkgs; klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); - linux_beagleboard = callPackage ../os-specific/linux/kernel/linux-beagleboard.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_mptcp = linux_mptcp_94; linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = @@ -14511,7 +14503,6 @@ with pkgs; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. - linuxPackages_beagleboard = linuxPackagesFor pkgs.linux_beagleboard; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);