diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-03 12:43:06 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-03 12:43:06 +0100 |
| commit | a3bc04cdffd1ee77c73835b51c8d12120010fba8 (patch) | |
| tree | bce6612ca5bcf758b6bda3955dfc362372462a7d /contrib | |
| parent | 3262724e9c338d5ebfe8c09042e639e71b74f4c6 (diff) | |
| parent | 55331de7302867eda6b4af59907ec1ec243f099b (diff) | |
| download | openembedded-a3bc04cdffd1ee77c73835b51c8d12120010fba8.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/merge
Conflicts:
conf/checksums.ini
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/angstrom/build-feeds.sh | 2 | ||||
| -rwxr-xr-x | contrib/angstrom/sort.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 38f2c365cf..6760a5dff6 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -70,7 +70,7 @@ fi for machine in ${ARCH_MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free iso-codes python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS=" \ abiword \ aircrack-ng \ diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index 1e787a4ffa..758fee9acd 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -33,7 +33,7 @@ echo "Removing duplicate packages in unsorted" cat files-duplicate | xargs rm -f # Log remaining packages to a file -find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v angstrom-version | grep -v locale > new-files.txt +find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v -- -static | grep -v angstrom-version | grep -v locale > new-files.txt for newfile in $(cat new-files.txt | sed s:./::g) ; do echo "$(date -u +%s) $newfile $(basename ${PWD})" >> ../upload-full.txt done |