Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (0212ebe3c071a89b1abd98903b93e68be8fa67fc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (0212ebe3c071a89b1abd98903b93e68be8fa67fc)
  • Date: Tue, 27 Feb 2007 14:20:11 -0600

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

ChangeLog | 4 ++
audio-drivers/alsa-driver/BUILD | 30 +++++++------------
audio-drivers/alsa-driver/CONFIGURE | 6 +--
audio-drivers/alsa-driver/FINAL | 2 -
audio-drivers/alsa-driver/HISTORY | 7 ++++
audio-drivers/alsa-driver/INSTALL | 52
++++++++++++++++------------------
audio-drivers/alsa-driver/POST_REMOVE | 12 +++----
audio-drivers/alsa-driver/PREPARE | 6 +--
kernels/CONFIGURE | 24 ---------------
9 files changed, 61 insertions(+), 82 deletions(-)

New commits:
commit 095c7ada6a40602963ae8313412297697914fd45
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/alsa-driver/INSTALL: minor fix

commit 321251a33757cd4f14278ad4eab6b83a0e1cd201
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

kernels/CONFIGURE: removed to avoid sourcing by other spells in this
section

commit 404de4c406f8d44ba9cede542e39fb8565d10989
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/alsa-driver:

BUILD: install and track_rootifying, switched to default_build and
get_kernel_version, added module directory to OPTS, removed
make_single, added missing &&
CONFIGURE, FINAL, INSTALL, POST_REMOVE, PREPARE: install and
track_rootifying, added missing &&, removed make_normal from INSTALL

diff --git a/ChangeLog b/ChangeLog
index 042a768..68748bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-27 Pol Vinogradov <vin.public AT gmail.com>
+ * kernels/CONFIGURE: removed to avoid sourcing by other spells in this
+ section
+
2007-02-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* audio-players/qmpdclient: new spell, a QT4 client for mpd

diff --git a/audio-drivers/alsa-driver/BUILD b/audio-drivers/alsa-driver/BUILD
index 4cea2a6..f0e106f 100755
--- a/audio-drivers/alsa-driver/BUILD
+++ b/audio-drivers/alsa-driver/BUILD
@@ -1,26 +1,20 @@
# Clean out the old alsa drivers. FIXME: Bad location for 2.6!
-rm -f /lib/modules/`installed_version linux`/misc/snd* &&
+rm -f ${TRACK_ROOT}/lib/modules/`get_kernel_version`/misc/snd* &&

-if [ -e /proc/config.gz ] ; then
- if [ `zgrep -c CONFIG_SOUND=m /proc/config.gz` = 1 ] ; then
+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 /etc/sorcery/local/kernel.config` = 1 ] ; then
+elif [ `grep -c CONFIG_SOUND=m
${TRACK_ROOT}/etc/sorcery/local/kernel.config` = 1 ] ; then
modprobe -q soundcore
-fi
+fi &&

+sedit "s:/usr/bin/awk:${TRACK_ROOT}/bin/awk:" utils/convert_isapnp_ids &&
+sedit "s: install-scripts : :" Makefile &&
+sedit "s:root.root:root.audio:" snddevices &&

+OPTS="--with-isapnp=yes --with-sequencer=yes --with-oss=yes
--with-debug=none \
+ --with-moddir=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/misc
\
+ --with-cards=${CARDS} ${OPTS}"
&&

-sedit "s:/usr/bin/awk:/bin/awk:" utils/convert_isapnp_ids &&
-sedit "s: install-scripts : :" Makefile &&
-sedit "s:root.root:root.audio:" snddevices &&
-
-./configure --prefix=/usr \
- --with-isapnp=yes \
- --with-sequencer=yes \
- --with-oss=yes \
- --with-debug=none \
- --with-cards=$CARDS \
- $OPTS &&
-make_single &&
-make
+default_build
diff --git a/audio-drivers/alsa-driver/CONFIGURE
b/audio-drivers/alsa-driver/CONFIGURE
index cccc535..2bb045a 100755
--- a/audio-drivers/alsa-driver/CONFIGURE
+++ b/audio-drivers/alsa-driver/CONFIGURE
@@ -1,8 +1,8 @@
if ! grep -q "CARDS=" $SPELL_CONFIG; then

- rm -f /etc/modules.d/alsa
- cp /etc/modules.conf /tmp/modules.conf
- grep -v "alsa" < /tmp/modules.conf > /etc/modules.conf
+ rm -f ${TRACK_ROOT}/etc/modules.d/alsa &&
+ cp ${TRACK_ROOT}/etc/modules.conf ${TRACK_ROOT}/tmp/modules.conf &&
+ grep -v "alsa" < ${TRACK_ROOT}/tmp/modules.conf >
${TRACK_ROOT}/etc/modules.conf &&

CARDLIST=`cat $SCRIPT_DIRECTORY/sound.cards` &&

diff --git a/audio-drivers/alsa-driver/FINAL b/audio-drivers/alsa-driver/FINAL
index 426a597..16ebc89 100755
--- a/audio-drivers/alsa-driver/FINAL
+++ b/audio-drivers/alsa-driver/FINAL
@@ -1 +1 @@
-[ -e /etc/sysconfig/alsa ] && sedit "s:\$CARD:$CARD:" /etc/sysconfig/alsa
+[ -e ${TRACK_ROOT}/etc/sysconfig/alsa ] && sedit "s:\$CARD:$CARD:"
${TRACK_ROOT}/etc/sysconfig/alsa
diff --git a/audio-drivers/alsa-driver/HISTORY
b/audio-drivers/alsa-driver/HISTORY
index 5fc2d4b..a1ea5a0 100644
--- a/audio-drivers/alsa-driver/HISTORY
+++ b/audio-drivers/alsa-driver/HISTORY
@@ -1,3 +1,10 @@
+2007-02-27 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: install and track_rootifying, switched to default_build and
+ get_kernel_version, added module directory to OPTS, removed
+ make_single, added missing &&
+ * CONFIGURE, FINAL, INSTALL, POST_REMOVE, PREPARE: install and
+ track_rootifying, added missing &&, removed make_normal from INSTALL
+
2007-02-09 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.14rc2

diff --git a/audio-drivers/alsa-driver/INSTALL
b/audio-drivers/alsa-driver/INSTALL
index c6fc031..7c484b6 100755
--- a/audio-drivers/alsa-driver/INSTALL
+++ b/audio-drivers/alsa-driver/INSTALL
@@ -5,10 +5,10 @@ mconf()
for i in `seq 6` ;
do C=`echo snd-$CARDS | sed s/\,/\,snd-/g | cut -d, -f${i}` ;
if [ -n "$C" ] ; then
- echo "alias snd-card-`expr $i - 1` $C">>/etc/modules.d/alsa
- echo "alias snd-slot-`expr $i - 1` snd-card-`expr $i -
1`">>/etc/modules.d/alsa
+ echo "alias snd-card-`expr $i - 1`
$C">>${INSTALL_ROOT}/etc/modules.d/alsa &&
+ echo "alias snd-slot-`expr $i - 1` snd-card-`expr $i -
1`">>${INSTALL_ROOT}/etc/modules.d/alsa
fi ;
-done
+done &&

cat >> /etc/modules.d/alsa <<EOF
alias /dev/mixer snd-mixer-oss
@@ -47,42 +47,40 @@ EOF
fi
}

-make_normal &&
default_install &&
./snddevices &&

-if [ -f /dev/snd ]; then
- rm -f /dev/snd
+if [ -f ${TRACK_ROOT}/dev/snd ]; then
+ rm -f ${TRACK_ROOT}/dev/snd
fi &&

-chown root.audio /dev/adsp &&
-chmod 777 /dev/adsp &&
-chown root.audio /dev/amidi &&
-chmod 777 /dev/amidi &&
-chown root.audio /dev/audio &&
-chmod 777 /dev/audio &&
-chown root.audio /dev/dsp &&
-chmod 777 /dev/dsp &&
-chown root.audio /dev/midi* &&
-chmod 777 /dev/midi* &&
-chown root.audio /dev/mixer &&
-chmod 777 /dev/mixer &&
-chown root.audio /dev/sequencer* &&
-chmod 777 /dev/sequencer* &&
-chown root.audio /dev/snd &&
-chmod 777 /dev/snd &&
+chown root.audio ${INSTALL_ROOT}/dev/adsp &&
+chmod 777 ${INSTALL_ROOT}/dev/adsp &&
+chown root.audio ${INSTALL_ROOT}/dev/amidi &&
+chmod 777 ${INSTALL_ROOT}/dev/amidi &&
+chown root.audio ${INSTALL_ROOT}/dev/audio &&
+chmod 777 ${INSTALL_ROOT}/dev/audio &&
+chown root.audio ${INSTALL_ROOT}/dev/dsp &&
+chmod 777 ${INSTALL_ROOT}/dev/dsp &&
+chown root.audio ${INSTALL_ROOT}/dev/midi* &&
+chmod 777 ${INSTALL_ROOT}/dev/midi* &&
+chown root.audio ${INSTALL_ROOT}/dev/mixer &&
+chmod 777 ${INSTALL_ROOT}/dev/mixer &&
+chown root.audio ${INSTALL_ROOT}/dev/sequencer* &&
+chmod 777 ${INSTALL_ROOT}/dev/sequencer* &&
+chown root.audio ${INSTALL_ROOT}/dev/snd &&
+chmod 777 ${INSTALL_ROOT}/dev/snd &&

-if [ ! -f /etc/modules.d/alsa ]; then
- mkdir -p /etc/modules.d &&
+if [ ! -f ${TRACK_ROOT}/etc/modules.d/alsa ]; then
+ mkdir -p ${INSTALL_ROOT}/etc/modules.d &&
mconf
fi &&

dconf &&

-MOD="/etc/modules.conf"
-INC="include /etc/modules.d/alsa"
+MOD="${TRACK_ROOT}/etc/modules.conf"
+INC="include ${TRACK_ROOT}/etc/modules.d/alsa"

grep -q "$INC" $MOD ||
echo "$INC" >> $MOD &&
depmod -a
-#true
diff --git a/audio-drivers/alsa-driver/POST_REMOVE
b/audio-drivers/alsa-driver/POST_REMOVE
index 871ec4b..bc96065 100755
--- a/audio-drivers/alsa-driver/POST_REMOVE
+++ b/audio-drivers/alsa-driver/POST_REMOVE
@@ -1,8 +1,8 @@
-MOD="/etc/modules.conf"
-TMP="/tmp/modules.conf"
-INC="include /etc/modules.d/alsa"
+MOD="${TRACK_ROOT}/etc/modules.conf" &&
+TMP="${TRACK_ROOT}/tmp/modules.conf" &&
+INC="include ${TRACK_ROOT}/etc/modules.d/alsa" &&

-cp $MOD $TMP
-grep -v "$INC" $TMP > $MOD
-rm $TMP
+cp $MOD $TMP &&
+grep -v "$INC" $TMP > $MOD &&
+rm $TMP &&
depmod -a
diff --git a/audio-drivers/alsa-driver/PREPARE
b/audio-drivers/alsa-driver/PREPARE
index 597c305..6b1ef85 100755
--- a/audio-drivers/alsa-driver/PREPARE
+++ b/audio-drivers/alsa-driver/PREPARE
@@ -1,10 +1,10 @@
### soundcore test
-if [ -e /proc/config.gz ] ; then
- if [ `zgrep -c 'CONFIG_SOUND is not set' /proc/config.gz` = 1 ] ; then
+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' /etc/sorcery/local/kernel.config`
= 1 ] ; then
+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
fi
diff --git a/kernels/CONFIGURE b/kernels/CONFIGURE
deleted file mode 100755
index bb3b06e..0000000
--- a/kernels/CONFIGURE
+++ /dev/null
@@ -1,24 +0,0 @@
-case ${KERNEL_VERSION} in
- 2.6*)
- config_query_list MAKEMODE "What make configuration tool
would you like to use?" \
- "menuconfig" \
- "oldconfig" \
- "xconfig" \
- "defconfig" \
- "gconfig" \
- "allmodconfig" \
- "allyesconfig" \
- "allnoconfig"
- ;;
- 2.[24]*)
- config_query_list MAKEMODE "What make configuration tool
would you like to use?" \
- "menuconfig" \
- "xconfig" \
- "oldconfig"
- ;;
- 2.0*)
- config_query_list MAKEMODE "What make configuration tool
would you like to use?" \
- "menuconfig" \
- "xconfig"
- ;;
-esac




Archive powered by MHonArc 2.6.24.

Top of Page