--- usr/lib/oss/build/install.sh.old 2007-02-15 17:02:16.000000000 +0800 +++ usr/lib/oss/build/install.sh 2007-03-02 11:34:05.000000000 +0800 @@ -10,21 +10,14 @@ rm -f $OSSLIBDIR/.cuckoo_installed -# Check if we should use REGPARM or non-REGPARM modules -if /usr/sbin/ossvermagic -r || /sbin/modinfo ext3|grep -q REGPARM -then +# Always use REGPARM (for kernel 2.6.20+) REGPARM=REGPARM - rm -rf $OSSLIBDIR/objects - ln -s $OSSLIBDIR/objects.regparm $OSSLIBDIR/objects - rm -rf $OSSLIBDIR/modules - ln -s $OSSLIBDIR/modules.regparm $OSSLIBDIR/modules -else - REGPARM=NOREGPARM - rm -rf $OSSLIBDIR/objects - ln -s $OSSLIBDIR/objects.noregparm $OSSLIBDIR/objects - rm -rf $OSSLIBDIR/modules - ln -s $OSSLIBDIR/modules.noregparm $OSSLIBDIR/modules -fi +pushd $OSSLIBDIR +rm -rf objects +ln -s objects.regparm objects +rm -rf modules +ln -s modules.regparm modules +popd if ! test -f $OSSLIBDIR/objects/osscore.o then @@ -291,12 +284,12 @@ fi # Install ALSA interface module (Cuckoo) -#(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 -#if (cd $OSSLIBDIR/cuckoo && make install) > $OSSLIBDIR/logs/cuckoo.log 2>&1 -#then -# touch $OSSLIBDIR/.cuckoo_installed -#fi -#(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 +(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 +if (cd $OSSLIBDIR/cuckoo && make install) > $OSSLIBDIR/logs/cuckoo.log 2>&1 +then + touch $OSSLIBDIR/.cuckoo_installed +fi +(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 # Remove bogus char major 14 device files left from earlier OSS versions.