[Devil-linux-commit] build/scripts prepare,1.80,1.81

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6787

Modified Files:
	prepare 
Log Message:

- aufs2 fix 
- code style adjustment


Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- prepare	16 Apr 2009 13:57:58 -0000	1.80
+++ prepare	20 Aug 2009 05:28:25 -0000	1.81
@@ -82,19 +82,19 @@
 	if [ "$CONFIG_NFS" == "y" ]; then
 		cat $KERNEL_CONFIG_DIR/config_linux.nfs >> $KERNELDIR/.config || exit 1
 	else 
-		echo "CONFIG_NFS_FS=n" >> $KERNELDIR/.config || exit 1
+		set_kernel_option CONFIG_NFS_FS n
 	fi
 
 	if [ "$CONFIG_NFSD" == "y" ]; then
 		cat $KERNEL_CONFIG_DIR/config_linux.nfsd >> $KERNELDIR/.config || exit 1
 	else 
-		echo "CONFIG_NFSD=n" >> $KERNELDIR/.config || exit 1
+		set_kernel_option CONFIG_NFSD n
 	fi
 
 	if [ "$CONFIG_LINUX_SYSRQ" == "y" ]; then
 		cat $KERNEL_CONFIG_DIR/config_linux.sysrq >> $KERNELDIR/.config || exit 1
 	else 
-		echo "# CONFIG_MAGIC_SYSRQ is not set" >> $KERNELDIR/.config || exit 1
+		set_kernel_option CONFIG_MAGIC_SYSRQ n 
 	fi
 
 
@@ -150,6 +150,7 @@
             if [ ! -f $KERNELDIR/.done_aufs_patch ]; then
                 AUFSDIR=$(find_src_dir aufs2)
                 patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs2-standalone/aufs2-standalone.patch || exit 1
+                patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs2-standalone/aufs2-kbuild.patch || exit 1
                 cp -dpvR ${AUFSDIR}/aufs2-standalone/{fs,Documentation,include} $KERNELDIR/ || exit 1
                 touch $KERNELDIR/.done_aufs_patch
             fi
@@ -162,6 +163,7 @@
 	    set_kernel_option CONFIG_AUFS_BRANCH_MAX_32767 n
 	    set_kernel_option CONFIG_AUFS_EXPORT n
 	    set_kernel_option CONFIG_AUFS_BR_RAMFS n
+	    set_kernel_option CONFIG_AUFS_SHWH n
 	fi
 	
 	# make sure all netfilter modules are enabled