[Devil-linux-commit] build/scripts aufs, 1.3, 1.4 prepare, 1.76, 1.77 unionfs, 1.5, 1.6

[Bruce S. <bl...@us...>]

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

Modified Files:
	aufs prepare unionfs 
Log Message:
made AUFS or UnionFS selectable in menuconfig (bs)
(but not both due to conflict between the two)

Increased DL version to 1.3.6 to correspond with kernel 2.6.25 upgrade



Index: aufs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/aufs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- aufs	23 May 2008 19:03:50 -0000	1.3
+++ aufs	30 May 2008 13:46:20 -0000	1.4
@@ -26,14 +26,18 @@
 
 case $1 in
 	build )
-		make CONFIG_AUFS_FAKE_DM= CONFIG_AUFS_SYSAUFS= CONFIG_AUFS_STAT=y CONFIG_AUFS_MAGIC_SYSRQ= KDIR=$KERNELDIR SUBLEVEL=25 -f local.mk || exit 1
+		if [ "$CONFIG_ETCFS" = "AUFS" ]; then
+			make CONFIG_AUFS_FAKE_DM= CONFIG_AUFS_SYSAUFS= CONFIG_AUFS_STAT=y CONFIG_AUFS_MAGIC_SYSRQ= KDIR=$KERNELDIR SUBLEVEL=25 -f local.mk || exit 1
+		fi
 	        ;;
 
 	install )
-		mkdir -p $CDDIR/lib/modules/$KERNELVERSION/kernel/fs/aufs/ || exit 1
-		cp -v fs/aufs25/aufs.ko $CDDIR/lib/modules/$KERNELVERSION/kernel/fs/aufs/ || exit 1
-		cp -v util/aufind.sh util/aulchown util/auplink util/mount.aufs util/umount.aufs $CDDIR/sbin/ || exit 1
-		cp -v util/aufs.5 $CDDIR/usr/share/man/man5/ || exit 1
+		if [ "$CONFIG_ETCFS" = "AUFS" ]; then
+			mkdir -p $CDDIR/lib/modules/$KERNELVERSION/kernel/fs/aufs/ || exit 1
+			cp -v fs/aufs25/aufs.ko $CDDIR/lib/modules/$KERNELVERSION/kernel/fs/aufs/ || exit 1
+			cp -v util/aufind.sh util/aulchown util/auplink util/mount.aufs util/umount.aufs $CDDIR/sbin/ || exit 1
+			cp -v util/aufs.5 $CDDIR/usr/share/man/man5/ || exit 1
+		fi
 		;;
 
 	* )

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- prepare	16 Apr 2008 13:25:17 -0000	1.76
+++ prepare	30 May 2008 13:46:20 -0000	1.77
@@ -93,13 +93,14 @@
 		echo "# CONFIG_MAGIC_SYSRQ is not set" >> $KERNELDIR/.config || exit 1
 	fi
 
-	if [ "$CONFIG_UNIONFS" == "y" ]; then
+
+	if [ "$CONFIG_ETCFS" = "UnionFS" ]; then
 		cat $KERNEL_CONFIG_DIR/config_linux.unionfs >> $KERNELDIR/.config || exit 1
 	fi
 
 	pushd $KERNELDIR > /dev/null
 
-	if [ "$CONFIG_UNIONFS" == "y" ]; then
+	if [ "$CONFIG_ETCFS" = "UnionFS" ]; then
 		if [ ! -f devil-linux-unionfs-kernel-patches.done ]; then
 		    touch devil-linux-unionfs-kernel-patches.done
 		    zcat $SRCDIR/unionfs-*_for_2.6.*.diff.gz | patch -p1 || exit 1

Index: unionfs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/unionfs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- unionfs	10 Apr 2008 13:39:22 -0000	1.5
+++ unionfs	30 May 2008 13:46:20 -0000	1.6
@@ -26,7 +26,7 @@
 case $1 in
 
 	install )
-		if [ "$CONFIG_UNIONFS" = "y" ]; then
+		if [ "$CONFIG_ETCFS" = "UnionFS" ]; then
 			cp -dpR $KERNELDIR/Documentation/filesystems/unionfs $DOCDIR || exit 1
 		fi
 		;;