devil-linux-commit — Mailing list for CVS commit messages.

[Devil-linux-commit] build update_src,1.20,1.21

[<fr...@us...>]

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

Modified Files:
	update_src 
Log Message:
correct ftp path of xenia.sote.hu

Index: update_src
===================================================================
RCS file: /cvsroot/devil-linux/build/update_src,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- update_src	22 Nov 2003 01:19:44 -0000	1.20
+++ update_src	14 Jan 2004 04:42:55 -0000	1.21
@@ -39,7 +39,7 @@
 
 menu[7]="Semmelweis Univ Med School Budapest/Hungary"
 ftps[7]="xenia.sote.hu"
-ftpd[7]="/pub/mirrors/devil-linux/"
+ftpd[7]="/pub/mirrors/devil-linux/devel/sources/$VERSION/"
 
 function menu () {
 	local menuitems=${#menu[@]} # number of menuitems

[Devil-linux-commit] build/scripts functions,1.49,1.50

[<smi...@us...>]

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

Modified Files:
	functions 
Log Message:
correctly overwrite old links and use correct path name


Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- functions	14 Jan 2004 03:32:26 -0000	1.49
+++ functions	14 Jan 2004 03:54:41 -0000	1.50
@@ -416,15 +416,16 @@
 }
 
 function reset_kernel_includes () {
-	ln -sf $KERNELDIR/include/linux /usr/include/linux || exit 1
-	ln -sf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
-	ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
+	rm /usr/include/{linux,asm,asm-generic} || exit 1
+	ln -nsf $KERNELDIR/include/linux /usr/include/linux || exit 1
+	ln -nsf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
+	ln -nsf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
 }
 
 function old_kernel_includes () {
 	OLDINCLUDEDIR=$(find_src_dir 2.4.21-include)
-	ln -sf $OLDINCLUDEDIR/include/linux /usr/include/linux || exit 1
-	ln -sf $OLDINCLUDEDIR/include/asm-i386 /usr/include/asm || exit 1
-	ln -sf $OLDINCLUDEDIR/include/asm-generic /usr/include/asm-generic || exit 1
+	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
 }
 

[Devil-linux-commit] build/scripts i2c,1.4,1.5

[<smi...@us...>]

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

Modified Files:
	i2c 
Log Message:
don't patch i2c, when lm_sensors is not selected


Index: i2c
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/i2c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- i2c	11 Jan 2004 14:43:04 -0000	1.4
+++ i2c	14 Jan 2004 03:43:31 -0000	1.5
@@ -26,6 +26,7 @@
 
 case $1 in
 	build )
+	if [ "$CONFIG_LM_SENSORS" = "y" ]; then
 		echo preparing patch
 		cd mkpatch || exit 1
 		./mkpatch.pl ../ $KERNELDIR | patch -p1 -d $KERNELDIR || exit 1
@@ -36,6 +37,7 @@
 		for CFG in $(  grep bool $KERNELDIR/drivers/i2c/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=y" >> $KERNELDIR/.config
 		done
+	fi
 		;;
 
 	* )

[Devil-linux-commit] build/scripts build.sh,1.69,1.70 cdrtools,1.6,1.7 functions,1.48,1.49 iproute2,1.20,1.21 iputils,1.7,1.8 lilo,1.9,1.10 reiserfsprogs,1.12,1.13 strace,1.10,1.11 sysklogd,1.10,1.11

[<smi...@us...>]

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

Modified Files:
	build.sh cdrtools functions iproute2 iputils lilo 
	reiserfsprogs strace sysklogd 
Log Message:
added support for compiling many programs with Kernel 2.6
added functions to switch between new and old kernel headers


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- build.sh	13 Jan 2004 13:52:08 -0000	1.69
+++ build.sh	14 Jan 2004 03:32:26 -0000	1.70
@@ -297,6 +297,9 @@
 					# (re-)enable the compilation as ET_DYN in case a script disabled it
 					enable_et_dyn
 
+					# reset to the new kernel includes
+					reset_kernel_includes
+
 					echo
 					t1=$(date +"%s")
 

Index: cdrtools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cdrtools,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cdrtools	11 Jan 2004 14:43:04 -0000	1.6
+++ cdrtools	14 Jan 2004 03:32:26 -0000	1.7
@@ -25,6 +25,11 @@
 
 case $1 in
     build )
+        if [ ! -f cdrtools-2.0-patch.done ]; then
+           bzcat $SRCDIR/cdrtools-2.0-kernel-26-patch.bz2 | patch -p1 || exit 1
+           touch cdrtools-2.0-patch.done 
+        fi
+
         ./Gmake.linux CCOM=gcc all || exit 1
         strip_debug
         ;;

Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- functions	11 Jan 2004 15:17:01 -0000	1.48
+++ functions	14 Jan 2004 03:32:26 -0000	1.49
@@ -414,3 +414,17 @@
 		ln -sf specs.et_dyn $GCCSPECDIR/specs || exit 1
 	fi
 }
+
+function reset_kernel_includes () {
+	ln -sf $KERNELDIR/include/linux /usr/include/linux || exit 1
+	ln -sf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
+	ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
+}
+
+function old_kernel_includes () {
+	OLDINCLUDEDIR=$(find_src_dir 2.4.21-include)
+	ln -sf $OLDINCLUDEDIR/include/linux /usr/include/linux || exit 1
+	ln -sf $OLDINCLUDEDIR/include/asm-i386 /usr/include/asm || exit 1
+	ln -sf $OLDINCLUDEDIR/include/asm-generic /usr/include/asm-generic || exit 1
+}
+

