JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: Fix path to stp bridge helper

Browse Source
This commit is contained in:
William A. Kennington III 2015-01-13 15:49:14 -08:00
parent 1b34559ff5
commit 1ec68e0d13
3 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/kernel/bridge-stp-helper.patch Normal file
View File

@ -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;

5
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -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;

24
pkgs/top-level/all-packages.nix
View File

@ -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