Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (a3dacdccb9f2530e68de1de9f467d547725e77ee)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (a3dacdccb9f2530e68de1de9f467d547725e77ee)
  • Date: Sat, 20 Oct 2007 22:08:53 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

kernels/iwlwifi/CONFLICTS | 2 +-
kernels/iwlwifi/DEPENDS | 2 +-
kernels/iwlwifi/HISTORY | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a3dacdccb9f2530e68de1de9f467d547725e77ee
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

iwlwifi: Make that 2.6.23, as that's what I tested with

diff --git a/kernels/iwlwifi/CONFLICTS b/kernels/iwlwifi/CONFLICTS
index 9540df3..900a552 100755
--- a/kernels/iwlwifi/CONFLICTS
+++ b/kernels/iwlwifi/CONFLICTS
@@ -1,6 +1,6 @@
source $GRIMOIRE/FUNCTIONS &&

-if [[ "$(get_kernel_version|cut -d. -f3)" < "22" ]]
+if [[ "$(get_kernel_version|cut -d. -f3)" < "23" ]]
then
conflicts mac80211
fi
diff --git a/kernels/iwlwifi/DEPENDS b/kernels/iwlwifi/DEPENDS
index 419d177..4c492ea 100755
--- a/kernels/iwlwifi/DEPENDS
+++ b/kernels/iwlwifi/DEPENDS
@@ -2,7 +2,7 @@ depends IWLWIFI-UCODE '' '' 'z-rejected' &&

source $GRIMOIRE/FUNCTIONS &&

-if [[ "$(get_kernel_version|cut -d. -f3)" < "22" ]]
+if [[ "$(get_kernel_version|cut -d. -f3)" < "23" ]]
then
depends mac80211
fi
diff --git a/kernels/iwlwifi/HISTORY b/kernels/iwlwifi/HISTORY
index f99e0dd..c69c077 100644
--- a/kernels/iwlwifi/HISTORY
+++ b/kernels/iwlwifi/HISTORY
@@ -1,6 +1,6 @@
2007-10-20 Eric Sandall <sandalle AT 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
+ * DEPENDS: Only needs mac80211 for 2.6.22 and older
+ * CONFLICTS: Conflicts with mac80211 for 2.6.23 and newer, since it's
now in the kernel
* PRE_BUILD: Check for CONFIG_FW_LOADER and CONFIG_MAC80211




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (a3dacdccb9f2530e68de1de9f467d547725e77ee), Eric Sandall, 10/20/2007

Archive powered by MHonArc 2.6.24.

Top of Page