diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-10-24 11:40:11 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-10-24 11:40:11 +0000 |
| commit | 96839cb854eda459f0f6d05bc87a10e45856c17a (patch) | |
| tree | 9b7f3d7c6148a796089ccd0edda99a7851e8425a /conf | |
| parent | df75d5f83cb51b2a9fcf6c2be39972122c7c9726 (diff) | |
| parent | f42cfc355402f3d080706db20addfd4c06125694 (diff) | |
merge of '4447992dd58cf24ab0fb99dba811074b21c6aa2e'
and '978814b6112fa21afb021154c869d766d3db1175'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2007-preferred-versions.inc | 5 | ||||
| -rw-r--r-- | conf/machine/dht-walnut.conf | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 81b64d4668..36c9d33ffb 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1286,6 +1286,10 @@ sha256=025655971eef7f76ece9754346d6eb4e2dd44ddf569c4c84de27836aa24b04a3 md5=9519eccf0638c9962f73a7b20da77e0e sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883 +[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz] +md5=70b729dd5dd8b2b432d685918e1971f1 +sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963 + [ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz] md5=1f0193358e92559ec0f598b09ccbc0ec sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332 diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 61560e3c44..d750536822 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -326,6 +326,7 @@ PREFERRED_VERSION_eventlog ?= "0.2.5" PREFERRED_VERSION_evieext ?= "1.0.2" PREFERRED_VERSION_evince ?= "2.20.0" PREFERRED_VERSION_exiv2 ?= "0.15" +PREFERRED_VERSION_exmap-console ?= "0.4.1" PREFERRED_VERSION_exml ?= "cvs" PREFERRED_VERSION_exo ?= "0.3.2" PREFERRED_VERSION_expat ?= "2.0.0" @@ -1616,7 +1617,7 @@ PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6" PREFERRED_VERSION_qsvn ?= "0.3.0" PREFERRED_VERSION_qt-x11-free ?= "3.3.7" PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5" -PREFERRED_VERSION_qt4-x11-free ?= "4.3.0" +PREFERRED_VERSION_qt4-x11-free ?= "4.3.2" PREFERRED_VERSION_qtplot ?= "0.2" PREFERRED_VERSION_quagga ?= "0.99.8" PREFERRED_VERSION_quake1 ?= "0.0.1" @@ -1892,7 +1893,7 @@ PREFERRED_VERSION_udhcp ?= "0.9.8" PREFERRED_VERSION_ufraw ?= "0.12" PREFERRED_VERSION_uicmoc-native ?= "2.3.10" PREFERRED_VERSION_uicmoc3-native ?= "3.3.5" -PREFERRED_VERSION_uicmoc4-native ?= "4.3.1" +PREFERRED_VERSION_uicmoc4-native ?= "4.3.2" PREFERRED_VERSION_uim ?= "1.3.1" PREFERRED_VERSION_uim-native ?= "1.3.1" PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index c31aecd550..fe8f549221 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -13,7 +13,7 @@ UBOOT_ENTRYPOINT = "0" MACHINE_FEATURES = "kernel26 ext2" TARGET_CPU = "405" -OLDEST_KERNEL = "2.6.18" +TARGET_FPU = "soft" #don't try to access tty1 USE_VT = "0" |