diff -ur oss-v4.1-build1050-src-gpl_orig/setup/Linux/oss/build/install.sh oss-v4.1-build1050-src-gpl/setup/Linux/oss/build/install.sh --- oss-v4.1-build1050-src-gpl_orig/setup/Linux/oss/build/install.sh 2008-11-24 02:25:16.000000000 +0100 +++ oss-v4.1-build1050-src-gpl/setup/Linux/oss/build/install.sh 2008-12-22 05:31:39.528641367 +0100 @@ -47,15 +47,15 @@ (cd /usr/lib/oss/build ; rm -f ali5455.c allegro.c als300.c als4000.c apci97.c atiaudio.c audigyls.c audioloop.c audiopci.c cmi8788.c cmpci.c cs4280.c cs4281.c digi32.c digi96.c emu10k1x.c envy24.c envy24ht.c fm801.c geode.c hdaudio.c hdsp.c ich.c imux.c maestro.c neomagic.c ossusb.c riptide.c s3vibes.c sblive.c sbxfi.c softoss.c solo.c sonorus.c trident.c via8233.c via97.c vmix.c vortex.c ymf7xx.c) echo echo - echo Error: Older OSS version seems to be installed in your system. - echo Please remove previous /usr/lib/oss directory and the install OSS v4.1 again. + echo "Error: Older OSS version seems to be installed in your system." + echo "Please remove previous /usr/lib/oss directory and the install OSS v4.1 again." soundoff exit 127 fi if ! test -f $OSSLIBDIR/objects/osscore.o then - echo Error: OSS core module for $REGPARM kernel is not available in $OSSLIBDIR/objects + echo "Error: OSS core module for $REGPARM kernel is not available in $OSSLIBDIR/objects" exit 1 fi @@ -63,66 +63,6 @@ echo OSS build environment set up for $REGPARM kernels KERNELDIR=/lib/modules/$UNAME/build -UBUNTUPACKAGES="" - -OK=1 -echo - -if test "`which gcc 2>/dev/null` " = " " -then - echo " gcc" - UBUNTUPACKAGES="$UBUNTUPACKAGES gcc" - OK=0 -fi - -if test "`which make 2>/dev/null` " = " " -then - echo " make" - UBUNTUPACKAGES="$UBUNTUPACKAGES make" - OK=0 -fi - -if test "`which ld 2>/dev/null` " = " " -then - echo " binutils" - UBUNTUPACKAGES="$UBUNTUPACKAGES binutils" - OK=0 -fi - -if ! test -f /usr/include/stdio.h -then - echo " C library headers (glibc-devel or build-essential)" - OK=0 - UBUNTUPACKAGES="$UBUNTUPACKAGES build-essentials" -fi - -if test "$OK " = "0 " -then - echo - echo 'Error: The above Linux package(s) seem to be missing from your system.' - echo ' Please install them and then try to install OSS again.' - echo - echo Please refer to the documentation of your Linux distribution if you - echo have problems with installing the packages. - echo - - if grep -q Ubuntu /etc/issue # Ubuntu? - then - echo You can use the following commands to download and install all - echo required packages: - echo - - for n in $UBUNTUPACKAGES - do - echo " apt-get install $n" - done - - exit 1 - fi - - exit 1 -fi - if ! test -f $KERNELDIR/Makefile && ! test -f /lib/modules/$UNAME/sources/Makefile then @@ -132,41 +72,7 @@ echo ' Please install the kernel development package if linking the' echo ' OSS modules fails.' echo - echo The kernel development package may be called kernel-devel, kernel-smp-devel, - echo kernel-sources, kernel-headers or something like that. Please refer - echo to the documentation of your Linux distribution if there are any - echo difficulties in installing the kernel/driver development environment. - echo - - if grep -q 'Fedora Core release' /etc/issue - then - if uname -v|grep -q SMP - then - echo Assuming that you are using Fedora Core 5 or later - echo "the right kernel source package (RPM) is probably called" - echo kernel-smp-devel. - else - echo Assuming that you are using Fedora Core 5 or later - echo "the right kernel source package (RPM) is probably called" - echo kernel-devel. - fi - else - echo For your Linux distribution the right kernel source package - echo might be kernel-source. - fi - echo - - if grep -q Ubuntu /etc/issue || grep -q Debian /etc/issue # Ubuntu or Debian? - then - echo Under Ubuntu you may need to prepare the kernel environment - echo after downloading the kernel sources using - echo - echo " sudo apt-get install linux-headers-$UNAME" - echo " cd /usr/src/linux-headers-$UNAME/" -# echo " sudo make prepare" -# echo " sudo make prepare scripts" - echo - fi + echo 'Emerge some kernel sources, compile, install and boot them!' fi if ! test -d /lib/modules/$UNAME @@ -289,33 +195,6 @@ mkdir /etc/init.d fi -rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss -cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss - -chmod 744 /etc/init.d/oss - -if test -x /sbin/chkconfig -then - /sbin/chkconfig oss on > /dev/null 2>&1 -else - if test -x /usr/sbin/update-rc.d - then - /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1 - else - if test -d etc/rc.d/rc3.d - then - rm -f /etc/rc.d/rc3.d/S89oss - ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss - else - if test -d /etc/rc3.d - then - rm -f /etc/rc3.d/S89oss - ln -s /etc/init.d/oss /etc/rc3.d/S89oss - fi - fi - fi -fi - # Install ALSA interface module (Cuckoo) #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1