mtd/patches patchin.sh,1.14,1.15

[David Woodhouse]

Update of /home/cvs/mtd/patches
In directory phoenix.infradead.org:/tmp/cvs-serv22705

Modified Files:
	patchin.sh 
Log Message:
Omit jffs1 from patchin, fix dirs without Makefile.common


Index: patchin.sh
===================================================================
RCS file: /home/cvs/mtd/patches/patchin.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- patchin.sh	27 May 2003 09:14:10 -0000	1.14
+++ patchin.sh	12 Jun 2003 09:22:45 -0000	1.15
@@ -23,6 +23,7 @@
 #
 # $Id$
 #
+# 12-06-2003 dwmw2 Leave out JFFS1, do Makefile.common only if it exists.
 # 27-05-2003 dwmw2 Link Makefile to Makefile.common since we moved them around
 # 02-10-2003 tglx replaced grep -m by head -n 1, as older grep versions don't support -m	
 # 03-08-2003 tglx -c option for copying files to kernel tree instead of linking
@@ -42,15 +43,15 @@
 MTD_DIRS="drivers/mtd drivers/mtd/chips drivers/mtd/devices drivers/mtd/maps drivers/mtd/nand include/linux/mtd"
 MTD_FILES="*.[ch] Makefile Rules.make"
 
-# JFFSx files and directories
-FS_DIRS="fs/jffs fs/jffs2"
+# JFFS2 files and directories
+FS_DIRS="fs/jffs2"
 FS_FILES="*.[ch] Makefile Rules.make"
 # kernel version < 2.4.20 needs zlib headers
 FS_INC_BEL2420="jffs*.h workqueue.h z*.h rb*.h"
 # kernel version < 2.5.x
-FS_INC_BEL25="jffs*.h workqueue.h rb*.h"
+FS_INC_BEL25="jffs2*.h workqueue.h rb*.h"
 # kernelversion >= 2.5
-FS_INC_25="jffs*.h"
+FS_INC_25="jffs2*.h"
 FS_INC_DIR="include/linux"
 
 # shared ZLIB patch
@@ -62,7 +63,7 @@
 usage () {
 	echo "usage:  $0 [-c] [-j] kernelpath"
 	echo "-c copy files to kernel tree instead of building links"
-	echo "-j include jffs(2) filesystems" 
+	echo "-j include jffs2 filesystem" 
 	exit 1
 }
 
@@ -76,7 +77,8 @@
 	FILES=`ls $PATCH_FILES 2>/dev/null`
 	for FILE in $FILES 
 	do
-		if [ "$FILE" = "Makefile" ]; then
+		# If there's a Makefile.common it goes in place of Makefile
+		if [ "$FILE" = "Makefile" -a -r $TOPDIR/$DIR/Makefile.common ]; then
 		    SRCFILE=Makefile.common
 		else
 		    SRCFILE=$FILE