mtd/patches patchin.sh,1.19,1.20

[havasi at infradead.org]

Update of /home/cvs/mtd/patches
In directory phoenix.infradead.org:/home/havasi/mtd/patches

Modified Files:
	patchin.sh 
Log Message:
BBC core patch:
- new compressor interface
- 3 compression mode: none, priority, size
- compressors can be selected via kconfig





Index: patchin.sh
===================================================================
RCS file: /home/cvs/mtd/patches/patchin.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- patchin.sh	5 May 2004 20:42:55 -0000	1.19
+++ patchin.sh	25 May 2004 11:12:41 -0000	1.20
@@ -23,6 +23,7 @@
 #
 # $Id$
 #
+# 24-05-2004 havasi Patch fs/Kconfig
 # 05-05-2004 tglx Include include/mtd
 # 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
@@ -241,7 +242,17 @@
 				rm -f include/linux/crc32.h
 				$LNCP $TOPDIR/fs/jffs2/crc32.h include/linux
 			fi
-		fi
+		
+                else
+			JFFS=`grep -n JFFS fs/Kconfig | head -n 1 | sed s/:.*//`
+			CRAMFS=`grep -n CRAMFS fs/Kconfig | head -n 1 | sed s/:.*//`
+			let JFFS=JFFS-1
+			let CRAMFS=CRAMFS-1
+			sed "$JFFS"q fs/Kconfig >Kconfig.tmp
+			cat $TOPDIR/fs/Kconfig >>Kconfig.tmp
+			sed 1,"$CRAMFS"d fs/Kconfig >>Kconfig.tmp
+			mv -f Kconfig.tmp fs/Kconfig
+                fi
 	fi
 fi