Skip to Content.
Sympa Menu

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

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 (bc33c222e25fd322976db9c04d64f606653fd1de)
  • Date: Sat, 20 Oct 2007 22:07:05 -0500

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

kernels/iwlwifi/CONFLICTS | 6 ++++++
kernels/iwlwifi/DEPENDS | 8 +++++++-
kernels/iwlwifi/HISTORY | 11 +++++++++--
kernels/iwlwifi/PRE_BUILD | 22 ++++++++++++++++++++++
4 files changed, 44 insertions(+), 3 deletions(-)

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

iwlwifi: Check for CONFIG_FW_LOADER and CONFIG_MAC80211

commit e30425d04371d2ed15a97a2425e034e5e2839d18
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

iwlwifi: 2.6.22+ now includes mac80211 required for iwlwifi

diff --git a/kernels/iwlwifi/CONFLICTS b/kernels/iwlwifi/CONFLICTS
new file mode 100755
index 0000000..9540df3
--- /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 27fc5a7..419d177 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 e906ed8..f99e0dd 100644
--- a/kernels/iwlwifi/HISTORY
+++ b/kernels/iwlwifi/HISTORY
@@ -1,6 +1,13 @@
+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
+ now in the kernel
+ * PRE_BUILD: Check for CONFIG_FW_LOADER and CONFIG_MAC80211
+
2007-10-09 Eric Sandall <sandalle AT 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 AT sourcemage.org>
* DEPENDS: Also seems to depend on ieee80211 to work properly
diff --git a/kernels/iwlwifi/PRE_BUILD b/kernels/iwlwifi/PRE_BUILD
new file mode 100755
index 0000000..4866f58
--- /dev/null
+++ b/kernels/iwlwifi/PRE_BUILD
@@ -0,0 +1,22 @@
+local _FW_LOADER=$(get_kernel_config CONFIG_FW_LOADER) &&
+local _MAC80211=$(get_kernel_config CONFIG_MAC80211) &&
+
+if [[ $_FW_LOADER != y &&
+ $_FW_LOADER != m ]]
+then
+ message "${PROBLEM_COLOR}You don't have CONFIG_FW_LOADER" \
+ "enabled in your kernel configuration, cannot build" \
+ "${SPELL_COLOR}$SPELL${MESSAGE_COLOR}.${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+if [[ $_MAC80211 != y &&
+ $_MAC80211 != m ]]
+then
+ message "${PROBLEM_COLOR}You don't have CONFIG_MAC80211" \
+ "enabled in your kernel configuration, cannot build" \
+ "${SPELL_COLOR}$SPELL${MESSAGE_COLOR}.${DEFAULT_COLOR}" &&
+ return 1
+fi
+
+default_pre_build



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

Archive powered by MHonArc 2.6.24.

Top of Page