Index: iproute2
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iproute2,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- iproute2	11 Jan 2004 14:43:04 -0000	1.20
+++ iproute2	14 Jan 2004 03:32:26 -0000	1.21
@@ -24,7 +24,6 @@
 source $MYDIR/settings
 
 MYNAME=IPROUTE2
-OLDINCLUDEDIR=$(find_src_dir 2.4.21-include)
 
 case $1 in
 	build )
@@ -35,7 +34,9 @@
 			fi
 			replace_str Makefile /usr/src/linux $KERNELDIR
 			replace_str Config "TC_CONFIG_ATM=y" "TC_CONFIG_ATM=n"
-			make $PMAKE KERNEL_INCLUDE=$OLDINCLUDEDIR all || exit 1
+
+			old_kernel_includes
+			make $PMAKE all || exit 1
 			strip_debug
 		fi
 		;;

Index: iputils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iputils,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- iputils	11 Jan 2004 14:43:04 -0000	1.7
+++ iputils	14 Jan 2004 03:32:26 -0000	1.8
@@ -22,7 +22,6 @@
 
 # source functions and config
 source $MYDIR/settings
-OLDINCLUDEDIR=$(find_src_dir 2.4.21-include)
 
 case $1 in
 	build )
@@ -30,7 +29,9 @@
                     touch devil-linux-patches.done
 		    zcat $DL_DIR/src/iputils*.diff.gz | patch -p1 || exit 1
                 fi
-		make $PMAKE KERNEL_INCLUDE=$OLDINCLUDEDIR all || exit 1
+
+		old_kernel_includes
+		make $PMAKE all || exit 1
 		strip_debug
 		;;
 

Index: lilo
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lilo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- lilo	13 Jan 2004 02:29:49 -0000	1.9
+++ lilo	14 Jan 2004 03:32:26 -0000	1.10
@@ -25,14 +25,10 @@
 
 case $1 in
 	build )
-	
-	 if [ ! -f lilo-patches.done ]; then
-             bzcat $DL_DIR/src/lilo_22.5.8_header.diff.bz2 | patch -p1
-             touch lilo-patches.done
-          fi
-	
+
 
 		disable_et_dyn
+		old_kernel_includes
 	    make $PMAKE || exit 1
 	    strip_debug
             ;;

Index: reiserfsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/reiserfsprogs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- reiserfsprogs	11 Jan 2004 14:43:05 -0000	1.12
+++ reiserfsprogs	14 Jan 2004 03:32:26 -0000	1.13
@@ -26,6 +26,7 @@
 case $1 in
     build )
 		disable_et_dyn
+		old_kernel_includes
 		./configure --prefix=  || exit 1
 		make $PMAKE all || exit 1
 		strip_debug

Index: strace
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/strace,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- strace	11 Jan 2004 14:43:05 -0000	1.10
+++ strace	14 Jan 2004 03:32:26 -0000	1.11
@@ -25,6 +25,7 @@
 
 case $1 in
     build )
+	old_kernel_includes
 	./configure --prefix=/usr || exit 1
 	make $PMAKE all || exit 1
 	strip_debug

Index: sysklogd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sysklogd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sysklogd	11 Jan 2004 14:43:05 -0000	1.10
+++ sysklogd	14 Jan 2004 03:32:26 -0000	1.11
@@ -25,6 +25,7 @@
 
 case $1 in
 	build )
+		old_kernel_includes
 		make $PMAKE || exit 1
 		strip_debug
 		;;

[Devil-linux-commit] build CHANGES,1.648,1.649

[<smi...@us...>]

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

Modified Files:
	CHANGES 
Log Message:
added support for compiling many programs with Kernel 2.6
added functions to switch between new and old kernel headers


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -d -r1.648 -r1.649
--- CHANGES	13 Jan 2004 21:36:40 -0000	1.648
+++ CHANGES	14 Jan 2004 03:32:25 -0000	1.649
@@ -22,6 +22,8 @@
 #
 
 1.1.2
+- added support for compiling many programs with Kernel 2.6 (Heiko + Oliver Jehle)
+- updated cdrtools to v2.00.3
 - updated zebra to 0.94 (fl / compile testing by Thomas Eder)
 - updated patch-o-matic to v20031219
 - updated lilo to v22.5.8 and added patch to compile under kernel 2.6 (Heiko / Oliver Jehle)

[Devil-linux-commit] build CHANGES,1.647,1.648

[<fr...@us...>]

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

Modified Files:
	CHANGES 
Log Message:
updated zebra sources

Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -d -r1.647 -r1.648
--- CHANGES	13 Jan 2004 12:28:41 -0000	1.647
+++ CHANGES	13 Jan 2004 21:36:40 -0000	1.648
@@ -22,6 +22,7 @@
 #
 
 1.1.2
+- updated zebra to 0.94 (fl / compile testing by Thomas Eder)
 - updated patch-o-matic to v20031219
 - updated lilo to v22.5.8 and added patch to compile under kernel 2.6 (Heiko / Oliver Jehle)
 - updated e2fsprogs to v1.35-WIP-1207 (test version)

[Devil-linux-commit] build CHANGES,1.510.2.49,1.510.2.50

[<fr...@us...>]

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

Modified Files:
      Tag: rel-1-0-patches
	CHANGES 
Log Message:
updated zebra sources

Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.510.2.49
retrieving revision 1.510.2.50
diff -u -d -r1.510.2.49 -r1.510.2.50
--- CHANGES	12 Jan 2004 15:56:26 -0000	1.510.2.49
+++ CHANGES	13 Jan 2004 21:35:57 -0000	1.510.2.50
@@ -22,6 +22,7 @@
 #
 #
 1.0.5
