diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-08 17:26:37 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-08 17:26:37 +0100 |
| commit | a8b6b23b105e4783b50372dac18e0f580d370d30 (patch) | |
| tree | 7fc19abcd814b1d2a96b1ab4ab4bb3379289f44c /contrib | |
| parent | 5ca1756001dcf0464b167ba07986438f89604787 (diff) | |
| parent | 5ef8dc482d56fdf0c59d9ce0eed32088611d491a (diff) | |
| download | openembedded-a8b6b23b105e4783b50372dac18e0f580d370d30.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/merge
Conflicts:
conf/checksums.ini
recipes/vala/vala-native_0.7.8.bb
recipes/vala/vala_0.7.8.bb
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/angstrom/upload-packages.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 3978e8778f..5f33b46090 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # MIT Licensed # Initial version by Graeme 'XorA' Gregory, Further changes by Koen Kooi @@ -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/bigbuck* upload-queue/*libgles* upload-queue/*3.00.* +rm -f upload-queue/bigbuck* upload-queue/*libgles* upload-queue/*kdrive*sgx* upload-queue/*3.00.* # Copy over non-duplicate files echo "Starting rsync..." |