summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-04-23 08:35:57 +0200
committerKoen Kooi <koen@openembedded.org>2009-04-23 08:35:57 +0200
commit8f6996cef591593fc5347d7643f651cf50d20e89 (patch)
treeafef04389edc5f5f76545767e4ac0ae5f513d974
parent971539b2bb254a571d6842bd677bf8e53c70be2f (diff)
patchword apply helper: use git-am -s and remove file when done
-rw-r--r--contrib/angstrom/upload-packages.sh2
-rwxr-xr-xcontrib/patchwork/pw-am.sh3
2 files changed, 3 insertions, 2 deletions
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