+- updated zebra to 0.94 (fl / compile testing by Thomas Eder)
 - menuconfig now correctly sets any missing list values in the config file
 - fixed named start problem when jail disabled (fl)
 

[Devil-linux-commit] build/scripts glibc,1.26,1.27

[<smi...@us...>]

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

Modified Files:
	glibc 
Log Message:
more fixes to get kernel 2.6 working


Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- glibc	11 Jan 2004 14:43:04 -0000	1.26
+++ glibc	13 Jan 2004 17:55:38 -0000	1.27
@@ -50,7 +50,8 @@
 		mkdir ../glibc-build || exit 1
 		cd ../glibc-build || exit 1
 		# unfortunately we can only go as high as the host kernel version
-		KVER=$(uname -r)
+		#KVER=$(uname -r)
+		KVER=$(cat //proc/sys/kernel/osrelease)
 		../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/bin --enable-kernel=$KVER --without-gd || exit 1
 
 		make $PMAKE || exit 1

[Devil-linux-commit] build/scripts prepare,1.33,1.34

[<smi...@us...>]

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

Modified Files:
	prepare 
Log Message:
make dep = make prepare0 for kernel 2.6


Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- prepare	13 Jan 2004 13:52:08 -0000	1.33
+++ prepare	13 Jan 2004 14:28:13 -0000	1.34
@@ -77,10 +77,6 @@
 	ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
 	ln -sf $KERNELDIR /usr/src/linux || exit 1
 
-	# make sure we can read out the kernel version
-	pushd $KERNELDIR
-	make include/linux/version.h || exit 1
-	popd
 	;;
 
     build )
@@ -133,7 +129,12 @@
 	fi
 
 	make oldconfig || exit 1
-	make dep || exit 1
+	if [ "$KERNELVERSION" = "2.4" ]; then
+		make dep || exit 1
+	else
+		make prepare0 || exit 1
+	fi
+
 	popd > /dev/null
 
 	# make sure we have all needed and clean directories

[Devil-linux-commit] build/scripts build.sh,1.68,1.69 prepare,1.32,1.33

[<smi...@us...>]

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

Modified Files:
	build.sh prepare 
Log Message:
replace kernel version output of uname to the version we use in the sources


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- build.sh	12 Jan 2004 02:57:59 -0000	1.68
+++ build.sh	13 Jan 2004 13:52:08 -0000	1.69
@@ -254,6 +254,17 @@
 			    export PATH=/usr/lib/distcc/bin:$PATH
 			fi
 
+			# reload settings
+			source settings
+
+			# fake uname to display another platform we want to compile the kernel for
+			# also make sure our kernel version is displayed
+			test -f /bin/uname.old || cp /bin/uname /bin/uname.old || exit 1
+			rm /bin/uname || exit 1
+			REALKERNEL=$(/bin/uname.old -r)
+			echo "uname.old \$* | sed -e 's/i.86/i$CONFIG_CPU/' | sed -e 's/$REALKERNEL/$KERNELVERSION/'" > /bin/uname || exit 1
+			chmod +x /bin/uname || exit 1
+
 			mkdir -p $WORKDIR/LOGS/$CMD || exit 1
 
 			for LINK in $( ls -v $DL_DIR/scripts/.buildorder/rc$LEVEL.d/S* 2> /dev/null)

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- prepare	12 Jan 2004 02:57:59 -0000	1.32
+++ prepare	13 Jan 2004 13:52:08 -0000	1.33
@@ -76,6 +76,11 @@
 	ln -sf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
 	ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
 	ln -sf $KERNELDIR /usr/src/linux || exit 1
+
+	# make sure we can read out the kernel version
+	pushd $KERNELDIR
+	make include/linux/version.h || exit 1
+	popd
 	;;
 
     build )

[Devil-linux-commit] build CHANGES,1.646,1.647

[<smi...@us...>]

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

Modified Files:
	CHANGES 
Log Message:
removed glibc ifaddrs patch


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -d -r1.646 -r1.647
--- CHANGES	13 Jan 2004 02:48:04 -0000	1.646
+++ CHANGES	13 Jan 2004 12:28:41 -0000	1.647
@@ -26,7 +26,7 @@
 - updated lilo to v22.5.8 and added patch to compile under kernel 2.6 (Heiko / Oliver Jehle)
 - updated e2fsprogs to v1.35-WIP-1207 (test version)
 - updated net-tools patch to debian 1.60-9 version (Heiko / Oliver Jehle)
-- added glibc getgrouplist (CAN-2003-0689) and ifaddrs (CAN-2003-0859) patches (Heiko / Oliver Jehle)
+- added glibc getgrouplist (CAN-2003-0689) patch (Heiko / Oliver Jehle)
 - removed module dependencies from /etc/modules and moved it back to /lib/modules
 - added module-init-tools v3.0pre5
 - added kernel 2.6.1 to build sytem (requires ext2 as initrd fs)

[Devil-linux-commit] build/scripts/configuration/profiles default,1.6,1.7

[<smi...@us...>]

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

Modified Files:
	default 
Log Message:
updated default profile


Index: default
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/default,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- default	11 Jan 2004 14:43:05 -0000	1.6
+++ default	13 Jan 2004 02:55:39 -0000	1.7
@@ -151,3 +151,8 @@
 CONFIG_ZEBRA=y
 CONFIG_ZIP=y
 CONFIG_ZISOFS=y
+CONFIG_INITRD_FS=CRAMFS
+CONFIG_GCC_STACK_PROTECTOR=y
+CONFIG_GCC_PIE=y
+CONFIG_GRSECURITY=y
+CONFIG_GCC_ET_DYN=y

[Devil-linux-commit] build CHANGES,1.645,1.646

