From 6efd73de024ee690516238a50a32b7b01f11a6e5 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@localhost.localdomain>
Date: Fri, 20 Mar 2009 01:29:02 +0100
Subject: [PATCH] update udev+alsa installation

---
 packages/audio/alsa-utils/init.d/40_alsa      | 115 ------------------
 packages/audio/alsa/install                   |   4 +-
 packages/sysutils/udev/build.bk               |  28 -----
 .../udev/config/rules.d/20-names.rules        |   2 +-
 packages/sysutils/udev/install.bk             |  25 ----
 packages/sysutils/udev/unpack.bk              |   9 --
 packages/sysutils/udev/url.bk                 |   1 -
 7 files changed, 3 insertions(+), 181 deletions(-)
 delete mode 100755 packages/audio/alsa-utils/init.d/40_alsa
 delete mode 100755 packages/sysutils/udev/build.bk
 delete mode 100755 packages/sysutils/udev/install.bk
 delete mode 100755 packages/sysutils/udev/unpack.bk
 delete mode 100644 packages/sysutils/udev/url.bk

diff --git a/packages/audio/alsa-utils/init.d/40_alsa b/packages/audio/alsa-utils/init.d/40_alsa
deleted file mode 100755
index afe306fad9..0000000000
--- a/packages/audio/alsa-utils/init.d/40_alsa
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-#
-# setup alsa (especially the mixer config)
-#
-# runlevels: openelec, debug, configure
-
-echo "### Setting up sound card ###"
-
-# include audio configuration file
-. /etc/audio
-
-[ ! -f /etc/asound.conf ] && echo "" > /etc/asound.conf
-
-mixer() {
-  parm=${3:-on}
-  amixer -c $ALSA_CARD sset "$1" "$2" $parm >/dev/null 2>&1
-  amixer -c $ALSA_CARD sset "$1" $parm >/dev/null 2>&1
-}
-
-# set alsa channel mode (6ch, 4ch, 2ch)
-mixer 'Channel Mode' "${CHANNELS}ch"
-
-# set common mixer params
-mixer Master 90%
-mixer Front 90%
-mixer PCM 90%
-mixer Synth 90%
-# mute CD, since using digital audio instead
-mixer CD 0% mute
-# Only unmute Line and Aux if they are possibly used.
-if [ -e /var/use_dxr3 -o -e /var/tvcard -o -e /var/dvbcard -o -e /var/digimatrix ]; then
-  mixer Line 90%
-  mixer Aux 90%
-else
-  mixer Line 0% mute
-  mixer Aux 0% mute
-fi
-# mute mic
-mixer Mic 0% mute
-# ESS 1969 chipset has 2 PCM channels
-mixer PCM,1 90%
-# Trident/YMFPCI/emu10k1
-mixer Wave 100%
-mixer Music 100%
-mixer AC97 100%
-mixer Surround 90%
-mixer 'Surround Digital' 90%
-mixer 'Wave Surround' 90%
-if [ "$CHANNELS" = 6 ]; then
-  mixer 'Duplicate Front' 0% off
-else
-  mixer 'Duplicate Front' 90%
-fi
-mixer 'Sigmatel 4-Speaker Stereo' 90%
-# CS4237B chipset:
-mixer 'Master Digital' 90%
-# DRC
-mixer 'Dynamic Range Compression' 90%
-# Envy24 chips with analog outs
-mixer DAC 90%
-mixer DAC,0 90%
-mixer DAC,1 90%
-# some notebooks use headphone instead of master
-mixer Headphone 90%
-mixer 'Internal Speaker' 75%
-mixer Playback 100%
-
-mixer Center 90%
-mixer LFE 90%
-mixer Center/LFE 90%
-
-# Required for newer Via hardware
-mixer 'VIA DXS,0' 80%
-mixer 'VIA DXS,1' 80%
-mixer 'VIA DXS,2' 80%
-mixer 'VIA DXS,3' 80%
-
-# Intel P4P800-MX  (Ubuntu bug #5813)
-mixer 'Master Playback Switch' on
-
-# Required at least for Via 823x hardware on DFI K8M800-MLVF Mobo
-mixer 'IEC958 Capture Monitor' 0% off
-
-# Required on some notebooks with ICH4:
-mixer 'Headphone Jack Sense' 0% off
-mixer 'Line Jack Sense' 0% off
-
-# Required on some Vaio notebooks (B3XP):
-mixer 'External Amplifier' 0% mute
-
-# Required for either Analog or Digital output
-mixer 'SB Live Analog/Digital Output Jack' $SBL_AUDIGY
-mixer 'Audigy Analog/Digital Output Jack' $SBL_AUDIGY
-
-# set SPDIF mixer params
-if [ "$SOUNDCARD_MODE" = SPDIF ]; then
-  mixer 'IEC958' 90% on
-  mixer 'IEC958 Output' 90%
-  mixer 'IEC958 Playback AC97-SPSA' $AC97_SPSA
-  mixer 'IEC958 Coaxial' 90%
-  mixer 'IEC958 LiveDrive' 90%
-  mixer 'IEC958 Optical Raw' 90%
-  mixer 'SPDIF Out' 90%
-  mixer 'SPDIF Front' 90%
-  mixer 'SPDIF Rear' 90%
-  mixer 'SPDIF Center/LFE' 90%
-  mixer 'Master Digital' 80%
-else
-  mixer 'SPDIF Out' 0% off
-  mixer 'Analog Front' 90%
-  mixer 'Analog Rear' 90%
-  mixer 'Analog Center/LFE' 90%
-fi
-
-exit 0
diff --git a/packages/audio/alsa/install b/packages/audio/alsa/install
index c1a3e478cd..6183db5be8 100755
--- a/packages/audio/alsa/install
+++ b/packages/audio/alsa/install
@@ -8,5 +8,5 @@ $SCRIPTS/install alsa-lib
 $SCRIPTS/install alsa-utils
 
 mkdir -p $INSTALL/etc/modprobe.d
