From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 15 Feb 2011 17:16:27 +0000 (-0800)
Subject: c2p updates
X-Git-Tag: v2.6.36.4~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4aa5ba686e9d532807101ee038902aaf8fbfe952;p=thirdparty%2Fkernel%2Fstable-queue.git

c2p updates
---

diff --git a/scripts/c2p b/scripts/c2p
index d0398edce71..6a64ef127c9 100755
--- a/scripts/c2p
+++ b/scripts/c2p
@@ -13,11 +13,17 @@ my $git_id;
 my $header_complete = "false";
 my $tmpfile;
 
+$numArgs = $#ARGV + 1;
+if ($numArgs != 1) {
+	print "must provide git id\n";
+	exit;
+}
+
 $base_id = shift;
 
 if ($base_id eq "") {
 	print "must provide git id\n";
-	die;
+	exit;
 }
 
 #print "handing commit id $base_id\n";
@@ -54,10 +60,15 @@ close FILE;
 #print "$tmpfile\n";
 
 system "vim $tmpfile";
+system "reset";
 $new_file = `rename-patch $tmpfile`;
 chomp($new_file);
 system "mv $new_file ~/linux/stable/";
-print "moved $new_file to ~/linux/stable/\n"
+#print "moved $new_file to ~/linux/stable/\n";
+
+system "cd ~/linux/stable && ./apply_it $new_file";
+system "cp ~/linux/stable/$new_file ~/linux/longterm";
+system "cd ~/linux/longterm && ./apply_it $new_file";
 
 #TMPFILE1=`mktemp patch.XXXXXX` || exit 1
 #TMPFILE2=`mktemp patch.XXXXXX` || exit 1