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 1ae7086..37d8c9a 100644 (file)
--- 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 2ce6dc4..1c64aa5 100755 (executable)
--- 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