aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2009-11-25 12:51:29 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2009-11-25 12:51:29 +0100
commitfbf5d6fffe8aa8e8c12eb5b7efb3babdcd4afdbd (patch)
tree25f83773418a7061122fd11fff3f69d2984d8001 /contrib
parent9add11d42376c9f42981bad537f6dbb85625693a (diff)
parent5a38714e504f72f1110a053c5abb9fdbf36a9670 (diff)
downloadopenembedded-fbf5d6fffe8aa8e8c12eb5b7efb3babdcd4afdbd.tar.gz
navit: resolve merging current navit from OE.dev branch
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/angstrom/build-feeds.sh4
-rwxr-xr-xcontrib/angstrom/sort.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 7f3dff0dd3..ea869459e9 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -78,12 +78,14 @@ do
angstrom-zeroconf-audio \
apache2 \
artoolkit \
+ asciidoc \
asterisk \
atomic \
autoconf \
automake \
binutils \
bison \
+ blueman \
bluez-gnome \
bluez-hcidump \
boa \
@@ -118,6 +120,7 @@ do
empathy \
epdfview \
epiphany \
+ eve \
evince \
exo \
fakeroot \
@@ -245,6 +248,7 @@ do
ntfs-3g \
numptyphysics \
octave \
+ openbox \
opencv \
opencv-samples \
openmoko-browser2 \
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 758fee9acd..a84a206939 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -48,7 +48,7 @@ case "$arch" in
"armv4t")
machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
"armv5te")
- machines="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 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")