diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-13 15:49:14 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-14 10:34:28 -0800 |
| commit | 1ec68e0d13cb896525d142ab3d1980ce27fd5368 (patch) | |
| tree | 2f41e9f89f538b59f27ef44b91c8ef6440872737 /pkgs | |
| parent | 1b34559ff57eeccfd05e441df69fdb2b1cd81899 (diff) | |
| download | nixpkgs-1ec68e0d13cb896525d142ab3d1980ce27fd5368.tar nixpkgs-1ec68e0d13cb896525d142ab3d1980ce27fd5368.tar.gz nixpkgs-1ec68e0d13cb896525d142ab3d1980ce27fd5368.tar.bz2 nixpkgs-1ec68e0d13cb896525d142ab3d1980ce27fd5368.tar.lz nixpkgs-1ec68e0d13cb896525d142ab3d1980ce27fd5368.tar.xz nixpkgs-1ec68e0d13cb896525d142ab3d1980ce27fd5368.tar.zst nixpkgs-1ec68e0d13cb896525d142ab3d1980ce27fd5368.zip | |
kernel: Fix path to stp bridge helper
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/bridge-stp-helper.patch | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 24 |
3 files changed, 34 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch b/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch new file mode 100644 index 00000000000..70d0f944c2a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch @@ -0,0 +1,13 @@ +diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h +index aea3d13..8fcbf81 100644 +--- a/net/bridge/br_private.h ++++ b/net/bridge/br_private.h +@@ -39,7 +39,7 @@ + #define BR_GROUPFWD_8021AD 0xB801u + + /* Path to usermode spanning tree program */ +-#define BR_STP_PROG "/sbin/bridge-stp" ++#define BR_STP_PROG "/run/current-system/sw/bin/bridge-stp" + + typedef struct bridge_id bridge_id; + typedef struct mac_addr mac_addr; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6265a2eea18..f712d57c8f0 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -32,6 +32,11 @@ in rec { + bridge_stp_helper = + { name = "bridge-stp-helper"; + patch = ./bridge-stp-helper.patch; + }; + no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14160f9b82e..d0cb0c8901c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8400,12 +8400,13 @@ let linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = []; + kernelPatches = [ kernelPatches.bridge_stp_helper ]; }; linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill ]; @@ -8413,11 +8414,13 @@ let linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { inherit fetchurl stdenv perl buildLinux; + kernelPatches = [ kernelPatches.bridge_stp_helper ]; }; linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -8426,7 +8429,8 @@ let linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -8435,7 +8439,8 @@ let linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -8444,7 +8449,8 @@ let linux_3_17 = makeOverridable (import ../os-specific/linux/kernel/linux-3.17.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -8453,7 +8459,8 @@ let linux_3_18 = makeOverridable (import ../os-specific/linux/kernel/linux-3.18.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -8462,7 +8469,8 @@ let linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 |