-cp $PKG_DIR/config/alsa-base $INSTALL/etc/modprobe.d
-cp $PKG_DIR/config/audio $INSTALL/etc
+#cp $PKG_DIR/config/alsa-base $INSTALL/etc/modprobe.d
+#cp $PKG_DIR/config/audio $INSTALL/etc
diff --git a/packages/sysutils/udev/build.bk b/packages/sysutils/udev/build.bk
deleted file mode 100755
index 91c900b466..0000000000
--- a/packages/sysutils/udev/build.bk
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/build toolchain
-
-UTILS="ata_id cdrom_id dvb_device_name edd_id firmware_helper ide_media path_id scsi_id usb_device_name usb_id volume_id"
-for i in $UTILS; do
-  EXTRAS="$EXTRAS extras/$i"
-done
-
-cd $BUILD/$1*
-make OPTFLAGS="$CFLAGS" \
-     LDFLAGS="$LDFLAGS" \
-     CROSS_COMPILE="$TARGET_PREFIX" \
-     USE_LOG=true \
-     USE_SELINUX=false \
-     DEBUG=false \
-     EXTRAS="$EXTRAS" \
-     V=true
-
-cp -PR extras/volume_id/lib/libvolume_id.h $LIB_PREFIX/include
-cp -PR extras/volume_id/lib/libvolume_id.so* $LIB_PREFIX/lib
-
-VOLID_PC=$LIB_PREFIX/lib/pkgconfig/libvolume_id.pc
-cp extras/volume_id/lib/libvolume_id.pc $VOLID_PC
-sed -i "s%libdir=.*%libdir=$LIB_PREFIX/lib%" $VOLID_PC
-sed -i "s%includedir=.*%includedir=$LIB_PREFIX/include%" $VOLID_PC
diff --git a/packages/sysutils/udev/config/rules.d/20-names.rules b/packages/sysutils/udev/config/rules.d/20-names.rules
index 543dc95ade..8bfe01076f 100644
--- a/packages/sysutils/udev/config/rules.d/20-names.rules
+++ b/packages/sysutils/udev/config/rules.d/20-names.rules
@@ -84,7 +84,7 @@ SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n"
 # Link to CD-ROM devices (/dev/cdrom and /dev/dvd)
 KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", \
         IMPORT{program}="cdrom_id --export $tempnode", \
-        SYMLINK="cdrom dvd"
+        SYMLINK="cdrom dvd cdroms/%k"
 
 # Raw block devices need to be /dev/raw/*
 SUBSYSTEM=="raw", KERNEL=="raw[0-9]*",	NAME="raw/%k"
diff --git a/packages/sysutils/udev/install.bk b/packages/sysutils/udev/install.bk
deleted file mode 100755
index ff4e60fd4d..0000000000
--- a/packages/sysutils/udev/install.bk
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-mkdir -p $INSTALL/sbin
-cp $BUILD/$1*/udevd $INSTALL/sbin
-cp $BUILD/$1*/udevadm $INSTALL/sbin
-ln -s /sbin/udevadm $INSTALL/usr/bin/udevinfo
-cp $BUILD/$1*/extras/firmware_helper/firmware_helper $INSTALL/sbin
-
-mkdir -p $INSTALL/lib/udev
-for i in ata_id cdrom_id dvb_device_name edd_id ide_media path_id scsi_id usb_device_name usb_id; do
-  cp $BUILD/$1*/extras/$i/$i $INSTALL/lib/udev
-done
-cp $BUILD/$1*/extras/volume_id/vol_id $INSTALL/lib/udev
-
-mkdir -p $INSTALL/lib
-cp -PR $BUILD/$1*/extras/volume_id/lib/libvolume_id.so* $INSTALL/lib
-
-mkdir -p $INSTALL/etc/udev/rules.d
-cp $PACKAGES/$1/config/udev.conf $INSTALL/etc/udev
-cp $PACKAGES/$1/config/rules.d/* $INSTALL/etc/udev/rules.d
-
-mkdir -p $INSTALL/etc/udev/scripts
-cp $PACKAGES/$1/scripts/* $INSTALL/etc/udev/scripts
diff --git a/packages/sysutils/udev/unpack.bk b/packages/sysutils/udev/unpack.bk
deleted file mode 100755
index 14a958ee4d..0000000000
--- a/packages/sysutils/udev/unpack.bk
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/build toolchain
-
-sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $HOST_CC|" \
-       -e "s|^CROSS_COMPILE[[:space:]]*=.*$|CROSS_COMPILE = $TARGET_PREFIX|" \
-       $BUILD/$1*/Makefile
diff --git a/packages/sysutils/udev/url.bk b/packages/sysutils/udev/url.bk
deleted file mode 100644
index 74fa6b2c79..0000000000
--- a/packages/sysutils/udev/url.bk
+++ /dev/null
@@ -1 +0,0 @@
-http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/udev-124.tar.bz2