summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@koansoftware.com>2009-03-26 11:10:03 +0100
committerMarcin Juszkiewicz <hrw@koansoftware.com>2009-03-26 11:10:03 +0100
commita7be854977d7ad7c8460fee76739db8154e83049 (patch)
tree3696192bc8abcae8ce4e0121df2dd4e5246541df /conf
parente2718269c5f56774705478545316a879f0be82c4 (diff)
parent1b045e71ce7c3b7ed6c68ae1d60e974edbe38efc (diff)
downloadopenembedded-a7be854977d7ad7c8460fee76739db8154e83049.tar.gz
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini8
-rw-r--r--conf/machine/include/zaurus-2.6.inc1
2 files changed, 9 insertions, 0 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index c9a2e6c0f8..cc8da277db 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -778,6 +778,10 @@ sha256=0f8f39a3c78a0d0ec947da1c19c7f8ecb41123755ff2bc31795a77946280f627
md5=3b3d8397c2c9a58fc59a90e2b49c651a
sha256=dd60bc66b1627d3cbd0950499017dfd57a0705bb12493bb0de2a7b9b5c0873bc
+[http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-0.9.8.5.tar.gz]
+md5=3b3d8397c2c9a58fc59a90e2b49c651a
+sha256=dd60bc66b1627d3cbd0950499017dfd57a0705bb12493bb0de2a7b9b5c0873bc
+
[http://downloads.sourceforge.net/pyro/Pyro-3.8.1.tar.gz]
md5=8ab110b43f891c9664628133753c903a
sha256=d9e8073c7abb0fd9a94ec72c48f5bf4673de8e9333082dce6954d18a2fe35efd
@@ -10062,6 +10066,10 @@ sha256=f4754629eb70a63e9774ac97ebd28f3dea22fb5b422dd43d02ab5053d37ca61c
md5=ed669d96346dfc7d9f9fad079731853f
sha256=a99908d5765757ad6025b57d5ecf43b412aaaaf2ca379c02aafa33ca5c9d35c1
+[http://hostap.epitest.fi/releases/hostapd-0.6.9.tar.gz]
+md5=83630d11fa66ade9091f1b304fccd74c
+sha256=4430fe2c7a2176c6890ac3a726a8b3d234a77beb3ca987b4349c467331343e67
+
[http://kernel.org//pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz]
md5=167bd479a1ca30243c51ca088e0942b3
sha256=397e06eefc4639342e9f650cc47336ebc8c86a37fdcd9b857e55f99d37d8da9f
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index aeba16b67c..29f21c4f56 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -16,6 +16,7 @@ EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"