Skip to content

Commit

Permalink
Revert removal of linux_testing_bcachefs from "linux: remove versio…
Browse files Browse the repository at this point in the history
…ns unmaintained upstream"

This reverts parts of commit 298e170.
  • Loading branch information
samueldr committed Jul 9, 2018
1 parent d1eac65 commit 25a932e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
22 changes: 22 additions & 0 deletions pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.15.2018.02.09";
modDirVersion = "4.15.0";
extraMeta.branch = "master";
extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ];

src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs.git";
rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4";
sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib";
};

extraConfig = ''
BCACHEFS_FS m
'';

# Should the testing kernels ever be built on Hydra?
extraMeta.hydraPlatforms = [];

} // (args.argsOverride or {}))
15 changes: 15 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13327,6 +13327,18 @@ with pkgs;
];
};

linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};

linux_riscv = callPackage ../os-specific/linux/kernel/linux-riscv.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
Expand Down Expand Up @@ -13530,6 +13542,9 @@ with pkgs;
};
in tinyLinuxPackages.kernel;

# Build a kernel with bcachefs module
linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs);

# Build a kernel for Xen dom0
linuxPackages_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; }));

Expand Down

0 comments on commit 25a932e

Please sign in to comment.