mtd/patches patchin.sh,1.22,1.23

[dmarlin at infradead.org]

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

Modified Files:
	patchin.sh 
Log Message:
Updated to allow a build from a 2.4.24 kernel tree.


Index: patchin.sh
===================================================================
RCS file: /home/cvs/mtd/patches/patchin.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- patchin.sh	14 Jul 2004 09:09:24 -0000	1.22
+++ patchin.sh	9 Aug 2004 18:46:05 -0000	1.23
@@ -91,7 +91,13 @@
 	do
 		# 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
+		    if test $PATCHLEVEL -lt 5; then
+			rm -f $LINUXDIR/$DIR/Makefile.common 2>/dev/null
+			$LNCP $TOPDIR/$DIR/Makefile.common $LINUXDIR/$DIR/Makefile.common
+			SRCFILE=Makefile.24
+		    else
+			SRCFILE=Makefile.common
+		    fi
 		else
 		    SRCFILE=$FILE
 		fi
@@ -286,6 +292,14 @@
 
 echo "Patching done"
 
+# some BUG() definitions were moved to asm/bug.h in the 2.5 kernels
+#  so fake having one to avoid build errors.
+if test $PATCHLEVEL -lt 5; then
+	if [ ! -r $LINUXDIR/include/asm/bug.h ]; then
+		touch $LINUXDIR/include/asm/bug.h
+	fi
+fi
+
 if test $PATCHLEVEL -lt 5
 then 
 	# FIXME: SED/AWK experts should know how to do it automagic