Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23976/scripts
Modified Files:
hostap-driver lm_sensors xfsprogs
Log Message:
some more updates to get kernel 2.6 working
Index: hostap-driver
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/hostap-driver,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hostap-driver 11 Jan 2004 18:17:06 -0000 1.3
+++ hostap-driver 26 Jan 2004 00:47:50 -0000 1.4
@@ -33,9 +33,9 @@
case $1 in
build )
if [ "$CONFIG_HOSTAP_DRIVER" = "y" ]; then
- if [ "$CONFIG_PCMCIA_CS" = "y" ]; then
- make pci plx pccard EXTRA_CFLAG="-DPRISM2_HOSTAPD -DCONFIG_HOSTAP_FIRMWARE" \
- -e KERNEL_PATH=$KERNELDIR PCMCIA_PATH=$PCMCIADIR || exit 1
+ if [ "$CONFIG_PCMCIA_CS" = "y" ] && [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+ make pci plx pccard EXTRA_CFLAG="-DPRISM2_HOSTAPD -DCONFIG_HOSTAP_FIRMWARE" \
+ -e KERNEL_PATH=$KERNELDIR PCMCIA_PATH=$PCMCIADIR || exit 1
else
make pci plx pccard EXTRA_CFLAG="-DPRISM2_HOSTAPD -DCONFIG_HOSTAP_FIRMWARE" \
-e KERNEL_PATH=$KERNELDIR || exit 1
Index: lm_sensors
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lm_sensors,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- lm_sensors 21 Jan 2004 15:08:46 -0000 1.15
+++ lm_sensors 26 Jan 2004 00:47:50 -0000 1.16
@@ -56,7 +56,7 @@
fi
SMP=0
test "$CONFIG_LINUX_SMP" = "y" && SMP=1
- make user $PMAKE PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man COMPILE_KERNEL=1 || exit 1
+ make user $PMAKE PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man COMPILE_KERNEL=0 || exit 1
strip_debug
fi
@@ -66,8 +66,7 @@
if [ "$CONFIG_LM_SENSORS" = "y" ]; then
rm -rf $WORKDIR/tmp || exit 1
mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
- make install DESTDIR=$WORKDIR/tmp PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man || exit 1
- #make install DESTDIR=$WORKDIR/tmp PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man COMPILE_KERNEL=0 I2C_HEADERS=$KERNELDIR/include/linux LINUX=$KERNELDIR|| exit 1
+ make user_install DESTDIR=$WORKDIR/tmp PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man || exit 1
copy_docs $WORKDIR/tmp
mkdir -p $DOCDIR/lm_sensors || exit 1
Index: xfsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/xfsprogs,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- xfsprogs 17 Jan 2004 01:15:39 -0000 1.22
+++ xfsprogs 26 Jan 2004 00:47:50 -0000 1.23
@@ -40,12 +40,12 @@
set_kernel_option CONFIG_FS_POSIX_ACL n
fi
popd > /dev/null
+ set_kernel_option CONFIG_XFS_FS m
+ set_kernel_option CONFIG_XFS_RT y
+ set_kernel_option CONFIG_XFS_QUOTA y
+ set_kernel_option CONFIG_XFS_DMAPI n
fi
- set_kernel_option CONFIG_XFS_FS m
- set_kernel_option CONFIG_XFS_RT y
- set_kernel_option CONFIG_XFS_QUOTA y
- set_kernel_option CONFIG_XFS_DMAPI n
./configure --prefix= --enable-shared=yes --enable-shared-uuid=yes || exit 1
make $PMAKE || exit 1
|
