From subversion@balloonboard.org Wed May 14 15:22:45 2008
Received: from localhost ([127.0.0.1] helo=localhost.localdomain)
	by stoneboat.aleph1.co.uk with esmtp (Exim 4.63)
	(envelope-from <subversion@balloonboard.org>) id 1JwHsT-0002Ve-0e
	for balloon-svn@balloonboard.org; Wed, 14 May 2008 15:22:45 +0100
To: balloon-svn@balloonboard.org
From: subversion@balloonboard.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1JwHsT-0002Ve-0e@stoneboat.aleph1.co.uk>
Date: Wed, 14 May 2008 15:22:45 +0100
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: subversion@balloonboard.org
X-SA-Exim-Scanned: No (on stoneboat.aleph1.co.uk);
	SAEximRunCond expanded to false
Subject: [Balloon-svn] r484 - balloon/trunk/kernel
X-BeenThere: balloon-svn@balloonboard.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: <balloon-svn.balloonboard.org>
List-Unsubscribe: <http://balloonboard.org/cgi-bin/mailman/listinfo/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=unsubscribe>
List-Archive: <http://balloonboard.org/lurker/list/balloon-svn.html>
List-Post: <mailto:balloon-svn@balloonboard.org>
List-Help: <mailto:balloon-svn-request@balloonboard.org?subject=help>
List-Subscribe: <http://balloonboard.org/cgi-bin/mailman/listinfo/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=subscribe>
X-List-Received-Date: Wed, 14 May 2008 14:22:45 -0000

Author: wookey
Date: 2008-05-14 15:22:44 +0100 (Wed, 14 May 2008)
New Revision: 484

Modified:
   balloon/trunk/kernel/Makefile
Log:
Add yaffs files using copy not link, because linking and quilt patches
don't get on (quilt fails to keep correct copy of old version)


Modified: balloon/trunk/kernel/Makefile
===================================================================
--- balloon/trunk/kernel/Makefile	2008-05-14 14:19:46 UTC (rev 483)
+++ balloon/trunk/kernel/Makefile	2008-05-14 14:22:44 UTC (rev 484)
@@ -64,10 +64,11 @@
 	touch $(RES)/unpacked-$(KERNVER).stamp 
 
 $(RES)/yaffs-source-$(YAFFSCHECKOUT).stamp: $(RES)/unpacked-$(KERNVER).stamp
-	( cd $(RES) && rm -r yaffs2 && \
+	( cd $(RES) && rm -rf yaffs2 && \
 	(( wget -N $(RELEASESITE)/sources/kernel/yaffs-$(YAFFSCHECKOUT).tar.bz2 && tar --extract --bzip2 --file yaffs-$(YAFFSCHECKOUT).tar.bz2) || \
 	echo "Checking out yaffs2 ($(YAFFSCHECKOUT)) from cvs"; CVSROOT=:pserver:anonymous@cvs.aleph1.co.uk:/home/aleph1/cvs cvs export -f -D "$(YAFFSCHECKOUT)" yaffs2 || test $$? = 2 ))
-	( cd $(RES)/yaffs2 && ./patch-ker.sh l ../linux-$(KERNVER) )
+	( cd $(RES)/yaffs2 && ./patch-ker.sh c ../linux-$(KERNVER) && \
+	cd .. && rm -rf yaffs2)
 	touch $(RES)/yaffs-source-$(YAFFSCHECKOUT).stamp 
 
 #this logic needs to change so that quilt.stamp is time of last quilting