devil-linux-commit Mailing List for Devil-Linux (Page 243)

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv20977/scripts

Modified Files:
	build-iso 
Log Message:
don't try to copy doc when it's not there


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- build-iso	8 Nov 2003 04:04:51 -0000	1.47
+++ build-iso	8 Nov 2003 04:06:28 -0000	1.48
@@ -81,7 +81,9 @@
 			# now we need to restore the files which shouldn't be compressed
 			cp -fdp $CDDIR/* $CDDIR.z/ &> /dev/null
 			cp -fdpR $CDDIR/boot $CDDIR.z/ || exit 1
-			cp -fdpR $CDDIR/doc $CDDIR.z/ || exit 1
+			if [ -d $CDDIR/doc ]; then
+				cp -fdpR $CDDIR/doc $CDDIR.z/ || exit 1
+			fi
 			CDDIR="$CDDIR.z"
 		fi
 

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1:/tmp/cvs-serv20702

Modified Files:
	CHANGES 
Log Message:
- install-usb now uses fat file system and the plain bootcd.iso file
- ISO can now be in ZISOFS format (optional)
- compile our own static syslinux-nomtools


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -d -r1.557 -r1.558
--- CHANGES	7 Nov 2003 22:57:57 -0000	1.557
+++ CHANGES	8 Nov 2003 04:04:50 -0000	1.558
@@ -23,6 +23,7 @@
 #
 
 1.1.1
+- install-usb now uses fat file system and the plain bootcd.iso file
 - ISO can now be in ZISOFS format (optional)
 - ISAPNP support is now directly on kernel (no more module)
 - added EISA support
@@ -37,7 +38,6 @@
 - updated vlan to v1.8
 - updated libol to v0.3.11
 - updated syslog-ng to v1.60rc4
-- updated syslinux to v2.0.6
 - updated snort to v2.0.2
 - added Debian net-tool patch 1.60-8 (to compile under gcc 3.3.x)
 - updated grub to Debian version v0.93+cvs20031021

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv20702/scripts

Modified Files:
	build-iso create_cd_dirs syslinux 
Log Message:
- install-usb now uses fat file system and the plain bootcd.iso file
- ISO can now be in ZISOFS format (optional)
- compile our own static syslinux-nomtools


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- build-iso	7 Nov 2003 22:57:58 -0000	1.46
+++ build-iso	8 Nov 2003 04:04:51 -0000	1.47
@@ -79,7 +79,7 @@
 			MKISOFS_PARAM="$MKISOFS_PARAM -z"
 
 			# now we need to restore the files which shouldn't be compressed
-			cp -fdp $CDDIR/* $CDDIR.z/
+			cp -fdp $CDDIR/* $CDDIR.z/ &> /dev/null
 			cp -fdpR $CDDIR/boot $CDDIR.z/ || exit 1
 			cp -fdpR $CDDIR/doc $CDDIR.z/ || exit 1
 			CDDIR="$CDDIR.z"

Index: create_cd_dirs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/create_cd_dirs,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- create_cd_dirs	3 Nov 2003 19:35:41 -0000	1.23
+++ create_cd_dirs	8 Nov 2003 04:04:51 -0000	1.24
@@ -43,7 +43,7 @@
 			mkdir -p $CDDIR/usr/share/man/man{1,2,3,4,5,6,7,8,9}
 
 			# the initrd tree
-			DIRS='cdrom dev floppy lib proc sbin tmp shm'
+			DIRS='cdrom dev floppy lib proc sbin tmp shm mnt'
 			mk_dir $INITRDDIR $DIRS
 
 			# create links

Index: syslinux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- syslinux	4 Nov 2003 13:47:11 -0000	1.13
+++ syslinux	8 Nov 2003 04:04:51 -0000	1.14
@@ -26,12 +26,11 @@
 
 case $1 in
 	build )
-		# nothing to do here, the stuff is pre-compiled and we don't get it working since 2.0.5 anyway
-		exit 0
+		TARGETS="syslinux-nomtools"
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
-			make $PMAKE CC="gcc -fno-stack-protector" all || exit 1
+			make $PMAKE CC="gcc -fno-stack-protector" LDFLAGS="-O2 -s -static" $TARGETS || exit 1
 		else
-			make $PMAKE all || exit 1
+			make $PMAKE LDFLAGS="-O2 -s -static" $TARGETS || exit 1
 		fi
 		strip_debug
 		#instal it, we need it later
@@ -40,7 +39,14 @@
 
 	install )
 		cp isolinux.bin $CDDIR/boot || exit 1
-		cp -dp ppmtolss16 /usr/bin || exit 1
+		#cp -dp ppmtolss16 /usr/bin || exit 1
+
+		# now copy the stuff we need for installing DL on a USB pendrive
+		mkdir -p $CDDIR/boot/syslinux || exit 1
+		cp ldlinux.bss $CDDIR/boot/syslinux || exi t1
+		cp ldlinux.sys $CDDIR/boot/syslinux || exi t1
+		cp mbr.bin $CDDIR/boot/syslinux || exi t1
+		cp syslinux-nomtools $CDDIR/boot/syslinux || exi t1
 		;;
 
 	* )

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1:/tmp/cvs-serv20702/config/etc/initrd

Modified Files:
	mount_cdrom 
Log Message:
- install-usb now uses fat file system and the plain bootcd.iso file
- ISO can now be in ZISOFS format (optional)
- compile our own static syslinux-nomtools


Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mount_cdrom	7 Sep 2003 13:58:47 -0000	1.17
+++ mount_cdrom	8 Nov 2003 04:04:51 -0000	1.18
@@ -69,8 +69,12 @@
 
 # USB devices
 for disk in sda1 sdb1 sdc1 sdd1 sde1 sdf1 sdg1 sdh1; do
-	if mount -n -t ext2 -o rw,noatime /dev/$disk $1 2> /dev/null; then
-		if [ -e $1/DEVIL-LINUX ] ; then
+	if mount -n -t auto -o rw,noatime /dev/$disk /mnt 2> /dev/null; then
+		if [ -e /mnt/DEVIL-LINUX ] ; then
+			if [ -e /mnt/bootcd.iso ] ; then
+				mount -o loop -t iso9660 /mnt/bootcd.iso $1 || return 1
+				exit 0
+			fi
 			if [ "$3" != "silent" ]; then
 				$YELLOW
 				echo -e "\nFound on /dev/$disk"
@@ -78,7 +82,7 @@
 			fi
 			exit 0
 		else
-			umount $1
+			umount /mnt
 		fi
 	fi
 done

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv20702/scripts/scripts

Modified Files:
	install-on-usb 
Log Message:
- install-usb now uses fat file system and the plain bootcd.iso file
- ISO can now be in ZISOFS format (optional)
- compile our own static syslinux-nomtools


Index: install-on-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- install-on-usb	31 Oct 2003 18:11:45 -0000	1.8
+++ install-on-usb	8 Nov 2003 04:04:51 -0000	1.9
@@ -10,7 +10,8 @@
 #
 #
 
-BOOTLOADER="grub"
+BOOTLOADER="syslinux"
+#BOOTLOADER="grub"
 #BOOTLOADER="lilo"
 
 FDISK="fdisk"
@@ -131,7 +132,7 @@
 	mkdir -p ./tmp/mnt{1,2} || return 1
 
 #	echo "Available USB storage devices: "
-#	for device in $(allAttachedScsiUsb) 
+#	for device in $(allAttachedScsiUsb)
 #	do
 #		echo -n "$(scsiDevFromScsiUsb $device) "
 #	done
@@ -157,9 +158,9 @@
 	echo
 	echo "Please make sure the partition type is 'Linux' (83) "
 	echo
-	
+
 	$FDISK -l $DEVICE
-	
+
 	echo;echo -n "Do you want to partition the media ? "
 	ask_yes_no && $FDISK $DEVICE
 
@@ -172,18 +173,41 @@
 	echo;echo -n "Last chance, do you really want to continue ? "
 	ask_yes_no || return 0
 
-	mkfs.ext2 $PARTITION || return 1
-	tune2fs -c 0 $PARTITION
+	if [ "$BOOTLOADER" = "syslinux" ]; then
+		mkfs.msdos $PARTITION || return 1
 
-	mount -o loop -t iso9660 bootcd.iso ./tmp/mnt1 || return 1
-	mount -t auto $PARTITION ./tmp/mnt2 || return 1
+		mount -o loop -t iso9660 bootcd.iso ./tmp/mnt1 || return 1
 
-	echo copying files...
-	nice -n19 cp -dpR ./tmp/mnt1/* ./tmp/mnt2/ || return 1
-	nice -n19 cp -dpR etc.tar.bz2 ./tmp/mnt2/ || return 1
+		echo installing MBR
+		SIZE=$(du -b ./tmp/mnt1/boot/syslinux/mbr.bin | cut -f 1 )
+		dd if=./tmp/mnt1/boot/syslinux/mbr.bin of=/dev/sda count=$SIZE || return 1
+		echo installing SysLinux boot sector
+		./tmp/mnt1/boot/syslinux/syslinux-nomtools /dev/sda1 || return 1
 
-	[ "$BOOTLOADER" = "grub" ] && install_grub $DEVICE $GRUBPART
-	[ "$BOOTLOADER" = "lilo" ] && install_lilo $DEVICE
+		mount -t auto $PARTITION ./tmp/mnt2 || return 1
+
+		echo copying files
+		cp ./tmp/mnt1/boot/* ./tmp/mnt2/ &> /dev/null
+		cp ./tmp/mnt1/{DEVIL-LINUX,LICENSE} ./tmp/mnt2/ &> /dev/null
+		cat ./tmp/mnt1/isolinux.cfg | sed -e s%"/boot/"%""% > ./tmp/mnt2/syslinux.cfg || return 1
+		cat ./tmp/mnt1/boot/message | sed -e s%"/boot/"%""% > ./tmp/mnt2/message || return 1
+		cp bootcd.iso ./tmp/mnt2/ || return 1
+	fi
+
+	if [ "$BOOTLOADER" = "grub" ] || [ "$BOOTLOADER" = "lilo" ]; then
+		mkfs.ext2 $PARTITION || return 1
+		tune2fs -c 0 $PARTITION
+
+		mount -o loop -t iso9660 bootcd.iso ./tmp/mnt1 || return 1
+		mount -t auto $PARTITION ./tmp/mnt2 || return 1
+
+		echo copying files...
+		nice -n19 cp -dpR ./tmp/mnt1/* ./tmp/mnt2/ || return 1
+		nice -n19 cp -dpR etc.tar.bz2 ./tmp/mnt2/ || return 1
+
+		[ "$BOOTLOADER" = "grub" ] && install_grub $DEVICE $GRUBPART
+		[ "$BOOTLOADER" = "lilo" ] && install_lilo $DEVICE
+	fi
 }
 
 install

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv11426/scripts

Modified Files:
	build.sh 
Log Message:
use correct directory, when we use zisofs


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- build.sh	19 Oct 2003 02:20:06 -0000	1.59
+++ build.sh	7 Nov 2003 23:19:40 -0000	1.60
@@ -59,7 +59,11 @@
 			cp $DL_DIR/scripts/scripts/custom-cd $DISTDIR || exit 1
 			cp $DL_DIR/scripts/scripts/install-on-usb $DISTDIR || exit 1
 			cp $WORKDIR/bootcd.iso $DISTDIR || exit 1
-			cp $CDDIR/config/etc.tar.bz2 $DISTDIR || exit 1
+			if [ "$CONFIG_ZISOFS" = "y" ]; then
+				cp $CDDIR.z/config/etc.tar.bz2 $DISTDIR || exit 1
+			else
+				cp $CDDIR/config/etc.tar.bz2 $DISTDIR || exit 1
+			fi
 			cd $DISTDIR/.. || exit 1
 			mkdir -p $DISTDIR/docs
 			cp -dpR $CDDOCDIR/* $DISTDIR/docs || exit 1

Update of /cvsroot/devil-linux/build/scripts/configuration/help
In directory sc8-pr-cvs1:/tmp/cvs-serv7438/scripts/configuration/help

Added Files:
	prepare.help 
Log Message:
added zisofs-tools and enabled compressed ISO


--- NEW FILE: prepare.help ---
CONFIG_ZISOFS
 This will use a compressed (zlib) format for the ISO.

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv7438/scripts

Added Files:
	zisofs-tools 
Log Message:
added zisofs-tools and enabled compressed ISO


--- NEW FILE: zisofs-tools ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/zisofs-tools,v $
# $Revision: 1.1 $
# $Date: 2003/11/07 22:58:34 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       zisofs-tools
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings
source $MYDIR/functions

case $1 in
    build )
    	./configure --prefix=/usr || exit 1
        make $PMAKE all || exit 1
        strip_debug
	
    	# we have to install this immediately, because this is a library and could be needed by other sources
    	make install || exit 1
    	;;

    * )
    	echo "ERROR ($0)"
        echo "please add parameter so I know what to do"
        exit 1
        ;;
esac

Update of /cvsroot/devil-linux/build/scripts/configuration
In directory sc8-pr-cvs1:/tmp/cvs-serv7310/scripts/configuration

Modified Files:
	prepare.config 
Log Message:
added zisofstools and enabled use of compressed ISO


Index: prepare.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/prepare.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prepare.config	26 Oct 2003 15:42:42 -0000	1.4
+++ prepare.config	7 Nov 2003 22:57:58 -0000	1.5
@@ -8,6 +8,7 @@
 test -z "$CONFIG_KERNEL_CPU" && CONFIG_KERNEL_CPU=486
 test -z "$CONFIG_CPU" && CONFIG_CPU=486
 
+menu_add "Build Configuration" bool "Compressed ISO (ZISOFS)" CONFIG_ZISOFS
 menu_add "Build Configuration" list "Kernel CPU" CONFIG_KERNEL_CPU 486 586 686 VIAC3_2
 menu_add "Build Configuration" list "GCC CPU" CONFIG_CPU 486 586 686
 menu_add "Build Configuration" bool "Highmem Support" CONFIG_HIGHMEM

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1:/tmp/cvs-serv7310

Modified Files:
	CHANGES 
Log Message:
added zisofstools and enabled use of compressed ISO


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -d -r1.556 -r1.557
--- CHANGES	7 Nov 2003 02:14:58 -0000	1.556
+++ CHANGES	7 Nov 2003 22:57:57 -0000	1.557
@@ -23,6 +23,7 @@
 #
 
 1.1.1
+- ISO can now be in ZISOFS format (optional)
 - ISAPNP support is now directly on kernel (no more module)
 - added EISA support
 - updated the philips usb webcam driver to v8.12

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv7310/scripts

Modified Files:
	build-iso 
Log Message:
added zisofstools and enabled use of compressed ISO


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- build-iso	31 Oct 2003 20:58:07 -0000	1.45
+++ build-iso	7 Nov 2003 22:57:58 -0000	1.46
@@ -46,6 +46,8 @@
 		# is in the initrdtree directory. Put everything in there what you think
 		# will be needed. We assume that this is the case.
 
+		MKISOFS_PARAM=""
+
 		rm -rf $WORKDIR/mnt
 		mkdir -p $WORKDIR/mnt/loop{1,2}
 
@@ -70,9 +72,22 @@
 
 		#===========================================================================
 
-		#echo -n "compressing modules..."
+		if [ "$CONFIG_ZISOFS" = "y" ]; then
+			echo creating compressed ISO filesystem
+			test -d $CDDIR.z && rm -rf $CDDIR.z
+			mkzftree $CDDIR $CDDIR.z || exit 1
+			MKISOFS_PARAM="$MKISOFS_PARAM -z"
+
+			# now we need to restore the files which shouldn't be compressed
+			cp -fdp $CDDIR/* $CDDIR.z/
+			cp -fdpR $CDDIR/boot $CDDIR.z/ || exit 1
+			cp -fdpR $CDDIR/doc $CDDIR.z/ || exit 1
+			CDDIR="$CDDIR.z"
+		fi
+
+		#===========================================================================
+
 		echo -n "copying modules...."
-		#(cd $WORKDIR/modules.initrd; tar -cjf $INITRDDIR/modules.tar.bz2 *)
 		cp -fdpR $WORKDIR/modules.initrd/* $INITRDDIR/ || exit 1
 		echo $DL_VERSION > $INITRDDIR/VERSION
 
@@ -104,8 +119,6 @@
 		echo "creating the initial ramdisk (initrd) image.... "
 
 		cp -p $DL_DIR/config/etc/initrd/linuxrc $INITRDDIR
-#		cp -p $DL_DIR/config/etc/initrd/links $INITRDDIR
-#		cp -p $ETCDIR/etc/init.d/functions $INITRDDIR
 		mkcramfs $INITRDDIR/ $BOOTIMAGEDIR/initrd
 		gzip -f -9 $BOOTIMAGEDIR/initrd
 
@@ -161,10 +174,7 @@
 
 		# copy Kernel to CD Tree, to provide support for LOADLIN
 		cp $BOOTIMAGEDIR/vmlinuz $CDDIR/boot/
-		#cp $BOOTIMAGEDIR/initrd $CDDIR/boot/
 		cp $BOOTIMAGEDIR/initrd.gz $CDDIR/boot/
-		#cp $BOOTIMAGEDIR/vmlinuz $CDDIR
-		#cp $BOOTIMAGEDIR/initrd.gz $CDDIR
 
 		# store version info
 		echo $DL_VERSION > $CDDIR/DEVIL-LINUX
@@ -176,7 +186,7 @@
 		mkisofs -b boot/isolinux.bin -c boot/boot.cat \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
 		-o $WORKDIR/bootcd.iso \
-		-J -l -L  -R  \
+		-J -l -L  -R $MKISOFS_PARAM  \
 		-p "he...@de..." \
 		-P "Devil Linux Developer Team" \
 		-A "Devil-Linux v$DL_VERSION" \

Update of /cvsroot/devil-linux/build/scripts/configuration
In directory sc8-pr-cvs1:/tmp/cvs-serv30186/scripts/configuration

Modified Files:
	alsa.config 
Log Message:
alsa support, stage 1

Index: alsa.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/alsa.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- alsa.config	7 Nov 2003 16:10:24 -0000	1.2
+++ alsa.config	7 Nov 2003 19:14:21 -0000	1.3
@@ -5,4 +5,4 @@
 #
 # http://www.devil-linux.org
 
-menu_add "System|Hardware Support" bool "ALSA-Project (Sound System) *EXPERIMENTAL, DOESN'T WORK*" CONFIG_ALSA
+menu_add "System|Hardware Support" bool "ALSA-Project -Sound System- EXPERIMENTAL" CONFIG_ALSA

On Fri, Nov 07, 2003 at 01:28:02PM -0500, Heiko Zuerker wrote:

> There is one variable KERNELVERSION (or so), but it will be name i.e.
> 2.4.22-grsec . It's the one you need to use for the modules.

Then this documentation should be upgraded:

http://www.devil-linux.org/newdoc/ch03s03.html#d0e1551


-- 
-- gnupg keyfingerprint -- 48AF 5BF9 8F54 2966 64CC  2327 7CD0 DD91 B09D 5799
-- Use of a keyboard or mouse may be linked to serious injuries or disorders.  
Diego Torres - dt...@co... - Madrid / España

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv22823/scripts

Modified Files:
	alsa-driver 
Log Message:
alsa stage 1

Index: alsa-driver
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/alsa-driver,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- alsa-driver	7 Nov 2003 17:44:57 -0000	1.3
+++ alsa-driver	7 Nov 2003 18:39:43 -0000	1.4
@@ -20,12 +20,14 @@
 source $MYDIR/settings
 source $MYDIR/functions
 
+KERNELDIR=$(find_src_dir linux) 
+
 MYNAME=ALSA-DRIVER
 
 case $1 in
     build )
 	if [ "$CONFIG_ALSA" = "y" ]; then
-	    ./configure --with-isa-pnp=yes --with-oss=yes --with-sequencer=yes --with-cards=all --with-kernel=$WORKDIR/linux-2.4.22 --with-moddir=$CDDIR/lib/modules/2.4.22/misc --sysconfdir=$ETCDIR || exit 1
+	    ./configure --with-isa-pnp=yes --with-oss=yes --with-sequencer=yes --with-cards=all --with-kernel=$KERNELDIR --with-moddir=$CDDIR/lib/modules/$KERNELVERSION/misc --sysconfdir=$ETCDIR || exit 1
 	    make $PMAKE || exit 1
 	    strip_debug
 	fi

> On Fri, Nov 07, 2003 at 09:22:01AM -0800, rap...@us...
> wrote:
>> +	    ./configure --with-isa-pnp=yes --with-oss=yes --with-sequencer=yes
>> --with-cards=all --with-kernel=$WORKDIR/linux-2.4.22
>> --with-moddir=$CDDIR/lib/modules/2.4.22/misc --sysconfdir=$CDDIR/etc ||
>> exit 1
>
> quite dangerous, since the script is dependand on the kernel version that
> is going to be installed. any other way to do this?

Check out the file build/settings .
There is one variable KERNELVERSION (or so), but it will be name i.e.
2.4.22-grsec . It's the one you need to use for the modules.

For the Kernel directory, check out the e100/e1000 scripts. You need to
use a function call find_src or similar, but you'll see it in the example.

-- 

Regards
  Heiko Zuerker
  http://www.devil-linux.org

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv12663/scripts

Modified Files:
	alsa-driver 
Log Message:
alsa stage 1

Index: alsa-driver
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/alsa-driver,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- alsa-driver	7 Nov 2003 17:21:58 -0000	1.2
+++ alsa-driver	7 Nov 2003 17:44:57 -0000	1.3
@@ -25,7 +25,7 @@
 case $1 in
     build )
 	if [ "$CONFIG_ALSA" = "y" ]; then
-	    ./configure --with-isa-pnp=yes --with-oss=yes --with-sequencer=yes --with-cards=all --with-kernel=$WORKDIR/linux-2.4.22 --with-moddir=$CDDIR/lib/modules/2.4.22/misc --sysconfdir=$CDDIR/etc || exit 1
+	    ./configure --with-isa-pnp=yes --with-oss=yes --with-sequencer=yes --with-cards=all --with-kernel=$WORKDIR/linux-2.4.22 --with-moddir=$CDDIR/lib/modules/2.4.22/misc --sysconfdir=$ETCDIR || exit 1
 	    make $PMAKE || exit 1
 	    strip_debug
 	fi

On Fri, Nov 07, 2003 at 09:22:01AM -0800, rap...@us... wrote:
> +	    ./configure --with-isa-pnp=yes --with-oss=yes --with-sequencer=yes --with-cards=all --with-kernel=$WORKDIR/linux-2.4.22 --with-moddir=$CDDIR/lib/modules/2.4.22/misc --sysconfdir=$CDDIR/etc || exit 1

quite dangerous, since the script is dependand on the kernel version that is going to be installed. any other way to do this?

-- 
-- gnupg keyfingerprint -- 48AF 5BF9 8F54 2966 64CC  2327 7CD0 DD91 B09D 5799
-- Use of a keyboard or mouse may be linked to serious injuries or disorders.  
Diego Torres - dt...@co... - Madrid / España

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv6311/scripts

Modified Files:
	alsa-driver 
Log Message:
alsa support, stage 1

Index: alsa-driver
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/alsa-driver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- alsa-driver	7 Nov 2003 00:15:38 -0000	1.1
+++ alsa-driver	7 Nov 2003 17:21:58 -0000	1.2
@@ -25,8 +25,7 @@
 case $1 in
     build )
 	if [ "$CONFIG_ALSA" = "y" ]; then
-#	    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1
-	    ./configure --with-isa-pnp=no --with-oss=yes --with-cards=all || exit 1
+	    ./configure --with-isa-pnp=yes --with-oss=yes --with-sequencer=yes --with-cards=all --with-kernel=$WORKDIR/linux-2.4.22 --with-moddir=$CDDIR/lib/modules/2.4.22/misc --sysconfdir=$CDDIR/etc || exit 1
 	    make $PMAKE || exit 1
 	    strip_debug
 	fi
@@ -35,14 +34,7 @@
     install )
 	if [ "$CONFIG_ALSA" = "y" ]; then
             rm -rf $WORKDIR/tmp || exit 1
-	    mkdir -p $WORKDIR/tmp || exit 1
-	    make install DESTDIR=$WORKDIR/tmp || exit 1
-
-	    copy_files $WORKDIR/tmp/usr/* $CDDIR/ || exit 1
-	    copy_files $WORKDIR/tmp/lib/* $CDDIR/ || exit 1
-	    copy_files $WORKDIR/tmp/etc/* $ETCDIR/ || exit 1
-
-	    rm -rf $WORKDIR/tmp || exit 1 
+	    make install || exit 1
 
 	    echo "HELP_$MYNAME=\"$MYNAME are the needed modules to have sound support\"" >> $SOFTWAREHELP 
 	fi

Update of /cvsroot/devil-linux/build/scripts/configuration
In directory sc8-pr-cvs1:/tmp/cvs-serv24465/scripts/configuration

Modified Files:
	alsa.config 
Log Message:
alsa stage 1

Index: alsa.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/alsa.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- alsa.config	1 Nov 2003 18:47:13 -0000	1.1
+++ alsa.config	7 Nov 2003 16:10:24 -0000	1.2
@@ -5,4 +5,4 @@
 #
 # http://www.devil-linux.org
 
-menu_add "System|Hardware Support" bool "ALSA-Project modules (Sound System)" CONFIG_ALSA
+menu_add "System|Hardware Support" bool "ALSA-Project (Sound System) *EXPERIMENTAL, DOESN'T WORK*" CONFIG_ALSA

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1:/tmp/cvs-serv18015

Modified Files:
      Tag: rel-1-0-patches
	CHANGES 
Log Message:
snort 2.0.2 doesn't compile, so let's undo the change


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.510.2.28
retrieving revision 1.510.2.29
diff -u -d -r1.510.2.28 -r1.510.2.29
--- CHANGES	7 Nov 2003 02:17:34 -0000	1.510.2.28
+++ CHANGES	7 Nov 2003 12:42:15 -0000	1.510.2.29
@@ -27,7 +27,6 @@
 - added EISA support to the kernel
 - added menu driven configuration update (bs)
 - updated vlan to v1.8
-- updated snort to v2.02
 - updated mdadm to v1.40
 - updated syslog-ng to v1.60rc4
 - updated libol to v0.3.11

Update of /cvsroot/devil-linux/build/scripts/config
In directory sc8-pr-cvs1:/tmp/cvs-serv30173/scripts/config

Modified Files:
      Tag: rel-1-0-patches
	config_linux 
Log Message:
- ISAPNP support is now directly on kernel (no more module)
- added EISA support


Index: config_linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/config_linux,v
retrieving revision 1.59
retrieving revision 1.59.2.1
diff -u -d -r1.59 -r1.59.2.1
--- config_linux	4 Oct 2003 15:17:44 -0000	1.59
+++ config_linux	7 Nov 2003 02:17:34 -0000	1.59.2.1
@@ -78,7 +78,7 @@
 CONFIG_PCI_DIRECT=y
 CONFIG_ISA=y
 CONFIG_PCI_NAMES=y
-# CONFIG_EISA is not set
+CONFIG_EISA=y
 # CONFIG_MCA is not set
 CONFIG_HOTPLUG=y
 
@@ -139,8 +139,8 @@
 #
 # Plug and Play configuration
 #
-CONFIG_PNP=m
-CONFIG_ISAPNP=m
+CONFIG_PNP=y
+CONFIG_ISAPNP=y
 
 #
 # Block devices

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1:/tmp/cvs-serv30173

Modified Files:
      Tag: rel-1-0-patches
	CHANGES 
Log Message:
- ISAPNP support is now directly on kernel (no more module)
- added EISA support


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.510.2.27
retrieving revision 1.510.2.28
diff -u -d -r1.510.2.27 -r1.510.2.28
--- CHANGES	6 Nov 2003 01:23:37 -0000	1.510.2.27
+++ CHANGES	7 Nov 2003 02:17:34 -0000	1.510.2.28
@@ -23,6 +23,8 @@
 #
 
 1.0.2
+- ISAPNP support is now directly on kernel (no more module)
+- added EISA support to the kernel
 - added menu driven configuration update (bs)
 - updated vlan to v1.8
 - updated snort to v2.02

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1:/tmp/cvs-serv29647

Modified Files:
	CHANGES 
Log Message:
- ISAPNP support is now directly on kernel (no more module)
- added EISA support


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -d -r1.555 -r1.556
--- CHANGES	7 Nov 2003 02:04:09 -0000	1.555
+++ CHANGES	7 Nov 2003 02:14:58 -0000	1.556
@@ -23,8 +23,9 @@
 #
 
 1.1.1
+- ISAPNP support is now directly on kernel (no more module)
+- added EISA support
 - updated the philips usb webcam driver to v8.12
-- alsa modules - stage 1 (rpd)
 - updated apache httpd to v2.0.48
 - updated pppoe-patch to v5
 - downgraded wvdial to v1.53

Update of /cvsroot/devil-linux/build/scripts/config
In directory sc8-pr-cvs1:/tmp/cvs-serv29647/scripts/config

Modified Files:
	config_linux 
Log Message:
- ISAPNP support is now directly on kernel (no more module)
- added EISA support


Index: config_linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/config_linux,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- config_linux	1 Nov 2003 18:35:58 -0000	1.61
+++ config_linux	7 Nov 2003 02:14:58 -0000	1.62
@@ -74,7 +74,7 @@
 CONFIG_PCI_DIRECT=y
 CONFIG_ISA=y
 CONFIG_PCI_NAMES=y
-# CONFIG_EISA is not set
+CONFIG_EISA=y
 # CONFIG_MCA is not set
 CONFIG_HOTPLUG=y
 
@@ -135,8 +135,8 @@
 #
 # Plug and Play configuration
 #
-CONFIG_PNP=m
-CONFIG_ISAPNP=m
+CONFIG_PNP=y
+CONFIG_ISAPNP=y
 
 #
 # Block devices

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv28251/scripts

Modified Files:
	linux 
Log Message:
added support for updating the pwc driver


Index: linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/linux,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- linux	15 Oct 2003 01:58:02 -0000	1.43
+++ linux	7 Nov 2003 02:04:10 -0000	1.44
@@ -36,6 +36,10 @@
 		    FLAGS="CFLAGS_EXTRA=-fno-stack-protector"
 		fi
 
+		if [ "$CONFIG_LINUX_UPDATE_PWC" = "y" ]; then
+			cp -vdpfR ../pwc-*/2.4.*/* drivers/usb/ || exit 1
+		fi
+
 		make $FLAGS oldconfig
 		make $FLAGS dep || exit 1
 		make $FLAGS $PMAKE bzImage || exit 1