[Devil-linux-commit] build/scripts cdrtools,1.10,1.11 util-linux,1.32,1.33

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14330/scripts

Modified Files:
	cdrtools util-linux 
Log Message:
- updated loop-AES to 3.1b
- downgraded cdrtools to 2.01 and added patch to successfully compile
mkisofs
- updated util-linux to 2.12q
- re-added the udev fixes for mount_cdrom


Index: cdrtools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cdrtools,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cdrtools	8 Jun 2005 14:14:25 -0000	1.10
+++ cdrtools	27 Sep 2005 16:20:27 -0000	1.11
@@ -25,17 +25,20 @@
 
 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
+        if [ ! -f cdrtools-2.0-patch.done ]; then
+           #bzcat $SRCDIR/cdrtools-2.*-kernel*-patch.bz2 | patch -p1 || exit 1
+	   bzcat $SRCDIR/cdrtools-2.01-resmgr.patch.bz2 | patch -p1 || exit 1
+           touch cdrtools-2.0-patch.done
+        fi
 
         ./Gmake.linux CCOM=gcc all || exit 1
         strip_debug
+	
+	# install it, because we need it later
+	./Gmake.linux CCOM=gcc INS_BASE=/usr install || exit 1
         ;;
 
     install )
-		./Gmake.linux CCOM=gcc INS_BASE=/usr install || exit 1
 
 		if [ "$CONFIG_CDRTOOLS_ON_CD" = "y" ]; then
 			rm -rf $TMPDIR/usr

Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- util-linux	22 Jan 2005 21:27:07 -0000	1.32
+++ util-linux	27 Sep 2005 16:20:27 -0000	1.33
@@ -34,7 +34,7 @@
 		fi
 		
 		## (from LFS) GCC-3.4.1 miscompiles sfdisk if the default optimisation level is used. The following command prevents the problematic optimisation pass from being used.
-		#sed -i -e 's%^include ../MCONFIG%&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile
+		sed -i -e 's%^include ../MCONFIG%&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile
 		
 		./configure || exit 1
 		replace_str defines.h "#define ENABLE_NLS" ""