Can build everything

1 files changed, 301 insertions, 6 deletions

diff --git a/debian/patches/dyson-config.patch b/debian/patches/dyson-config.patch
index 6a610f0..0e08d6f 100644
--- a/debian/patches/dyson-config.patch
+++ b/debian/patches/dyson-config.patch
@@ -1,7 +1,7 @@
 Index: oss4/configure
 ===================================================================
---- oss4.orig/configure	2013-05-04 20:44:57.750037915 +0400
-+++ oss4/configure	2013-05-04 23:08:56.152871980 +0400
+--- oss4.orig/configure	2013-05-05 05:22:08.998003945 +0400
++++ oss4/configure	2013-05-05 05:24:51.714479419 +0400
 @@ -1,5 +1,7 @@
  #!/bin/sh
  
@@ -36,7 +36,7 @@ Index: oss4/configure
 -	;;
 +    ISA=""
 +    if [ "x$DEB_HOST_ARCH_CPU" = "xamd64" ]; then
-+        ISA="-Aamd64 -K"
++        ISA="-Aamd64"
 +    fi
 +	exec sh $SRCDIR/setup/setupdir.sh $ISA
 +    ;;
@@ -46,7 +46,7 @@ Index: oss4/configure
 Index: oss4/setup/SunOS/make.local
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ oss4/setup/SunOS/make.local	2013-05-04 22:28:36.972357104 +0400
++++ oss4/setup/SunOS/make.local	2013-05-05 05:24:51.719019812 +0400
 @@ -0,0 +1,21 @@
 +build: 	kernel/framework/include/buildid.h all
 +	sh build.sh
@@ -71,8 +71,8 @@ Index: oss4/setup/SunOS/make.local
 +	soundoff && sync && soundon && echo "OSS has started OK"
 Index: oss4/setup/srcconf_solaris.inc
 ===================================================================
---- oss4.orig/setup/srcconf_solaris.inc	2013-05-04 20:44:57.749940723 +0400
-+++ oss4/setup/srcconf_solaris.inc	2013-05-04 22:28:36.974404091 +0400
+--- oss4.orig/setup/srcconf_solaris.inc	2013-05-05 05:22:08.998357242 +0400
++++ oss4/setup/srcconf_solaris.inc	2013-05-05 05:30:59.417111746 +0400
 @@ -10,7 +10,7 @@
   *
   */
@@ -93,3 +93,298 @@ Index: oss4/setup/srcconf_solaris.inc
  #else
  
  # if 0
