[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (ed4a25fe62d222702a003048bc062cf6eb2af75b)

Pol Vinogradov scm at mail.sourcemage.org
Sat Mar 3 16:55:40 EST 2007


GIT changes to master grimoire by Pol Vinogradov <vin.public at gmail.com>:

 audio-drivers/alsa-driver/BUILD   |   10 ++++------
 audio-drivers/alsa-driver/HISTORY |    6 ++++++
 audio-drivers/alsa-driver/INSTALL |    6 +++---
 audio-drivers/alsa-driver/PREPARE |   17 +++++++++--------
 4 files changed, 22 insertions(+), 17 deletions(-)

New commits:
commit acb66b7914d5c7a274ecf8dfe667abd4cff464d8
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    audio-drivers/alsa-driver:
    
    BUILD, PREPARE: switched to get_sorcery_kernel_config for kernel
    config option checking, switched to CONFIG_CACHE for local sorcery
    kernel config, simplified if operator, removed tabs
    INSTALL: more install and track_rootifying

diff --git a/audio-drivers/alsa-driver/BUILD b/audio-drivers/alsa-driver/BUILD
index f0e106f..8f99356 100755
--- a/audio-drivers/alsa-driver/BUILD
+++ b/audio-drivers/alsa-driver/BUILD
@@ -1,12 +1,10 @@
 # Clean out the old alsa drivers. FIXME: Bad location for 2.6!
 rm  -f  ${TRACK_ROOT}/lib/modules/`get_kernel_version`/misc/snd*  &&
 
-if [ -e ${TRACK_ROOT}/proc/config.gz ] ; then
-    if [ `zgrep -c CONFIG_SOUND=m ${TRACK_ROOT}/proc/config.gz` = 1 ] ; then
-	modprobe -q soundcore
-    fi
-elif [ `grep -c CONFIG_SOUND=m ${TRACK_ROOT}/etc/sorcery/local/kernel.config` = 1 ] ; then
-    modprobe -q soundcore
+if [[ $(get_sorcery_kernel_config CONFIG_SOUND) == m ||
+`grep -c CONFIG_SOUND=m ${CONFIG_CACHE}/kernel.config` == 1 ]]
+then
+  modprobe -q soundcore
 fi  &&
 
 sedit  "s:/usr/bin/awk:${TRACK_ROOT}/bin/awk:"  utils/convert_isapnp_ids  &&
diff --git a/audio-drivers/alsa-driver/HISTORY b/audio-drivers/alsa-driver/HISTORY
index 928b4d7..25b8130 100644
--- a/audio-drivers/alsa-driver/HISTORY
+++ b/audio-drivers/alsa-driver/HISTORY
@@ -1,3 +1,9 @@
+2007-03-03 Pol Vinogradov <vin.public at gmail.com>
+	* BUILD, PREPARE: switched to get_sorcery_kernel_config for kernel
+	  config option checking, switched to CONFIG_CACHE for local sorcery
+	  kernel config, simplified if operator, removed tabs
+	* INSTALL: more install and track_rootifying
+
 2007-03-01 Pol Vinogradov <vin.public at gmail.com>
 	* CONFIGURE: removed some && because it can fail while
 	  reconfiguring/first casting
diff --git a/audio-drivers/alsa-driver/INSTALL b/audio-drivers/alsa-driver/INSTALL
index 7c484b6..10ecada 100755
--- a/audio-drivers/alsa-driver/INSTALL
+++ b/audio-drivers/alsa-driver/INSTALL
@@ -10,7 +10,7 @@ for i in `seq 6` ;
   fi ;
 done  &&
 
-cat >> /etc/modules.d/alsa <<EOF
+cat >> ${INSTALL_ROOT}/etc/modules.d/alsa <<EOF
 alias /dev/mixer snd-mixer-oss
 alias /dev/dsp snd-pcm-oss
 alias /dev/midi snd-seq-oss
@@ -19,8 +19,8 @@ EOF
 
 dconf()
 {
-  if test -f /etc/devfsd.conf && ! grep -q alsa /etc/devfsd.conf; then
-    cat >> /etc/devfsd.conf <<EOF
+  if test -f ${TRACK_ROOT}/etc/devfsd.conf && ! grep -q alsa ${TRACK_ROOT}/etc/devfsd.conf; then
+    cat >> ${TRACK_ROOT}/etc/devfsd.conf <<EOF
 
 # some MODLOAD
 LOOKUP          midi            MODLOAD
diff --git a/audio-drivers/alsa-driver/PREPARE b/audio-drivers/alsa-driver/PREPARE
index 6b1ef85..46b9e8a 100755
--- a/audio-drivers/alsa-driver/PREPARE
+++ b/audio-drivers/alsa-driver/PREPARE
@@ -1,10 +1,11 @@
+# for get_sorcery_kernel_config
+source $GRIMOIRE/FUNCTIONS  &&
+
 ### soundcore test
-if [ -e ${TRACK_ROOT}/proc/config.gz ] ; then
-	if [ `zgrep -c 'CONFIG_SOUND is not set' ${TRACK_ROOT}/proc/config.gz` = 1 ] ; then
-	    message "${SPELL_COLOR} You *must* configure your kernel with CONFIG_SOUND on${DEFAULT_COLOR}"
-	    return 1
-	fi
-elif [ `grep -c 'CONFIG_SOUND is not set' ${TRACK_ROOT}/etc/sorcery/local/kernel.config` = 1 ] ; then
-    message "${SPELL_COLOR} You *must* configure your kernel with CONFIG_SOUND on${DEFAULT_COLOR}"
-    return 1
+if [[ $(get_sorcery_kernel_config CONFIG_SOUND) != y &&
+$(get_sorcery_kernel_config CONFIG_SOUND) != m &&
+`grep -c 'CONFIG_SOUND is not set' ${CONFIG_CACHE}/kernel.config` != 1 ]]
+then
+  message "${SPELL_COLOR} You *must* configure your kernel with CONFIG_SOUND on${DEFAULT_COLOR}"  &&
+  return 1
 fi



More information about the SM-Commit mailing list