aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2009-12-02 15:31:52 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2009-12-02 15:31:52 +0100
commitbbdfdf6df16e21154c73aab15cba26d08c02c607 (patch)
tree27adf9611f0cc9ca8f9ccdbee4c2a75928d8e677 /contrib
parent6e828d35a1baf89a736d4258d710709a575607a8 (diff)
parent3279b16db4e43578a098bc7c60a4d73f4fdcdc35 (diff)
downloadopenembedded-bbdfdf6df16e21154c73aab15cba26d08c02c607.tar.gz
Merge branch 'org.openembedded.dev' into shr/merge
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/angstrom/build-feeds.sh8
-rwxr-xr-xcontrib/angstrom/sort.sh4
2 files changed, 9 insertions, 3 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index ea869459e9..10c9d45f99 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -120,8 +120,9 @@ do
empathy \
epdfview \
epiphany \
- eve \
evince \
+ exalt \
+ exalt-client \
exo \
fakeroot \
fennec \
@@ -157,6 +158,7 @@ do
geda-utils \
gimp \
glider \
+ gksu \
gmp \
gmpc \
gnome-games \
@@ -191,6 +193,7 @@ do
iaimaster \
icebloxx \
imagemagick \
+ inkscape \
inkwp \
ioquake3 \
ipaq-sleep \
@@ -260,6 +263,7 @@ do
pavucontrol \
palantir \
pairs \
+ paprefs \
pciutils \
pdamaze \
perl \
@@ -299,6 +303,7 @@ do
screen \
scummvm \
sdlquake \
+ sdrshell \
sensors-applet \
setserial \
shisensho \
@@ -349,6 +354,7 @@ do
wt \
wt3 \
x11vnc \
+ xclip \
xf86-input-evdev \
xf86-input-evtouch \
xf86-input-keyboard \
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index a84a206939..e372d45afc 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -48,13 +48,13 @@ case "$arch" in
"armv4t")
machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
"armv5te")
- machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone" ;;
+ machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone" ;;
"armv5teb")
machines="ixp4xxbe nslu2be" ;;
"armv6-novfp")
machines="htcdiamond htckaiser htcpolaris htcraphael htcvogue" ;;
"armv6")
- machines="bug mx31ads nokia800 " ;;
+ machines="smartq5 bug mx31ads nokia800 " ;;
"armv7")
machines="" ;;
"armv7a")