[<smi...@us...>]

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

Modified Files:
	CHANGES 
Log Message:
update


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -d -r1.645 -r1.646
--- CHANGES	13 Jan 2004 02:29:49 -0000	1.645
+++ CHANGES	13 Jan 2004 02:48:04 -0000	1.646
@@ -22,6 +22,7 @@
 #
 
 1.1.2
+- updated patch-o-matic to v20031219
 - updated lilo to v22.5.8 and added patch to compile under kernel 2.6 (Heiko / Oliver Jehle)
 - updated e2fsprogs to v1.35-WIP-1207 (test version)
 - updated net-tools patch to debian 1.60-9 version (Heiko / Oliver Jehle)

[Devil-linux-commit] build/config/etc modprobe.conf,NONE,1.1

[<smi...@us...>]

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

Added Files:
	modprobe.conf 
Log Message:
added default modprobe.conf


--- NEW FILE: modprobe.conf ---
alias binfmt-204 binfmt_aout
alias binfmt-263 binfmt_aout
alias binfmt-264 binfmt_aout
alias binfmt-267 binfmt_aout
alias binfmt-387 binfmt_aout
alias binfmt-332 iBCS
alias binfmt--310 binfmt_java
alias block-major-1-* rd
alias block-major-2-* floppy
alias block-major-9-* md
alias block-major-13-* xd
alias block-major-15-* cdu31a
alias block-major-16-* gscd
alias block-major-17-* optcd
alias block-major-18-* sjcd
alias block-major-20-* mcdx
alias block-major-22-* ide-probe-mod
alias block-major-23-* mcd
alias block-major-24-* sonycd535
alias block-major-25-* sbpcd
alias block-major-26-* sbpcd
alias block-major-27-* sbpcd
alias block-major-29-* aztcd
alias block-major-32-* cm206
alias block-major-33-* ide-probe-mod
alias block-major-34-* ide-probe-mod
alias block-major-37-* ide-tape
alias block-major-44-* ftl
alias block-major-46-* pcd
alias block-major-47-* pf
alias block-major-56-* ide-probe-mod
alias block-major-57-* ide-probe-mod
alias block-major-58-* lvm-mod
alias block-major-88-* ide-probe-mod
alias block-major-89-* ide-probe-mod
alias block-major-90-* ide-probe-mod
alias block-major-91-* ide-probe-mod
alias block-major-93-* nftl
alias block-major-97-* pg
alias block-major-113-* viocd
alias char-major-4-* serial
alias char-major-5-* serial
alias char-major-6-* lp
alias char-major-9-* st
alias char-major-10-0 busmouse
alias char-major-10-2 msbusmouse
alias char-major-10-3 atixlmouse
alias char-major-10-130 wdt
alias char-major-10-131 wdt
alias char-major-10-135 rtc
alias char-major-10-139 openprom
alias char-major-10-144 nvram
alias char-major-10-157 applicom
alias char-major-10-175 agpgart
alias char-major-10-184 microcode
alias char-major-10-200 tun
alias char-major-10-250 hci_vhci
alias char-major-13-* input
alias char-major-13-0 joydev
alias char-major-13-32 mousedev
alias char-major-14-* soundcore
alias char-major-19-* cyclades
alias char-major-20-* cyclades
alias char-major-22-* pcxx
alias char-major-23-* pcxx
alias char-major-27-* zftape
alias char-major-34-* scc
alias char-major-35-* tclmidi
alias char-major-36-* netlink
alias char-major-37-* ide-tape
alias char-major-48-* riscom8
alias char-major-49-* riscom8
alias char-major-57-* esp
alias char-major-58-* esp
alias char-major-63-* kdebug
alias char-major-90-* mtdchar
alias char-major-96-* pt
alias char-major-99-* ppdev
alias char-major-107-* 3dfx
alias char-major-108-* ppp_async
alias char-major-109-* lvm-mod
alias char-major-161-* ircomm-tty
alias char-major-171-* raw1394
alias char-major-195-* NVdriver
alias char-major-200-* vxspec
alias char-major-206-* osst
alias char-major-216-* rfcomm
alias dos msdos
alias dummy0 dummy
alias dummy1 dummy
alias iso9660 isofs
alias md-personality-1 linear
alias md-personality-2 raid0
alias md-personality-3 raid1
alias md-personality-4 raid5
alias md-personality-7 multipath
alias net-pf-1 unix
alias net-pf-2 ipv4
alias net-pf-3 ax25
alias net-pf-4 ipx
alias net-pf-5 appletalk
alias net-pf-6 netrom
alias net-pf-10 ipv6
alias net-pf-15 af_key
alias net-pf-17 af_packet
alias net-pf-31 bluez
alias netalias-2 ip_alias
alias irlan0 irlan
alias irda-dongle-0 tekram
alias irda-dongle-1 esi
alias irda-dongle-2 actisys
alias irda-dongle-3 actisys
alias irda-dongle-4 girbil
alias irda-dongle-5 litelink
alias irda-dongle-6 airport
alias irda-dongle-7 old_belkin
alias bt-proto-0 l2cap
alias bt-proto-2 sco
alias bt-proto-3 rfcomm
alias bt-proto-4 bnep
alias plip0 plip
alias plip1 plip
alias tunl0 ipip
alias cipcb0 cipcb
alias cipcb1 cipcb
alias cipcb2 cipcb
alias cipcb3 cipcb
alias ppp0 ppp_generic
alias ppp1 ppp_generic
alias slip0 slip
alias slip1 slip
alias tty-ldisc-1 slip
alias tty-ldisc-3 ppp_async
alias tty-ldisc-11 irtty
alias tty-ldisc-14 ppp_synctty
alias tty-ldisc-15 hci_uart
alias ppp-compress-18 ppp_mppe
alias ppp-compress-21 bsd_comp
alias ppp-compress-24 ppp_deflate
alias ppp-compress-26 ppp_deflate
alias parport_lowlevel parport_pc
alias usbdevfs usbcore
alias xfrm-type-2-50 esp4
alias xfrm-type-2-51 ah4
alias xfrm-type-2-108 ipcomp
alias xfrm-type-10-50 esp6
alias xfrm-type-10-51 ah6
alias xfrm-type-10-108 ipcomp6
alias cipher_null crypto_null
alias digest_null crypto_null
alias compress_null crypto_null
alias sha384 sha512
alias char-major-144-* pppoe
alias net-pf-24 pppoe
alias ppp ppp_generic
alias /dev/ppp ppp_generic
alias tty-ldisc-13 n_hdlc
alias char-major-166-* acm
alias char-major-240-* usb-serial
alias sl0 slip
alias sl1 slip
alias /dev/lvm lvm-mod
alias /dev/nb nbd
alias char-major-89-* i2c-dev
options sb io=0x220 irq=7 dma=1 dma16=5 mpu_io=0x330
options apm power_off=1
install /dev/devil-linux /bin/true
install binfmt-0000 /bin/true
install block-major-11 /bin/true
install block-major-3 /bin/true
install block-major-7 /bin/true
install block-major-8 /bin/true
install char-major-10 /bin/true
install char-major-10-1 /bin/true
install char-major-21 /bin/true
install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy
install dummy1 /sbin/modprobe -o dummy1 --ignore-install dummy
install eth0 /bin/true
install hid /sbin/modprobe --first-time --ignore-install hid && { /sbin/modprobe keybdev; /sbin/modprobe mousedev; /bin/true; }
install net-pf-19 /bin/true
install ov518_decomp { /sbin/modprobe ov511; } ; /sbin/modprobe --first-time --ignore-install ov518_decomp
install scsi_hostadapter /bin/true
install usbmouse /sbin/modprobe --first-time --ignore-install usbmouse && { /sbin/modprobe hid; /bin/true; }
install wacom /sbin/modprobe --first-time --ignore-install wacom && { /sbin/modprobe evdev; /bin/true; }
install wlan0 /bin/true
remove hid { /sbin/modprobe -r keybdev; /sbin/modprobe -r mousedev; } ; /sbin/modprobe -r --first-time --ignore-remove hid
remove ov518_decomp /sbin/modprobe -r --first-time --ignore-remove ov518_decomp && { /sbin/modprobe -r ov511; /bin/true; }
remove usbmouse { /sbin/modprobe -r hid; } ; /sbin/modprobe -r --first-time --ignore-remove usbmouse
remove wacom { /sbin/modprobe -r evdev; } ; /sbin/modprobe -r --first-time --ignore-remove wacom

