diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-26 15:24:42 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-26 15:24:42 +0000 |
| commit | 4fff0972a20b9feaa6f4a07bdfe41c8240f36d6b (patch) | |
| tree | 8d9d1f3112826a01b1fd418324d2933173d57b51 /conf | |
| parent | d74072ae1a442e741728ececa6f91442df5e53bf (diff) | |
| parent | b8f3e4844b685d8c7b395333672f53b23cf10b3d (diff) | |
merge of '363edf7af76f2d2fcd09d314641bad256b866264'
and 'e0812b867aee310381150ec8e2be57aab30190a6'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 10 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2007-preferred-versions.inc | 4 | ||||
| -rw-r--r-- | conf/machine/dht-walnut.conf | 1 |
4 files changed, 11 insertions, 6 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 76eacce219..eadb6a09a9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9446,13 +9446,17 @@ sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b md5=8012acea71b35c18247bd92c4721589d sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.3.3.tar.gz] +md5=19678fe35170559cd6a6fa531c57799c +sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 + [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz] 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.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz] +md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f +sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d [http://keepcool.kf.tu-berlin.de/public/mitarbeiter/sadowski/qtopia-squeak-3.4-2_patched.tar.gz] md5=0e2bab65b62784d8714057624373f70d diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index f36ae8c6fe..80f1512acf 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -7,7 +7,7 @@ #@-------------------------------------------------------------------- # The release will the 2007.12 -DISTRO_VERSION = "2007.11RC2.1" +DISTRO_VERSION = "2007.11RC3" DISTRO_REVISION = "51" require conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index ffb5380a14..97fed90f21 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1616,7 +1616,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.2" +PREFERRED_VERSION_qt4-x11-free ?= "4.3.3" PREFERRED_VERSION_qtplot ?= "0.2" PREFERRED_VERSION_quagga ?= "0.99.8" PREFERRED_VERSION_quake1 ?= "0.0.1" @@ -1893,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.2" +PREFERRED_VERSION_uicmoc4-native ?= "4.3.3" 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 a8a2d60c17..6eeb08825b 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -20,6 +20,7 @@ USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_VERSION_u-boot = "1.1.4" +KERNEL_IMAGETYPE = "uImage" #tune for the 405 cpu require conf/machine/include/tune-ppc405.inc |