diff options
| author | Eric Sandall | 2007-10-20 20:03:12 -0700 |
|---|---|---|
| committer | Eric Sandall | 2007-10-20 20:03:12 -0700 |
| commit | e30425d04371d2ed15a97a2425e034e5e2839d18 (patch) | |
| tree | 46fb9fcdf0e286eb33da6134b9024139ea110f11 | |
| parent | 134cc51dea1e2cc63071eb1285867d627fa95ced (diff) | |
iwlwifi: 2.6.22+ now includes mac80211 required for iwlwifi
| -rwxr-xr-x | kernels/iwlwifi/CONFLICTS | 6 | ||||
| -rwxr-xr-x | kernels/iwlwifi/DEPENDS | 8 | ||||
| -rw-r--r-- | kernels/iwlwifi/HISTORY | 10 |
3 files changed, 21 insertions, 3 deletions
diff --git a/kernels/iwlwifi/CONFLICTS b/kernels/iwlwifi/CONFLICTS new file mode 100755 index 0000000000..9540df38a4 --- /dev/null +++ b/kernels/iwlwifi/CONFLICTS @@ -0,0 +1,6 @@ +source $GRIMOIRE/FUNCTIONS && + +if [[ "$(get_kernel_version|cut -d. -f3)" < "22" ]] +then + conflicts mac80211 +fi diff --git a/kernels/iwlwifi/DEPENDS b/kernels/iwlwifi/DEPENDS index 27fc5a7281..419d177ea9 100755 --- a/kernels/iwlwifi/DEPENDS +++ b/kernels/iwlwifi/DEPENDS @@ -1,2 +1,8 @@ depends IWLWIFI-UCODE '' '' 'z-rejected' && -depends mac80211 + +source $GRIMOIRE/FUNCTIONS && + +if [[ "$(get_kernel_version|cut -d. -f3)" < "22" ]] +then + depends mac80211 +fi diff --git a/kernels/iwlwifi/HISTORY b/kernels/iwlwifi/HISTORY index e906ed87a6..657f38b691 100644 --- a/kernels/iwlwifi/HISTORY +++ b/kernels/iwlwifi/HISTORY @@ -1,6 +1,12 @@ +2007-10-20 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Only needs mac80211 for 2.6.21 and older + * CONFLICTS: Conflicts with mac80211 for 2.6.22 and newer, since it's + now in the kernel + 2007-10-09 Eric Sandall <sandalle@sourcemage.org> - * DEPENDS: Nope, it just doesn't work often and it happened to be a fluke that - iwlwifi worked again after installing ieee80211. Only needs mac80211 + * DEPENDS: Nope, it just doesn't work often and it happened to be a + fluke that iwlwifi worked again after installing ieee80211. Only + needs mac80211 2007-10-08 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: Also seems to depend on ieee80211 to work properly |