[SM-Commit] GIT changes to master grimoire by Eric Sandall (a21dc589af450faab74bb0468b756f39cefa98a6)

Eric Sandall scm at sourcemage.org
Wed Nov 28 12:55:12 EST 2007


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

 kernels/iwlwifi/BUILD    |    4 +++-
 kernels/iwlwifi/DEPENDS  |    8 +-------
 kernels/iwlwifi/HISTORY  |   15 +++++++--------
 kernels/mac80211/HISTORY |    3 +++
 kernels/mac80211/INSTALL |    6 ++++--
 5 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit a21dc589af450faab74bb0468b756f39cefa98a6
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "iwlwifi: 2.6.22+ now includes mac80211 required for iwlwifi"
    
    This reverts commit e30425d04371d2ed15a97a2425e034e5e2839d18.
    
    iwlwifi *still* needs the newer mac80211 from the spell, and not from the kernel. Driver loads, but can't connect to my router if I use the kernel's mac80211.
    
    Conflicts:
    
    	kernels/iwlwifi/CONFLICTS
    	kernels/iwlwifi/DEPENDS
    	kernels/iwlwifi/HISTORY

commit 16e766242913096127776c61cc4bbf9253343c08
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mac80211: Install .config to /boot for get_kernel_config

commit 69b037737e414f419631c03fe0edddf3cf8c9f1e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    iwlwifi: Make fails the first time for a certain instance, this could be cleaner

diff --git a/kernels/iwlwifi/BUILD b/kernels/iwlwifi/BUILD
index 25cc194..821695c 100755
--- a/kernels/iwlwifi/BUILD
+++ b/kernels/iwlwifi/BUILD
@@ -1 +1,3 @@
-make KVER=$(get_kernel_version)
+make_single  &&
+make KVER=$(get_kernel_version) || make KVER=$(get_kernel_version)  &&
+make_normal
diff --git a/kernels/iwlwifi/DEPENDS b/kernels/iwlwifi/DEPENDS
index 4c492ea..27fc5a7 100755
--- a/kernels/iwlwifi/DEPENDS
+++ b/kernels/iwlwifi/DEPENDS
@@ -1,8 +1,2 @@
 depends  IWLWIFI-UCODE  ''  ''  'z-rejected'  &&
-
-source $GRIMOIRE/FUNCTIONS  &&
-
-if [[ "$(get_kernel_version|cut -d. -f3)" < "23" ]]
-then
-	depends  mac80211
-fi
+depends  mac80211
diff --git a/kernels/iwlwifi/HISTORY b/kernels/iwlwifi/HISTORY
index 57d1ff8..95a1304 100644
--- a/kernels/iwlwifi/HISTORY
+++ b/kernels/iwlwifi/HISTORY
@@ -1,16 +1,15 @@
+2007-11-27 Eric Sandall <sandalle at sourcemage.org>
+	* BUILD: Fails the first time if it has to regenerate the Makefile
+	  The error denoting this state is: "Makefile has been modified by
+	  generate_compatible, please run `make' again"
+
 2007-11-22 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 1.2.0
 
-2007-10-20 Eric Sandall <sandalle at sourcemage.org>
-	* 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
-
 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
+	  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/mac80211/HISTORY b/kernels/mac80211/HISTORY
index a257e84..eff3d94 100644
--- a/kernels/mac80211/HISTORY
+++ b/kernels/mac80211/HISTORY
@@ -1,3 +1,6 @@
+2007-11-28 Eric Sandall <sandalle at sourcemage.org>
+	* INSTALL: Copy new .config to /boot for get_kernel_config to use
+
 2007-11-22 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 10.0.2
 
diff --git a/kernels/mac80211/INSTALL b/kernels/mac80211/INSTALL
index 0117f3d..3fe01cd 100755
--- a/kernels/mac80211/INSTALL
+++ b/kernels/mac80211/INSTALL
@@ -1,2 +1,4 @@
-cd  $INSTALL_ROOT/lib/modules/$(get_kernel_version)/build  &&
-make  modules_install
+cd  $INSTALL_ROOT/lib/modules/$(get_kernel_version)/build           &&
+make  modules_install                                               &&
+cp  $INSTALL_ROOT/lib/modules/$(get_kernel_version)/source/.config  \
+    $INSTALL_ROOT/boot/config-$(get_kernel_version)



More information about the SM-Commit mailing list