From: Koen Kooi <koen@openembedded.org>
Date: Thu, 23 Apr 2009 06:35:57 +0000 (+0200)
Subject: patchword apply helper: use git-am -s and remove file when done
X-Git-Tag: Release-2010-05/1~3701^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f6996cef591593fc5347d7643f651cf50d20e89;p=openembedded.git

patchword apply helper: use git-am -s and remove file when done
---

diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
index 1ae7086cab..37d8c9ac9b 100644
--- a/contrib/angstrom/upload-packages.sh
+++ b/contrib/angstrom/upload-packages.sh
@@ -32,7 +32,7 @@ cat files-remote files-local | sort | uniq -u >files-uniq
 cat files-uniq files-local | sort | uniq -d > files-trans
 
 # Remove SGX files
-rm -f upload-queue/*3.00.*
+rm -f upload-queue/ti*codec* upload-queue/*3.00.*
 
 # Copy over non-duplicate files
 echo "Starting rsync..."
diff --git a/contrib/patchwork/pw-am.sh b/contrib/patchwork/pw-am.sh
index 2ce6dc4066..1c64aa5d64 100755
--- a/contrib/patchwork/pw-am.sh
+++ b/contrib/patchwork/pw-am.sh
@@ -10,5 +10,6 @@
 for patchnumber in $@;
 do
 	wget -nv http://patchwork.openembedded.org/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch
-	git am pw-am-$patchnumber.patch
+	git am -s pw-am-$patchnumber.patch
+	rm pw-am-$patchnumber.patch
 done