Source Mage code commit list

[Juuso Alasuutari <scm AT mail.sourcemage.org>]

GIT changes to master z-rejected grimoire by Juuso Alasuutari 
<iuso AT sourcemage.org>:

 z-kernels/ipw2200/CONFIGURE |    2 -
 z-kernels/ipw2200/DEPENDS   |    5 ++--
 z-kernels/ipw2200/DETAILS   |    2 -
 z-kernels/ipw2200/HISTORY   |    3 ++
 z-kernels/ipw2200/INSTALL   |    9 ++++----
 z-kernels/ipw2200/PRE_BUILD |   49 
++++++++++++++++++++++++--------------------
 6 files changed, 40 insertions(+), 30 deletions(-)

New commits:
commit 1c7a53074335dc3c934013272362b10f5015c2a1
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

    ipw2200: made ieee80211 optional (can also use kernel's internal stack),
    minor fixing

diff --git a/z-kernels/ipw2200/CONFIGURE b/z-kernels/ipw2200/CONFIGURE
index 4aeb4b1..cfee8df 100755
--- a/z-kernels/ipw2200/CONFIGURE
+++ b/z-kernels/ipw2200/CONFIGURE
@@ -1 +1 @@
-. $GRIMOIRE/REJECTED_MSG
+.  "$GRIMOIRE/REJECTED_MSG"
diff --git a/z-kernels/ipw2200/DEPENDS b/z-kernels/ipw2200/DEPENDS
index 7dfacc0..58fcd57 100755
--- a/z-kernels/ipw2200/DEPENDS
+++ b/z-kernels/ipw2200/DEPENDS
@@ -1,2 +1,3 @@
-depends ieee80211       &&
-depends wireless_tools
+depends  wireless_tools  &&
+
+optional_depends  ieee80211  ""  ""  "to use external IEEE80211 stack"
diff --git a/z-kernels/ipw2200/DETAILS b/z-kernels/ipw2200/DETAILS
index 565583a..6cac232 100755
--- a/z-kernels/ipw2200/DETAILS
+++ b/z-kernels/ipw2200/DETAILS
@@ -5,7 +5,7 @@
         SOURCE2=$SPELL-fw-$FWVERSION.tgz
      
SOURCE_HASH=sha512:505f4a130628cfcb83c56a628e801ce9b546857da9ada8a275df690aab27dcf79bc2ee36885ff017ed80f3c61edcd67870f942403686821681baad679993fc05
     
SOURCE2_HASH=sha512:a109d7eb894c5f591b85ec951c985cef9b36ff3afbf2975aa1069cfda60791def35d3c77105850a43d4ea94d5d2f775914b47c43fa7d71114641a32491dcd96a
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
   SOURCE2_URL[0]=
         WEB_SITE=http://$SPELL.sourceforge.net/
diff --git a/z-kernels/ipw2200/HISTORY b/z-kernels/ipw2200/HISTORY
index 6faf6b6..d26d0e4 100644
--- a/z-kernels/ipw2200/HISTORY
+++ b/z-kernels/ipw2200/HISTORY
@@ -1,5 +1,8 @@
 2007-02-05 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Version 1.2.1.
+       * DEPENDS: Made ieee80211 optional.
+       * PRE_BUILD: Store get_kernel_config return values to vars to
+         reduce function calling, removed unnecessary sedit.
 
 2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
        * PRE_BUILD: Changed all get_sorcery_kernel_config to
diff --git a/z-kernels/ipw2200/INSTALL b/z-kernels/ipw2200/INSTALL
index 14436de..7b3d6da 100755
--- a/z-kernels/ipw2200/INSTALL
+++ b/z-kernels/ipw2200/INSTALL
@@ -1,4 +1,5 @@
-make KVER=$(get_kernel_version) install &&
-message "${MESSAGE_COLOR}Installing firmware${DEFAULT_COLOR}" &&
-[ -d "${INSTALL_ROOT}/lib/firmware" ] || mkdir 
"${INSTALL_ROOT}/lib/firmware" &&
-mv $SPELL-fw-$FWVERSION/* "${INSTALL_ROOT}/lib/firmware"
+make  KVER=$(get_kernel_version)  install  &&
+
+message  "${MESSAGE_COLOR}Installing firmware...$DEFAULT_COLOR"  &&
+mkdir -p  "$INSTALL_ROOT/lib/firmware"                           &&
+mv  $SPELL-fw-$FWVERSION/*  "$INSTALL_ROOT/lib/firmware/"
diff --git a/z-kernels/ipw2200/PRE_BUILD b/z-kernels/ipw2200/PRE_BUILD
index 9d77997..ae8fb5d 100755
--- a/z-kernels/ipw2200/PRE_BUILD
+++ b/z-kernels/ipw2200/PRE_BUILD
@@ -1,24 +1,29 @@
-if [[ $(get_kernel_config CONFIG_NET_RADIO) != "y" ]]
+if [[ $(get_kernel_config CONFIG_NET_RADIO) != y ]]
 then
   message "${PROBLEM_COLOR}You don't have CONFIG_NET_RADIO"     \
           "enabled in your kernel configuration, cannot build"  \
           "ipw2200.${DEFAULT_COLOR}"                            &&
   return 1
-fi &&
+fi  &&
 
-if [[ $(get_kernel_config CONFIG_FW_LOADER) != "y" &&
-      $(get_kernel_config CONFIG_FW_LOADER) != "m" ]]
+local  _FW_LOADER=$(get_kernel_config CONFIG_FW_LOADER)  &&
+
+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"  \
           "ipw2200.${DEFAULT_COLOR}"                            &&
   return 1
-fi &&
+fi  &&
+
+local  _CRYPTO_ARC4=$(get_kernel_config CONFIG_CRYPTO_ARC4)  &&
+local  _CRC32=$(get_kernel_config CONFIG_CRC32)              &&
 
-if [[ $(get_kernel_config CONFIG_CRYPTO_ARC4) != "y" &&
-      $(get_kernel_config CONFIG_CRYPTO_ARC4) != "m" &&
-      $(get_kernel_config CONFIG_CRC32) != "y"       &&
-      $(get_kernel_config CONFIG_CRC32) != "m"       ]]
+if [[ $_CRYPTO_ARC4 != y   &&
+      $_CRYPTO_ARC4 != m   &&
+      $_CRC32 != y         &&
+      $_CRC32 != m         ]]
 then
   message "${PROBLEM_COLOR}You don't have the right crypto support"    \
           "built in the kernel, CONFIG_CRYPTO_ARC4 and CONFIG_CRC32."  \
@@ -26,12 +31,15 @@ then
   if ! query "Continue anyway?"; then
     return 1
   fi
-fi &&
+fi  &&
 
-if [[ $(get_kernel_config CONFIG_CRYPTO_MICHAEL_MIC) != "y" &&
-      $(get_kernel_config CONFIG_CRYPTO_MICHAEL_MIC) != "m" &&
-      $(get_kernel_config CONFIG_CRYPTO_AES_586) != "y"     &&
-      $(get_kernel_config CONFIG_CRYPTO_AES_586) != "m"     ]]
+local  _CRYPTO_MICHAEL_MIC=$(get_kernel_config CONFIG_CRYPTO_MICHAEL_MIC)  &&
+local  _CRYPTO_AES_586=$(get_kernel_config CONFIG_CRYPTO_AES_586)          &&
+
+if [[ $_CRYPTO_MICHAEL_MIC != y &&
+      $_CRYPTO_MICHAEL_MIC != m &&
+      $_CRYPTO_AES_586 != y     &&
+      $_CRYPTO_AES_586 != m     ]]
 then
   message "${PROBLEM_COLOR}You don't have the right crypto support"  \
           "built in the kernel, CONFIG_CRYPTO_AES_586 and"           \
@@ -40,12 +48,9 @@ then
   if ! query "Continue anyway?"; then
     return 1
   fi
-fi &&
-
-mk_source_dir ${SOURCE_DIRECTORY} &&
-unpack_file '' &&
-cd $SOURCE_DIRECTORY &&
-unpack_file 2 &&
+fi  &&
 
-# Modules already built in BUILD
-sedit  's/install: modules/install:/'  Makefile
+mk_source_dir  "$SOURCE_DIRECTORY"  &&
+unpack_file  ''                     &&
+cd  "$SOURCE_DIRECTORY"             &&
+unpack_file  2