+@@ -63,7 +65,7 @@
+ #ifdef USE_GCC
+   if (strcmp (tmp, "amd64") == 0)
+     {
+-      strcpy (conf->OSflags, "-m64 -fno-common  -mcmodel=kernel -mno-red-zone");
++      strcpy (conf->OSflags, "-m64");
+       strcpy (conf->platform, "i86pc");
+     }
+   else if (strcmp (tmp, "sparcv9") == 0)
+@@ -140,7 +142,5 @@
+ static void
+ add_kernel_flags (FILE * f)
+ {
+-#if 0
+-  /* fprintf(f, "CFLAGS += -xmodel=kernel\n"); */
+-#endif
++  fprintf(f, "CFLAGS += -fno-common  -mcmodel=kernel -mno-red-zone\n");
+ }
+Index: oss4/setup/SunOS/build.sh
+===================================================================
+--- oss4.orig/setup/SunOS/build.sh	2013-05-05 05:22:08.998555722 +0400
++++ oss4/setup/SunOS/build.sh	2013-05-05 05:24:51.726523208 +0400
+@@ -11,29 +11,6 @@
+    TXT2MAN=./txt2man
+ fi
+ 
+-if test "`uname -p`" = "sparc"
+-then
+-	KERNEL32=sparc
+-	KERNEL64=sparcv9
+-	MACH=sun4u
+-else
+-	case `uname -r` in
+-	"5.8")
+-		KERNEL32=i386
+-		KERNEL64=NULL
+-		;;
+-	"5.9")
+-		KERNEL32=i386
+-		KERNEL64=NULL
+-		;;
+-	*)
+-		KERNEL32=i386
+-		KERNEL64=amd64
+-		;;
+-	esac
+-	MACH=i86pc
+-fi
+-
+ if test "`uname -r`" = "5.9" || test "`uname -r`" = "5.8"
+ then
+ 	AMSRC=amsrc1
+@@ -45,12 +22,15 @@
+ # Re-create the prototype directory
+ rm -rf prototype
+ 
++# use dpkg-architecture, when we support more than amd64 ;-)
++KERNELDIR=amd64
++
+ mkdir prototype
+ mkdir prototype/kernel
+ mkdir prototype/kernel/drv
+-mkdir prototype/kernel/drv/$KERNEL64
++mkdir prototype/kernel/drv/$KERNELDIR
+ mkdir prototype/kernel/misc
+-mkdir prototype/kernel/misc/$KERNEL64
++mkdir prototype/kernel/misc/$KERNELDIR
+ 
+ mkdir prototype/etc
+ mkdir prototype/etc/oss
+@@ -74,16 +54,16 @@
+ /var/log/soundon.log.
+ EOF
+ 
+-cp $KERNEL32/.version prototype/etc/oss/version.dat
++cp .version prototype/etc/oss/version.dat
+ 
+ # Copy the files to their right place
+ 
+ cp $SRCDIR/include/soundcard.h prototype/usr/include/sys
+ cp $SRCDIR/include/oss_userdev_exports.h prototype/usr/include/oss
+-(cd $KERNEL32/target/bin; rm -f ossrecord; ln -s ossplay ossrecord)
+-cp $KERNEL32/target/bin/* prototype/usr/bin
+-cp $KERNEL32/target/sbin/* prototype/usr/sbin
+-cp $KERNEL32/setup/SunOS/sbin/* prototype/usr/sbin
++(cd target/bin; rm -f ossrecord; ln -s ossplay ossrecord)
++cp target/bin/* prototype/usr/bin
++cp target/sbin/* prototype/usr/sbin
++cp setup/SunOS/sbin/* prototype/usr/sbin
+ cp origdir/setup/SunOS/S89oss prototype/etc/init.d/oss
+ chmod 500 prototype/usr/sbin/*
+ echo "autosave_mixer yes" > prototype/etc/oss/userdefs
+@@ -92,12 +72,12 @@
+ 
+ # Create the driver modules (for 64 bit)
+ 
+-if test "`ls $KERNEL64/target/modules/*.o 2>/dev/null` " != " "
++if test "`ls target/modules/*.o 2>/dev/null` " != " "
+ then
+ 	# osscommon
+-	if ld -64 -dy -r -Nmisc/usba -o prototype/kernel/misc/$KERNEL64/osscommon $KERNEL64/target/objects/*.o
++	if sunld -dy -r -Nmisc/usba -o prototype/kernel/misc/$KERNELDIR/osscommon target/objects/*.o
+ 	then
+-		$TXT2MAN -v "OSS Devices" -s 7 $KERNEL64/kernel/drv/osscore/osscore.man > prototype/usr/man/man7d/osscore.7d
++		$TXT2MAN -v "OSS Devices" -s 7 $KERNELDIR/kernel/drv/osscore/osscore.man > prototype/usr/man/man7d/osscore.7d
+ 	else
+ 		exit 1
+ 	fi
+@@ -118,26 +98,26 @@
+ 	done
+ 
+ 	# Other modules for 64bit kernel
+-	for n in $KERNEL64/target/modules/*.o
++	for n in target/modules/*.o
+ 	do
+   		N=`basename $n .o`
+-  		if ld -64 -dy -r -Nmisc/osscommon -o prototype/kernel/drv/$KERNEL64/$N $n 
++  		if sunld -dy -r -Nmisc/osscommon -o prototype/kernel/drv/$KERNELDIR/$N $n
+   		then
+    			OK=1
+ 		else
+    			exit 1
+ 		fi
+ 
+-  		if test $KERNEL64 = "sparcv9"
++  		if test $KERNELDIR = "sparcv9"
+ 		then
+-			grep "^$N[ 	]" $KERNEL64/devices.list >> devlist.txt
++			grep "^$N[ 	]" $KERNELDIR/devices.list >> devlist.txt
+   		fi
+ 	done
+ 
+ 	# USB Module
+-	if test -f $KERNEL64/target/modules/oss_usb.o
++	if test -f target/modules/oss_usb.o
+ 	then
+-		if ld -64 -dy -r -Nmisc/osscommon -Nmisc/usba -o prototype/kernel/drv/$KERNEL64/oss_usb $KERNEL64/target/modules/oss_usb.o
++		if sunld -dy -r -Nmisc/osscommon -Nmisc/usba -o prototype/kernel/drv/$KERNELDIR/oss_usb target/modules/oss_usb.o
+  		then
+   			OK=1
+  		else
+@@ -146,9 +126,9 @@
+  	fi
+ 
+ 	# SADA compatibility module
+-	if test -r $KERNEL64/target/modules/oss_sadasupport.o
++	if test -r target/modules/oss_sadasupport.o
+ 	then
+-		if ld -64 -dy -r -Nmisc/osscommon -Nmisc/$AMSRC -Nmisc/audiosup -Nmisc/mixer -o prototype/kernel/drv/$KERNEL64/oss_sadasupport $KERNEL64/target/modules/oss_sadasupport.o
++		if sunld -dy -r -Nmisc/osscommon -Nmisc/$AMSRC -Nmisc/audiosup -Nmisc/mixer -o prototype/kernel/drv/$KERNELDIR/oss_sadasupport target/modules/oss_sadasupport.o
+ 		then
+   			OK=1
+ 		else
+@@ -159,70 +139,6 @@
+ 	fi
+ fi # 64 bit modules done
+ 
+-# Handle 32 bit modules
+-
+-if test "`ls $KERNEL32/target/modules/*.o 2>/dev/null` " != " "
+-then
+-
+-	# osscommon
+-
+-	if ld -dy -r -Nmisc/usba -o prototype/kernel/misc/osscommon $KERNEL32/target/objects/*.o
+-	then
+-		$TXT2MAN -v "OSS Devices" -s 7 $KERNEL32/kernel/drv/osscore/osscore.man > prototype/usr/man/man7d/osscore.7d
+-	else
+-		exit 1
+-	fi
+-
+-	rm -f fpsupport.o __xtol.o
+-
+-	# Other modules for 32bit kernel
+-	for n in $KERNEL32/target/modules/*.o
+-	do
+-		N=`basename $n .o`
+-		if ld -dy -r -Nmisc/osscommon -o prototype/kernel/drv/$N $n
+-		then
+-			OK=1
+-		else
+-			exit 1
+-		fi
+-		grep "^$N[ 	]" $KERNEL32/devices.list >> devlist.txt
+-	done
+-
+-	# USB Modules
+-	if test -f $KERNEL32/target/modules/oss_usb.o
+-	then
+-		if ld -dy -r -Nmisc/osscommon -Nmisc/usba -o prototype/kernel/drv/oss_usb $KERNEL32/target/modules/oss_usb.o
+-		then
+-			OK=1
+-		else
+-			exit 1
+-		fi
+-	fi
+-	
+-	# SADA Compatibility
+-	if test -r $KERNEL32/target/modules/oss_sadasupport.o
+-	then
+-		if ld -dy -r -Nmisc/osscommon -Nmisc/$AMSRC -Nmisc/audiosup -Nmisc/mixer -o prototype/kernel/drv/oss_sadasupport $KERNEL32/target/modules/oss_sadasupport.o
+-		then
+-			OK=1
+-		else
+-			exit 1
+-		fi
+-	else
+-		OK=1
+-	fi
+-
+-fi # 32 bit modules done
+-
+-if test "$KERNEL64 " = "sparcv9 "
+-then
+-	# Drop SB Live! from the list of supported devices for Sparc
+-	rm -f tmplist
+-	mv devlist.txt tmplist
+-	grep -v "Sound Blaster Live" < tmplist|sort|uniq >devlist.txt
+-	rm -f tmplist
+-fi
+-
+ cp devlist.txt prototype/etc/oss/devices.list
+ 
+ if test -d $KERNEL32/kernel/nonfree
+@@ -232,39 +148,39 @@
+ 
+ # Generate the config files
+ rm -f confgen
+-cc -o confgen -DTXT2MAN=\"$TXT2MAN\" $OSFLAGS $KERNEL32/setup/SunOS/confgen.c
++cc -o confgen -DTXT2MAN=\"$TXT2MAN\" $OSFLAGS setup/SunOS/confgen.c
+ 
+-./confgen prototype/kernel/drv \\/kernel\\/drv $KERNEL32/kernel/drv/* $KERNEL32/kernel/nonfree/drv/* $KERNEL32/kernel/framework/*
++./confgen prototype/kernel/drv \\/kernel\\/drv kernel/drv/* kernel/nonfree/drv/* kernel/framework/*
+ rm -f confgen
+ 
+ # Generate Man pages for user commands
+-for i in $KERNEL32/target/bin/*
++for i in target/bin/*
+ do
+ 	CMD=`basename $i`
+-	$TXT2MAN -t "$CMD" -v "OSS User Commands" -s 1 $KERNEL32/cmd/$CMD/$CMD.man > prototype/usr/man/man1/$CMD.1
++	$TXT2MAN -t "$CMD" -v "OSS User Commands" -s 1 cmd/$CMD/$CMD.man > prototype/usr/man/man1/$CMD.1
+ 	echo done $CMD
+ done
+ 
+ # Generate Man pages for system commands
+-for i in $KERNEL32/target/sbin/*
++for i in target/sbin/*
+ do
+ 	CMD=`basename $i`
+-	if test -f $KERNEL32/cmd/$CMD/$CMD.man
++	if test -f cmd/$CMD/$CMD.man
+ 	then
+-		$TXT2MAN -t "$CMD" -v "OSS System Administration Commands" -s 1m $KERNEL32/cmd/$CMD/$CMD.man > prototype/usr/man/man1m/$CMD.1m
++		$TXT2MAN -t "$CMD" -v "OSS System Administration Commands" -s 1m cmd/$CMD/$CMD.man > prototype/usr/man/man1m/$CMD.1m
+ 		echo done $CMD
+ 	fi
+ done
+ 
+ # Generate pages for Maintenance Commands 
+ rm -f prototype/usr/man/man1m/ossdetect.1m
+-$TXT2MAN -t "ossdetect" -v "OSS User Commands" -s 1m $KERNEL32/os_cmd/SunOS/ossdetect/ossdetect.man > prototype/usr/man/man1m/ossdetect.1m
++$TXT2MAN -t "ossdetect" -v "OSS User Commands" -s 1m os_cmd/SunOS/ossdetect/ossdetect.man > prototype/usr/man/man1m/ossdetect.1m
+ echo done ossdetect
+ 
+ # Licensing stuff
+-if test -f $KERNEL32/4front-private/osslic.c
++if test -f 4front-private/osslic.c
+ then
+-	cc $OSFLAGS -o prototype/usr/sbin/osslic -I$KERNEL32/setup -I$KERNEL32/kernel/nonfree/include -I$KERNEL32/kernel/framework/include -I$KERNEL32/include -I$KERNEL32/kernel/OS/SunOS $KERNEL32/4front-private/osslic.c
++	cc $OSFLAGS -o prototype/usr/sbin/osslic -Isetup -Ikernel/nonfree/include -Ikernel/framework/include -Iinclude -Ikernel/OS/SunOS 4front-private/osslic.c
+ 	strip prototype/usr/sbin/osslic
+ 	
+ 	if test -f prototype/kernel/misc/osscommon
+@@ -272,16 +188,16 @@
+ 		prototype/usr/sbin/osslic -q -u -3prototype/kernel/misc/osscommon
+ 	fi
+ 	
+-	if test -f prototype/kernel/misc/$KERNEL64/osscommon
++	if test -f prototype/kernel/misc/$KERNELDIR/osscommon
+ 	then
+-		prototype/usr/sbin/osslic -q -u -6prototype/kernel/misc/$KERNEL64/osscommon
++		prototype/usr/sbin/osslic -q -u -6prototype/kernel/misc/$KERNELDIR/osscommon
+ 	fi
+ fi
+ 
+-if test -f $KERNEL32/4front-private/ossupdate.c
++if test -f 4front-private/ossupdate.c
+ then
+   # ossupdate
+-  cc -I$KERNEL32 $KERNEL32/4front-private/ossupdate.c -s -o prototype/usr/sbin/ossupdate -lsocket -lnsl
++  cc -I. 4front-private/ossupdate.c -s -o prototype/usr/sbin/ossupdate -lsocket -lnsl
+ fi
+ 
+ sh $SRCDIR/setup/build_common.sh $SRCDIR $OSSLIBDIR