[Devil-linux-commit] build/scripts module-init-tools,NONE,1.1 build-iso,1.50,1.51 e2fsprogs,1.16,1.17 finalize,1.6,1.7 kbd,1.4,1.5 lilo,1.8,1.9 linux,1.51,1.52 modutils,1.14,1.15

[<smi...@us...>]

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

Modified Files:
	build-iso e2fsprogs finalize kbd lilo linux modutils 
Added Files:
	module-init-tools 
Log Message:
more changes to get kernel 2.6 working
most functions seem to be OK and working now


--- NEW FILE: module-init-tools ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/module-init-tools,v $
# $Revision: 1.1 $
# $Date: 2004/01/13 02:29:49 $
#
# http://www.devil-linux.org

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

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

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

# source functions and config
source $MYDIR/settings

case $1 in
	build )
		if [ "$CONFIG_LINUX_VERSION" = "2.6" ]; then
			./configure --prefix= --enable-zlib || exit 1
			make all $PMAKE || exit 1
			strip_debug
			rm /sbin/{insmod,modprobe,depmod,rmmod}
			make install || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_LINUX_VERSION" = "2.6" ]; then
			rm -rf $WORKDIR/tmp || exit 1
			mkdir -p $WORKDIR/tmp || exit 1
			make install DESTDIR=$WORKDIR/tmp || exit 1
			copy_docs $WORKDIR/tmp
			rm -rf $WORKDIR/tmp/usr || exit 1
			cp --remove-destination -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
			rm -rf $WORKDIR/tmp || exit 1
			cp modprobe.devfs $ETCDIR/etc/ || exit 1
			rm $ETCDIR/etc/modules.conf 2> /dev/null
		fi
		;;

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


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- build-iso	12 Jan 2004 20:51:03 -0000	1.50
+++ build-iso	13 Jan 2004 02:29:49 -0000	1.51
@@ -211,6 +211,14 @@
 			#===========================================================================
 		fi
 
+		echo "Updating module dependencies"
+		rm $CDDIR/lib/modules/$KERNELVERSION/modules.*
+		rm $INITRDDIR/lib/modules/$KERNELVERSION/modules.*
+		depmod -a -b $CDDIR -F $CDDIR/boot/System.map $KERNELVERSION || exit 1
+		cp -dp $CDDIR/lib/modules/$KERNELVERSION/modules.* $INITRDDIR/lib/modules/$KERNELVERSION/ || exit 1
+		echo "done"
+		echo
+
 		#===========================================================================
 
 		echo -n -e "\30/boot/logo.lss\n" > $CDDIR/boot/message

