Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 34e67f3f9f20
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 357f51b93d33
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 7, 2019

  1. openafs: Add support for Linux 5.0 to openafs_1_8 (#56859) 

    OpenAFS 1.8.2 does has not yet merged support for Linux 4.20 or 5.0
This patch cherry-picks commits from the git repository, and includes
them in the patches/ directory. This also replaces the amalgamated Linux 4.20
patches I added earlier with the original outputs from `git show`.

This has been tested to build on Linux 4.4, 4.14, 4.20, and 5.0.

This does not change the derivations of openafs_1_8, only
linuxPackages_*.openafs_1_8.
    @artemist @veprbl
    artemist authored and veprbl committed Mar 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    357f51b View commit details
Showing with 30 additions and 64 deletions.
  1. +0 −62 pkgs/servers/openafs/1.8/linux-4.20.patch
  2. +30 −2 pkgs/servers/openafs/1.8/module.nix
62 changes: 0 additions & 62 deletions pkgs/servers/openafs/1.8/linux-4.20.patch
View file

This file was deleted.

32 changes: 30 additions & 2 deletions pkgs/servers/openafs/1.8/module.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
{ stdenv, fetchurl, fetchpatch, which, autoconf, automake, flex, yacc
, kernel, glibc, perl, libtool_2, kerberos }:

with (import ./srcs.nix { inherit fetchurl; });
@@ -11,7 +11,35 @@ in stdenv.mkDerivation rec {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;

patches = [ ./linux-4.20.patch ];
patches = [
# Linux 4.20
(fetchpatch {
name = "openafs_1_8-do_settimeofday.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=aa80f892ec39e2984818090a6bb2047430836ee2";
sha256 = "11zw676zqi9sj3vhp7n7ndxcxhp17cq9g2g41n030mcd3ap4g53h";
})
(fetchpatch {
name = "openafs_1_8-current_kernel_time.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=3c454b39d04f4886536267c211171dae30dc0344";
sha256 = "16fl9kp0l95dqm166jx3x4ijbzhf2bc9ilnipn3k1j00mfy4lnia";
})
# Linux 5.0
(fetchpatch {
name = "openafs_1_8-ktime_get_coarse_real_ts64.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=21ad6a0c826c150c4227ece50554101641ab4626";
sha256 = "0cd2bzfn4gkb68qf27wpgcg9kvaky7kll22b8p2vmw5x4xkckq2y";
})
(fetchpatch {
name = "openafs_1_8-ktime_get_real_ts64.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=b892fb127815bdf72103ae41ee70aadd87931b0c";
sha256 = "1xmf2l4g5nb9rhca7zn0swynvq8f9pd0k9drsx9bpnwp662y9l8m";
})
(fetchpatch {
name = "openafs_1_8-super_block.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=3969bbca6017eb0ce6e1c3099b135f210403f661";
sha256 = "0cdd76s1h1bhxj0hl7r6mcha1jcy5vhlvc5dc8m2i83a6281yjsa";
})
];

nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
++ kernel.moduleBuildDependencies;