Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24362/scripts
Modified Files:
Python alsa-driver functions openh323 openh323gk
Log Message:
more updates for kernel 2.6
Index: Python
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Python,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Python 11 Jan 2004 14:43:04 -0000 1.18
+++ Python 1 Feb 2004 15:04:23 -0000 1.19
@@ -29,7 +29,9 @@
build )
if [ "$CONFIG_PYTHON" = "y" ]; then
disable_et_dyn
- rm -rf $WORKDIR/Python-install/usr
+ old_kernel_includes
+ test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
+ rm -rf $WORKDIR/Python-install
mkdir -p $WORKDIR/Python-install/usr
./configure --prefix=$WORKDIR/Python-install/usr --host=$CONF_HOST --with-threads \
--enable-ipv6 --with-signal-module || exit 1
Index: alsa-driver
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/alsa-driver,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- alsa-driver 11 Jan 2004 14:43:04 -0000 1.11
+++ alsa-driver 1 Feb 2004 15:04:23 -0000 1.12
@@ -28,6 +28,9 @@
MYNAME=ALSA-DRIVER
+# exit when this is kernel 2.6, since it's all already included in the kernel
+test "$CONFIG_LINUX_VERSION" = "2.6" && exit 0
+
case $1 in
build )
if [ "$CONFIG_ALSA" = "y" ]; then
Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- functions 16 Jan 2004 01:47:55 -0000 1.51
+++ functions 1 Feb 2004 15:04:23 -0000 1.52
@@ -424,6 +424,14 @@
function old_kernel_includes () {
OLDINCLUDEDIR=$(find_src_dir 2.4.21-include)
+ if [ "CONFIG_KERNEL_VERSION" == "2.6" ]; then
+ echo "**********************************************************"
+ echo "HEY DUDE, PLEASE NOTE ..... YOU COMPILE FOR KERNEL 2.6"
+ echo "AND USE OLD INCLUDES FROM 2.4 BECAUSE THE PACKAGE ISNT"
+ echo "COMPILE-READY FOR 2.6"
+ echo "**********************************************************"
+ sleep 2
+ fi
ln -nsf $OLDINCLUDEDIR/linux /usr/include/linux || exit 1
ln -nsf $OLDINCLUDEDIR/asm-i386 /usr/include/asm || exit 1
ln -nsf $OLDINCLUDEDIR/asm-generic /usr/include/asm-generic || exit 1
Index: openh323
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openh323,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- openh323 11 Jan 2004 14:43:04 -0000 1.8
+++ openh323 1 Feb 2004 15:04:23 -0000 1.9
@@ -35,6 +35,7 @@
pushd .. > /dev/null
export PWLIBDIR=$PWD/pwlib
popd > /dev/null
+ test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
./configure --prefix=/usr || exit 1
# don't use parallel builds ($PMAKE)
make || exit 1
Index: openh323gk
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openh323gk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- openh323gk 11 Jan 2004 14:43:04 -0000 1.8
+++ openh323gk 1 Feb 2004 15:04:23 -0000 1.9
@@ -30,6 +30,7 @@
case $1 in
build )
if [ "$CONFIG_OPENH323GK" = "y" ]; then
+ test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
pushd .. > /dev/null
export PWLIBDIR=$PWD/pwlib
export OPENH323DIR=$PWD/openh323
|
