[Devil-linux-commit] build/scripts util-linux,1.25,1.26

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

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

Modified Files:
	util-linux 
Log Message:
we need the patch for loop-aes, so let's put it back in


Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- util-linux	6 Sep 2004 20:31:33 -0000	1.25
+++ util-linux	8 Sep 2004 01:02:36 -0000	1.26
@@ -27,15 +27,15 @@
     build )
 		disable_et_dyn
 		#test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
-		#if [ ! -f util-linux-patch.done ]; then
-		#	if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
-		#	   echo "patch 2.4 "
-		#	   bzcat $SRCDIR/util-linux-2.12.diff.bz2 | patch -p1 || exit 1
-		#	fi
+		if [ ! -f util-linux-patch.done ]; then
+			#if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+			   echo "patch 2.4 "
+			   bzcat $SRCDIR/util-linux-2.12b.diff.bz2 | patch -p1 || exit 1
+			#fi
 		#	echo "patch for adding kernel 2.6 support"
 		#	bzcat $SRCDIR/util-linux-2.12-kernel-2.6.patch.bz2 | patch -p1 || exit 1
-		#	touch util-linux-patch.done
-		#fi
+			touch util-linux-patch.done
+		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