Index: e2fsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/e2fsprogs,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- e2fsprogs	11 Jan 2004 14:43:04 -0000	1.16
+++ e2fsprogs	13 Jan 2004 02:29:49 -0000	1.17
@@ -58,8 +58,8 @@
 		ln -sf mke2fs $WORKDIR/tmp/sbin/mkfs.ext2
 		ln -sf mke2fs $WORKDIR/tmp/sbin/mkfs.ext3
 		ln -sf e2label $WORKDIR/tmp/sbin/tune2fs
-		cp -dfpR $WORKDIR/tmp/* $CDDIR || exit 1
-		cp -dfpR misc/mke2fs-static $INITRDDIR/bin/mke2fs || exit 1
+		cp --remove-destination -dpR $WORKDIR/tmp/* $CDDIR || exit 1
+		cp --remove-destination -dpR misc/mke2fs-static $INITRDDIR/bin/mke2fs || exit 1
 		rm -rf $WORKDIR/tmp || exit 1
 		;;
 

Index: finalize
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/finalize,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- finalize	11 Jan 2004 14:43:04 -0000	1.6
+++ finalize	13 Jan 2004 02:29:49 -0000	1.7
@@ -32,7 +32,6 @@
 		cp /etc/group  $ETCDIR/etc/ || exit 1
 		cp /etc/shadow $ETCDIR/etc/ || exit 1
 		cp /etc/gshadow $ETCDIR/etc/ || exit 1
-		rm -rf $ETCDIR/etc/modules/*
 
 		chown -R 0.0 $ETCDIR/etc || exit 1
 		;;

Index: kbd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/kbd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kbd	11 Jan 2004 19:39:53 -0000	1.4
+++ kbd	13 Jan 2004 02:29:49 -0000	1.5
@@ -33,10 +33,10 @@
     install )
 	rm -rf $WORKDIR/tmp || exit 1
 	mkdir -p $WORKDIR/tmp || exit 1
-	make install DESTDIR=$WORKDIR/tmp/usr DATADIR=$WORKDIR/tmp/usr/share/kbd MANDIR=$WORKDIR/tmp/usr/share/man  || exit 1
+	make install DESTDIR=$WORKDIR/tmp DATADIR=$WORKDIR/tmp/usr/share/kbd MANDIR=$WORKDIR/tmp/usr/share/man  || exit 1
 	#rm -rf $WORKDIR/tmp/usr/share/locale || exit 1
 	copy_docs $WORKDIR/tmp
-	cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1
+	cp -dfpR $WORKDIR/tmp/usr $CDDIR/ || exit 1
 	rm -rf $WORKDIR/tmp || exit 1
 	;;
 

Index: lilo
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lilo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- lilo	11 Jan 2004 14:43:04 -0000	1.8
+++ lilo	13 Jan 2004 02:29:49 -0000	1.9
@@ -25,6 +25,13 @@
 
 case $1 in
 	build )
+	
+	 if [ ! -f lilo-patches.done ]; then
+             bzcat $DL_DIR/src/lilo_22.5.8_header.diff.bz2 | patch -p1
+             touch lilo-patches.done
+          fi
+	
+
 		disable_et_dyn
 	    make $PMAKE || exit 1
 	    strip_debug

Index: linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/linux,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- linux	12 Jan 2004 02:57:59 -0000	1.51
+++ linux	13 Jan 2004 02:29:49 -0000	1.52
@@ -56,7 +56,6 @@
 		cp -dpR $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/scsi $INITRDDIR/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1
 		cp -dpR $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/block $INITRDDIR/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1
 		cp -dp $CDDIR/lib/modules/$KERNELVERSION/modules.dep $INITRDDIR/lib/modules/$KERNELVERSION/ || exit 1
-		mkdir -p $ETCDIR/etc/modules
 		;;
 
     * )

Index: modutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/modutils,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- modutils	11 Jan 2004 14:43:04 -0000	1.14
+++ modutils	13 Jan 2004 02:29:49 -0000	1.15
@@ -25,20 +25,25 @@
 
 case $1 in
     build )
-	./configure || exit 1
-	# Parallel jobs does not work ($PMAKE)
-	make all || exit 1
-	strip_debug
+	if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+		./configure || exit 1
+		# Parallel jobs does not work ($PMAKE)
+		make all || exit 1
+		strip_debug
+	fi
         ;;
 
     install )
-        rm -rf $WORKDIR/tmp || exit 1
-        mkdir -p $WORKDIR/tmp/sbin || exit 1
-        mkdir -p $WORKDIR/tmp/usr/share/man/man{1,2,5,8} || exit 1
-        make install prefix=$WORKDIR/tmp/usr exec_prefix=$WORKDIR/tmp mandir=$WORKDIR/tmp/usr/share/man || exit 1
-	copy_docs $WORKDIR/tmp
-        copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1
-        rm -rf $WORKDIR/tmp || exit 1
+	if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+		rm -rf $WORKDIR/tmp || exit 1
+		mkdir -p $WORKDIR/tmp/sbin || exit 1
+		mkdir -p $WORKDIR/tmp/usr/share/man/man{1,2,5,8} || exit 1
+		make install prefix=$WORKDIR/tmp/usr exec_prefix=$WORKDIR/tmp mandir=$WORKDIR/tmp/usr/share/man || exit 1
+		copy_docs $WORKDIR/tmp
+		copy_files $WORKDIR/tmp/sbin $CDDIR/ || exit 1
+		rm -rf $WORKDIR/tmp || exit 1
+		rm $ETCDIR/etc/modprobe.conf 2> /dev/null
+	fi
     	;;
 
     * )

[Devil-linux-commit] build/config/etc/initrd linuxrc,1.54,1.55

[<smi...@us...>]

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

Modified Files:
	linuxrc 
Log Message:
more changes to get kernel 2.6 working
most functions seem to be OK and working now


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- linuxrc	12 Jan 2004 20:51:03 -0000	1.54
+++ linuxrc	13 Jan 2004 02:29:49 -0000	1.55
@@ -84,7 +84,7 @@
 DL_CONFIG_SOURCE=""
 
 echo -e "Loading loop-AES module";
-modprobe loop
+modprobe loop 2> /dev/null
 
 $GREEN
 echo -e "searching for configuration media"

[Devil-linux-commit] build CHANGES,1.644,1.645

[<smi...@us...>]

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

Modified Files:
	CHANGES 
Log Message:
more changes to get kernel 2.6 working
most functions seem to be OK and working now


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -d -r1.644 -r1.645
--- CHANGES	12 Jan 2004 20:51:03 -0000	1.644
+++ CHANGES	13 Jan 2004 02:29:49 -0000	1.645
@@ -22,6 +22,12 @@
 #
 
 1.1.2
+- updated lilo to v22.5.8 and added patch to compile under kernel 2.6 (Heiko / Oliver Jehle)
+- updated e2fsprogs to v1.35-WIP-1207 (test version)
+- updated net-tools patch to debian 1.60-9 version (Heiko / Oliver Jehle)
+- added glibc getgrouplist (CAN-2003-0689) and ifaddrs (CAN-2003-0859) patches (Heiko / Oliver Jehle)
+- removed module dependencies from /etc/modules and moved it back to /lib/modules
+- added module-init-tools v3.0pre5
 - added kernel 2.6.1 to build sytem (requires ext2 as initrd fs)
 - menuconfig now has an option to select the initrd filesystem
 - updated lvm to v1.0.8

[Devil-linux-commit] build/config/etc/init.d boot,1.16,1.17

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1:/tmp/cvs-serv23155/config/etc/init.d

Modified Files:
	boot 
Log Message:
more changes to get kernel 2.6 working
most functions seem to be OK and working now


Index: boot
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/boot,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- boot	6 Sep 2003 01:59:26 -0000	1.16
+++ boot	13 Jan 2004 02:29:49 -0000	1.17
@@ -52,13 +52,6 @@
 #ldconfig  2>&1 >/dev/null
 #evaluate_retval
 
-# update module dependencies
-if [ ! -f /etc/modules/modules.dep ];then
-	echo -n "Generating module dependencies"
-	depmod -a
-	evaluate_retval
-fi
-
 if [ "$ENABLE_APM" = "yes" ]; then
 	modprobe apm power_off=1
 fi

[Devil-linux-commit] build/config/etc modules.conf,1.14,1.15

[<smi...@us...>]

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

Modified Files:
	modules.conf 
Log Message:
more changes to get kernel 2.6 working
most functions seem to be OK and working now


Index: modules.conf
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/modules.conf,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- modules.conf	21 Sep 2003 00:41:56 -0000	1.14
+++ modules.conf	13 Jan 2004 02:29:49 -0000	1.15
@@ -2,15 +2,6 @@
 # $Id$
 #
 
-depfile=/etc/modules/modules.dep
-generic_stringfile=/etc/modules/modules.generic_string
-isapnpmapfile=/etc/modules/modules.isapnpmap
-parportmapfile=/etc/modules/modules.parportmap
-pcimapfile=/etc/modules/modules.pcimap
-usbmapfile=/etc/modules/modules.usbmap
-ieee1394mapfile=/etc/modules/modules.ieee1394map
-pnpbiosmapfile=/etc/modules/modules.pnpbiosmap
-
 alias char-major-10-200	tun
 alias char-major-144	pppoe
 alias net-pf-24			pppoe

[Devil-linux-commit] build/scripts/configuration prepare.config,1.7,1.8

[<smi...@us...>]

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

Modified Files:
	prepare.config 
Log Message:
- added kernel 2.6.1 to build sytem (requires ext2 as initrd fs)
- menuconfig now has an option to select the initrd filesystem


Index: prepare.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/prepare.config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- prepare.config	24 Dec 2003 23:14:37 -0000	1.7
+++ prepare.config	12 Jan 2004 20:51:03 -0000	1.8
@@ -18,6 +18,9 @@
 
 menu_add "Build Configuration" bool "Disable Build system logfiles" CONFIG_DISABLELOGGING
 
+test -z "$CONFIG_INITRD_FS" && CONFIG_INITRD_FS=CRAMFS
+menu_add "Build Configuration" list "InitRD Filesystem" CONFIG_INITRD_FS CRAMFS EXT2
+
 #For new epia models (nehemiah), CONFIG_KERNEL_CPU has to be VIAC3_2 and CONFIG_CPU = 686
 #gcc -march=i686
 #see (http://www.ussg.iu.edu/hypermail/linux/kernel/0304.0/1685.html)

[Devil-linux-commit] build/scripts build-iso,1.49,1.50

[<smi...@us...>]

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

Modified Files:
	build-iso 
Log Message:
- added kernel 2.6.1 to build sytem (requires ext2 as initrd fs)
- menuconfig now has an option to select the initrd filesystem


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- build-iso	12 Jan 2004 02:57:58 -0000	1.49
+++ build-iso	12 Jan 2004 20:51:03 -0000	1.50
@@ -112,7 +112,7 @@
 
 		#===========================================================================
 
-		if [ "1" = "1" ] || [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+		if [ "$CONFIG_INITRD_FS" = "CRAMFS" ]; then
 
 			echo "creating the initial ramdisk (initrd) image.... "
 
@@ -122,7 +122,9 @@
 
 			echo "done"
 			echo
-		else
+		fi
+
+		if [ "$CONFIG_INITRD_FS" = "EXT2" ]; then
 
 			#===========================================================================
 			echo "creating the initial ramdisk (initrd) image.... "
@@ -226,30 +228,54 @@
 		# convert the logo into the syslinux format
 		ppmtolss16 < $DL_DIR/other/devil-linux.pnm >$CDDIR/boot/logo.lss || exit 1
 
-		#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz ramdisk=$ISIZE
-		cat  > $CDDIR/isolinux.cfg  <<-EOF
-		default 0
-		display /boot/message
-		timeout 50
-		prompt 1
-		label 0
-		  kernel /boot/vmlinuz
-		  append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096
-		label 1
-		  kernel /boot/vmlinuz
-		  append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=769
-		label 2
-		  kernel /boot/vmlinuz
-		  append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=771
-		label 3
-		  kernel /boot/vmlinuz
-		  append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=773
-		label 4
-		  kernel /boot/vmlinuz
-		  append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=ask
-		EOF
-		#ramdisk=$ISIZE
-		# rw
+		if [ "$CONFIG_INITRD_FS" = "CRAMFS" ]; then
+			#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz ramdisk=$ISIZE
+			cat  > $CDDIR/isolinux.cfg  <<-EOF
+			default 0
+			display /boot/message
+			timeout 50
+			prompt 1
+			label 0
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=8096
+			label 1
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=769
+			label 2
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=771
+			label 3
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=773
+			label 4
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=ask
+			EOF
+		fi
+		if [ "$CONFIG_INITRD_FS" = "EXT2" ]; then
+			#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz ramdisk=$ISIZE
+			cat  > $CDDIR/isolinux.cfg  <<-EOF
+			default 0
+			display /boot/message
+			timeout 50
+			prompt 1
+			label 0
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro
+			label 1
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro vga=769
+			label 2
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro vga=771
+			label 3
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro vga=773
+			label 4
+			kernel /boot/vmlinuz
+			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro vga=ask
+			EOF
+		fi
 
 		if [ -f $CDDIR/boot/memtest ]; then
 		    echo "label m" >> $CDDIR/isolinux.cfg

[Devil-linux-commit] build CHANGES,1.643,1.644

[<smi...@us...>]

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

Modified Files:
	CHANGES 
Log Message:
- added kernel 2.6.1 to build sytem (requires ext2 as initrd fs)
- menuconfig now has an option to select the initrd filesystem


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -d -r1.643 -r1.644
--- CHANGES	11 Jan 2004 19:39:53 -0000	1.643
+++ CHANGES	12 Jan 2004 20:51:03 -0000	1.644
@@ -22,6 +22,8 @@
 #
 
 1.1.2
+- added kernel 2.6.1 to build sytem (requires ext2 as initrd fs)
+- menuconfig now has an option to select the initrd filesystem
 - updated lvm to v1.0.8
 - updated cvs to v1.12.5
 - updated sed to v4.08

[Devil-linux-commit] build/config/etc/initrd linuxrc,1.53,1.54

[<smi...@us...>]

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

Modified Files:
	linuxrc 
Log Message:
- added kernel 2.6.1 to build sytem (requires ext2 as initrd fs)
- menuconfig now has an option to select the initrd filesystem


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- linuxrc	8 Jan 2004 01:09:48 -0000	1.53
+++ linuxrc	12 Jan 2004 20:51:03 -0000	1.54
@@ -60,9 +60,13 @@
 # mount proc
 mount -n -t proc none /proc
 
+echo "******************"
+echo Kernel $(uname -r)
+echo "******************"
+
 # mount shared memory filesystem with a limit of 40GB (for now)
 echo "Mounting SHM FS on /shm"
-mount -n -t shm shmfs /shm
+mount -n -t shm shmfs /shm 2> /dev/null || mount -n -t tmpfs none /shm
 
 # get rid of modprobe warnings
 mkdir -p /shm/etc

[Devil-linux-commit] build/scripts functions,1.41,1.41.2.1

[<smi...@us...>]

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

Modified Files:
      Tag: rel-1-0-patches
	functions 
Log Message:
- menuconfig now correctly sets any missing list values in the config file


Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -d -r1.41 -r1.41.2.1
--- functions	14 Jul 2003 13:27:09 -0000	1.41
+++ functions	12 Jan 2004 15:56:26 -0000	1.41.2.1
@@ -169,6 +169,12 @@
 
 	X=${X//|/^}
 
+	if [ "$TYPE" = "list" ];then
+		if [ -z "$(grep "$VARIABLE=" $BUILD_CONFIG-tmp 2> /dev/null)" ];then
+			echo $VARIABLE=$SET >> $BUILD_CONFIG-tmp
+		fi
+	fi
+
 	if [ "$X" = "$CURRENTMENU" ] || [ "$X^$VARIABLE" = "$CURRENTMENU" ]; then
 		case $TYPE in
 			bool )

[Devil-linux-commit] build CHANGES,1.510.2.48,1.510.2.49

[<smi...@us...>]

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

Modified Files:
      Tag: rel-1-0-patches
	CHANGES 
Log Message:
- menuconfig now correctly sets any missing list values in the config file


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.510.2.48
retrieving revision 1.510.2.49
diff -u -d -r1.510.2.48 -r1.510.2.49
--- CHANGES	9 Jan 2004 02:33:14 -0000	1.510.2.48
+++ CHANGES	12 Jan 2004 15:56:26 -0000	1.510.2.49
@@ -22,6 +22,7 @@
 #
 #
 1.0.5
+- menuconfig now correctly sets any missing list values in the config file
 - fixed named start problem when jail disabled (fl)
 
 1.0.4