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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	build-iso build.sh linux loop-AES prepare 
Log Message:
more changes to get kernel 2.6 support working


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49

--- build-iso	8 Nov 2003 04:06:28 -0000	1.48
+++ build-iso	12 Jan 2004 02:57:58 -0000	1.49
@@ -42,6 +42,9 @@
 		# In principle we could do with one, but it comes in handy to be able to
 		# leave one mounted, so I took two different ones.
 
+		rm -rf $WORKDIR/mnt
+		mkdir -p $WORKDIR/mnt/loop{1,2}
+
 		# we first assume that a proper directory tree of the later ramdisk
 		# is in the initrdtree directory. Put everything in there what you think
 		# will be needed. We assume that this is the case.
@@ -89,15 +92,6 @@
 
 		#===========================================================================
 
-		echo -n "copying modules...."
-		cp -fdpR $WORKDIR/modules.initrd/* $INITRDDIR/ || exit 1
-		echo $DL_VERSION > $INITRDDIR/VERSION
-
-		echo "done"
-		echo
-
-		#===========================================================================
-
 		echo -n "creating etc.tar.bz2..."
 		(cd $WORKDIR/ETC; tar -cjf $CDDIR/config/etc.tar.bz2 etc)
 
@@ -118,14 +112,102 @@
 
 		#===========================================================================
 
-		echo "creating the initial ramdisk (initrd) image.... "
+		if [ "1" = "1" ] || [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
 
-		cp -p $DL_DIR/config/etc/initrd/linuxrc $INITRDDIR
-		mkcramfs $INITRDDIR/ $BOOTIMAGEDIR/initrd
-		gzip -f -9 $BOOTIMAGEDIR/initrd
+			echo "creating the initial ramdisk (initrd) image.... "
 
-		echo "done"
-		echo
+			cp -p $DL_DIR/config/etc/initrd/linuxrc $INITRDDIR
+			mkcramfs $INITRDDIR/ $BOOTIMAGEDIR/initrd
+			gzip -f -9 $BOOTIMAGEDIR/initrd
+
+			echo "done"
+			echo
+		else
+
+			#===========================================================================
+			echo "creating the initial ramdisk (initrd) image.... "
+
+			# first find out how much space we need.
+			ISIZE=`du -s -k  $INITRDDIR | awk '{print $1}'`
+
+			# is that true? Anyway, we are smaller than that.
+			#if [ $ISIZE -gt 8192 ]; then
+			#	echo "Initial Ramdisk max size exceeded ($ISIZE, max is 8192KB)"
+			#	exit 1
+			#fi
+
+			ISIZE=`expr $ISIZE + 2048`
+			#ISIZE=15000
+			echo "  Initial Ramdisk contents will be $ISIZE KB"
+
+			# delete the existing ramdisk image, if there is one
+			rm -f $WORKDIR/ramdisk
+
+			# create a file of 4MB (4096 KB)
+			dd if=/dev/zero of=$WORKDIR/ramdisk bs=1k count=$ISIZE
+
+			# associate it with /dev/loop2
+			losetup /dev/loop2 $WORKDIR/ramdisk
+
+			# make an ext2 filesystem on it. We set the amount of unused space to 0%
+			# and turn down the number of inodes to save space
+			yes | mkfs  -t ext2 -m 0 -i 1024 $WORKDIR/ramdisk
+			#yes | mkfs  -t ext2 -i 16384 -m 0 $TOPDIR/ramdisk
+			#mkfs  -t ext2 -i 16384 -m 0 /dev/loop2
+			#mkfs  -t ext2 /dev/loop2
+			tune2fs -c 0 -i 0 /dev/loop2
+
+			# we mount it...
+			mount /dev/loop2 $WORKDIR/mnt/loop2
+
+			# ... and delete the lost+found directory
+			rm -rf $WORKDIR/mnt/loop2/lost+found
+
+			# store version
+			echo $DLVERSION > $WORKDIR/mnt/loop2/VERSION
+
+			# we need the linuxrc and links scripts
+			cp -p $DL_DIR/config/etc/initrd/linuxrc $INITRDDIR
+
+			# and the functions script
+			cp -p $ETCDIR/etc/init.d/functions $INITRDDIR
+
+			# then we copy the contents of our initrdtree to this filesystem
+			cp -dpR $INITRDDIR/* $WORKDIR/mnt/loop2/
+
+			# and unmount and divorce /dev/loop2
+			umount $WORKDIR/mnt/loop2
+			losetup -d /dev/loop2
+
+			echo "done"
+			echo
+
+			#===========================================================================
+
+			# Now we have the image of the ramdisk in $TOPDIR/loopfiles/ramdisk. We
+			# compress this one and write the compressed image to the boot tree:
+
+			echo -n "compressing the initial ramdisk (initrd) image.... "
+
+			# delete any existing one
+			rm -f $BOOTIMAGEDIR/initrd.gz
+
+			# and gzip our ramdisk image and put it in the right place.
+			#gzip -9 -c $WORKDIR/ramdisk > $BOOTIMAGEDIR/initrd.gz
+			gzip -c $WORKDIR/ramdisk > $BOOTIMAGEDIR/initrd.gz
+
+			# we are done with the uncompressed ramdisk image, delete it
+			rm  $WORKDIR/ramdisk
+
+			# how much is the contents of the bootimagetree?
+			#ISIZE=`du -s -k  $BOOTIMAGEDIR | awk '{print $1}'`
+			#echo "Boot image size is $ISIZE KB"
+
+			echo "done"
+			echo
+
+			#===========================================================================
+		fi
 
 		#===========================================================================
 

Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- build.sh	11 Jan 2004 14:43:04 -0000	1.67
+++ build.sh	12 Jan 2004 02:57:59 -0000	1.68
@@ -90,8 +90,6 @@
 			nice rm -rf $CDDOCDIR
 			echo "cleaning $ISODIR"
 			nice rm -rf $ISODIR
-			nice rm -rf $WORKDIR/modules
-			nice rm -rf $WORKDIR/modules.initrd
 			nice rm -f ${DONE}_install*
 			nice rm -f ${DONE}_iso*
 			echo "done"

Index: linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/linux,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- linux	11 Jan 2004 14:43:04 -0000	1.50
+++ linux	12 Jan 2004 02:57:59 -0000	1.51
@@ -23,9 +23,12 @@
 # source functions and config
 source $MYDIR/settings
 
+# change into the correct kernel directory
+cd $KERNELDIR || exit 1
+
 case $1 in
     build )
-		if [ ! -e include/linux/linux_logo.h.org ]; then
+		if [ "$CONFIG_LINUX_VERSION" = "2.4" ] && [ ! -e include/linux/linux_logo.h.org ]; then
 		    cp -f include/linux/linux_logo.h include/linux/linux_logo.h.org
 		    fblogo $DL_DIR/other/fblogo.png include/linux/linux_logo.h
 		fi
@@ -45,19 +48,15 @@
 		;;
 
     install )
-		make modules_install INSTALL_MOD_PATH=$WORKDIR/modules || exit 1
+		make modules_install INSTALL_MOD_PATH=$CDDIR || exit 1
 		cp arch/i386/boot/bzImage $BOOTIMAGEDIR/vmlinuz || exit 1
 		cp System.map $BOOTIMAGEDIR/boot || exit 1
 		cp System.map $CDDIR/boot || exit 1
-		cp -dpR $WORKDIR/modules/* $CDDIR/ || exit 1
-		# KERNELVERSION=$(ls -A $WORKDIR/modules/lib/modules)
-		mkdir -p $WORKDIR/modules.initrd/lib/modules/$KERNELVERSION/kernel/drivers || exit 1
-		cp -dpR $WORKDIR/modules/lib/modules/$KERNELVERSION/kernel/drivers/scsi $WORKDIR/modules.initrd/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1
-		cp -dpR $WORKDIR/modules/lib/modules/$KERNELVERSION/kernel/drivers/block $WORKDIR/modules.initrd/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1
-		#cp -dpR $WORKDIR/modules/lib/modules/$KERNELVERSION/kernel/drivers/usb $WORKDIR/modules.initrd/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1
-		cp -dp $WORKDIR/modules/lib/modules/$KERNELVERSION/modules.dep $WORKDIR/modules.initrd/lib/modules/$KERNELVERSION/ || exit 1
+		mkdir -p $INITRDDIR/lib/modules/$KERNELVERSION/kernel/drivers || exit 1
+		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
-		#cp -dp $WORKDIR/modules/lib/modules/$KERNELVERSION/modules.* $ETCDIR/etc/modules
 		;;
 
     * )

Index: loop-AES
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/loop-AES,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- loop-AES	11 Jan 2004 14:43:04 -0000	1.4
+++ loop-AES	12 Jan 2004 02:57:59 -0000	1.5
@@ -21,6 +21,8 @@
 
 MYNAME=LOOP-AES
 
+# we do not need this on Kernel 2.6
+test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0
 
 case $1 in
 	build )
@@ -28,7 +30,7 @@
         	;;
 
 	install )
-		cp -dpR lib/modules/$KERNELVERSION/block $WORKDIR/modules.initrd/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1
+		cp -dpR lib/modules/$KERNELVERSION/block $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1
 		;;
 
     * )

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- prepare	11 Jan 2004 14:43:05 -0000	1.31
+++ prepare	12 Jan 2004 02:57:59 -0000	1.32
@@ -83,50 +83,49 @@
 	    rm -f $KERNELDIR/.config.add
 	fi
 
-	cp $MYDIR/config/config_linux $KERNELDIR/.config || exit 1
+	KERNEL_CONFIG_DIR=$DL_DIR/scripts/config
+	if [ ! "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+		KERNEL_CONFIG_DIR=$DL_DIR/scripts/config/linux-$CONFIG_LINUX_VERSION
+	fi
+
+	cp $KERNEL_CONFIG_DIR/config_linux $KERNELDIR/.config || exit 1
 	echo "CONFIG_M$CONFIG_KERNEL_CPU=y" >> $KERNELDIR/.config
 	echo "CONFIG_NR_CPUS=$CONFIG_LINUX_NR_CPUS" >> $KERNELDIR/.config
 
 	if [ "$CONFIG_LINUX_SMP" == "y" ]; then
-		cat $DL_DIR/scripts/config/config_linux.smp  >> $KERNELDIR/.config || exit 1
+		cat $KERNEL_CONFIG_DIR/config_linux.smp  >> $KERNELDIR/.config || exit 1
 	else
-		cat $DL_DIR/scripts/config/config_linux.up  >> $KERNELDIR/.config || exit 1
+		cat $KERNEL_CONFIG_DIR/config_linux.up  >> $KERNELDIR/.config || exit 1
 	fi
 
 	if [ "$CONFIG_HIGHMEM" == "y" ]; then
-		cat $DL_DIR/scripts/config/config_highmem.yes >> $KERNELDIR/.config || exit 1
+		cat $KERNEL_CONFIG_DIR/config_highmem.yes >> $KERNELDIR/.config || exit 1
 	else
-		cat $DL_DIR/scripts/config/config_highmem.no >> $KERNELDIR/.config || exit 1
+		cat $KERNEL_CONFIG_DIR/config_highmem.no >> $KERNELDIR/.config || exit 1
 	fi
 
 	if [ "$CONFIG_KERNEL_CPU" == "VIAC3_2" ]; then
-		cat $DL_DIR/scripts/config/config_linux.epia >> $KERNELDIR/.config || exit 1
+		cat $KERNEL_CONFIG_DIR/config_linux.epia >> $KERNELDIR/.config || exit 1
 	elif [ "$CONFIG_KERNEL_CPU" == "486" ]; then
-		cat $DL_DIR/scripts/config/config_linux.486 >> $KERNELDIR/.config || exit 1
+		cat $KERNEL_CONFIG_DIR/config_linux.486 >> $KERNELDIR/.config || exit 1
 	else
-		cat $DL_DIR/scripts/config/config_linux.486 >> $KERNELDIR/.config || exit 1
+		cat $KERNEL_CONFIG_DIR/config_linux.486 >> $KERNELDIR/.config || exit 1
 	fi
 
 	if [ "$CONFIG_ALSA" == "y" ]; then
-		cat $DL_DIR/scripts/config/config_linux.alsa >> $KERNELDIR/.config || exit 1
+		cat $KERNEL_CONFIG_DIR/config_linux.alsa >> $KERNELDIR/.config || exit 1
 	fi
 
 	pushd $KERNELDIR > /dev/null
 
 	if [ ! -f devil-linux-kernel-patches.done ]; then
 		touch devil-linux-kernel-patches.done
-		for PATCH in $(ls $WORKDIR/kernel-patches/* 2> /dev/null )
+		for PATCH in $(ls $WORKDIR/kernel-patches-$CONFIG_LINUX_VERSION/* 2> /dev/null )
 		do
 			echo applying patch: $PATCH
 			patch -p1 -i $PATCH || exit 1
 		done
 	fi
-	#if [ ! -f devil-linux-kernel-patches-usbat02.done ] && [ "$CONFIG_SCM_USBAT02" = "y" ]; then
-	#	touch devil-linux-kernel-patches-usbat02.done
-	#	echo applying patch: $PATCH
-	#	bzcat $DL_DIR/src/usbat02*.diff.bz2 | patch -p1 || exit 1
-	#	echo "CONFIG_USB_STORAGE_ZIOCF=y" >> ./.config
-	#fi
 
 	make oldconfig || exit 1
 	make dep || exit 1
@@ -156,7 +155,7 @@
 	    cp $DL_DIR/config/etc/gshadow /etc || exit 1
 	    ;;
     iso )
-    	;;	
+    	;;
 
    * )
         echo "ERROR ($0)"






2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (202)	Nov (201)	Dec (280)
2004	Jan (493)	Feb (106)	Mar (215)	Apr (163)	May (79)	Jun (193)	Jul (47)	Aug (71)	Sep (127)	Oct (41)	Nov (49)	Dec (120)
2005	Jan (147)	Feb (45)	Mar (26)	Apr (71)	May (52)	Jun (28)	Jul (92)	Aug (50)	Sep (35)	Oct (193)	Nov (106)	Dec (52)
2006	Jan (51)	Feb (38)	Mar (33)	Apr (79)	May (107)	Jun (67)	Jul (21)	Aug (65)	Sep (44)	Oct (87)	Nov (12)	Dec (56)
2007	Jan (48)	Feb (58)	Mar (63)	Apr (31)	May (25)	Jun (20)	Jul (72)	Aug (54)	Sep (30)	Oct (76)	Nov (74)	Dec (25)
2008	Jan (39)	Feb (39)	Mar (62)	Apr (64)	May (59)	Jun (31)	Jul (25)	Aug (25)	Sep (17)	Oct (24)	Nov	Dec (1)
2009	Jan (60)	Feb (39)	Mar (16)	Apr (30)	May (52)	Jun (35)	Jul (15)	Aug (15)	Sep (21)	Oct (32)	Nov (39)	Dec (52)
2010	Jan (42)	Feb (40)	Mar (23)	Apr (20)	May (27)	Jun (10)	Jul (30)	Aug (30)	Sep (66)	Oct (12)	Nov (35)	Dec (60)
2011	Jan (16)	Feb (1)	Mar (3)	Apr (28)	May (21)	Jun	Jul (12)	Aug (6)	Sep (10)	Oct (14)	Nov (40)	Dec (60)
2012	Jan (23)	Feb (17)	Mar (24)	Apr (18)	May (13)	Jun (1)	Jul	Aug (5)	Sep	Oct (5)	Nov (5)	Dec (15)
2013	Jan (2)	Feb (5)	Mar (1)	Apr (2)	May (2)	Jun (3)	Jul	Aug (3)	Sep (5)	Oct (3)	Nov (1)	Dec (1)
2014	Jan (3)	Feb (5)	Mar (8)	Apr (3)	May (1)	Jun (1)	Jul (2)	Aug	Sep (4)	Oct (10)	Nov	Dec (9)
2015	Jan (18)	Feb (17)	Mar (5)	Apr (2)	May	Jun (5)	Jul (1)	Aug (2)	Sep (1)	Oct (24)	Nov (20)	Dec (41)
2016	Jan (9)	Feb (3)	Mar (2)	Apr (7)	May (8)	Jun (1)	Jul (6)	Aug (5)	Sep (2)	Oct (6)	Nov (1)	Dec (6)
2017	Jan (6)	Feb (1)	Mar	Apr (4)	May (1)	Jun (1)	Jul (2)	Aug (2)	Sep	Oct	Nov	Dec

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

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