diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
| commit | 215a07c1a9d6d208c1ba0037eccaaba7de9d6b68 (patch) | |
| tree | f31e835b16c30957eb4ae3710cbfa922e8a64fbd /pkgs/os-specific/linux/broadcom-sta | |
| parent | b31c67e24d56c90a6732d3a310ff13684b73e200 (diff) | |
| parent | 4e3dcd925499547314567107366cae26a99c4ef7 (diff) | |
| download | nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.gz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.bz2 nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.lz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.xz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.zst nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.zip | |
svn merge ^/nixpkgs/trunk
Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
Diffstat (limited to 'pkgs/os-specific/linux/broadcom-sta')
| -rw-r--r-- | pkgs/os-specific/linux/broadcom-sta/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/broadcom-sta/linux-2.6.39.patch | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/broadcom-sta/linux-3.2.patch | 13 |
3 files changed, 31 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 39cc2dd4080..96749dca2b7 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, kernel }: -let version = "5_100_82_38"; +let version = "5_100_82_112"; bits = if stdenv.system == "i686-linux" then "32" else assert stdenv.system == "x86_64-linux"; "64"; in @@ -10,15 +10,15 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz"; sha256 = if bits == "32" - then "0dzvnk0vmi5dlbsi9k2agvs5xsqn07mv66g9v1jzn1gsl8fsydpp" - else "19rm9m949yqahgii7wr14lj451sd84s72mqj15yd0dnpm4k5n5hw"; + then "1rvhw9ngw0djxyyjx5m01c0js89zs3xiwmra03al6f9q7cbf7d45" + else "1qsarnry10f5m8a73wbr9cg2ifs00sqg6x0ay59l72vl9hb2zlww"; }; buildInputs = [ kernel ]; - patches = [ ./makefile.patch ] - ++ stdenv.lib.optional - (! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0) - [ ./mutex-sema.patch ]; + patches = [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch ]; + #++ stdenv.lib.optional + #(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0) + #[ ./mutex-sema.patch ]; makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-2.6.39.patch b/pkgs/os-specific/linux/broadcom-sta/linux-2.6.39.patch new file mode 100644 index 00000000000..ca07c918c36 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-2.6.39.patch @@ -0,0 +1,11 @@ +--- old/src/wl/sys/wl_cfg80211.c ++++ new/src/wl/sys/wl_cfg80211.c +@@ -1811,7 +1811,7 @@ + notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) + + wl_get_ielen(wl); + freq = ieee80211_channel_to_frequency(notif_bss_info->channel +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) + ,(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ + #endif + ); diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-3.2.patch b/pkgs/os-specific/linux/broadcom-sta/linux-3.2.patch new file mode 100644 index 00000000000..b491537cb86 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-3.2.patch @@ -0,0 +1,13 @@ +diff -Naur broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_linux.c broadcom-sta-5.100.82.112/src/wl/sys/wl_linux.c +--- broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_linux.c 2011-10-23 01:56:55.000000000 +0900 ++++ broadcom-sta-5.100.82.112/src/wl/sys/wl_linux.c 2011-11-22 00:56:07.021520421 +0900 +@@ -385,7 +385,9 @@ + #endif + .ndo_get_stats = wl_get_stats, + .ndo_set_mac_address = wl_set_mac_address, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) + .ndo_set_multicast_list = wl_set_multicast_list, ++#endif + .ndo_do_ioctl = wl_ioctl + }; + |