diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-04 13:02:31 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-04 13:02:31 +0100 |
| commit | 1b6e21c5f37f5339732382fcd04c3fc5504ad126 (patch) | |
| tree | 7dbfbe5e6ad131e6bb59860f269dcdfa291d13f5 /contrib | |
| parent | b7c9855c7ece03a0876c0d50922f908b65c5f095 (diff) | |
| parent | 2f0ed0594046903fb8033852e05a0de6b1f02914 (diff) | |
| download | openembedded-1b6e21c5f37f5339732382fcd04c3fc5504ad126.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/merge
Conflicts:
recipes/eject/eject_2.1.5.bb
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/angstrom/build-feeds.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 6760a5dff6..7f3dff0dd3 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 iso-codes python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free iso-codes perl perl-native python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS=" \ abiword \ aircrack-ng \ |