diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-02-17 00:08:13 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-02-17 00:08:13 +0000 |
| commit | dbe83e6e21f5fc8124619a1cea63a23ed40f9b47 (patch) | |
| tree | 87c8468cab50a6bdd4e4348a1ede9341c11977ab | |
| parent | 1f28e22242c82fe1ba1c4ad8514dd682fc732bc9 (diff) | |
| parent | c0598cc6a75b29de02a39f0a4fd7c4979dde6a9b (diff) | |
merge of '2cea807f786ead2b5e28b2227fcc8a96752158ef'
and 'dc26b71fb757ec4210a3a5f0e819b6e76036ac61'
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/collie-2.4.conf | 3 | ||||
| -rw-r--r-- | packages/linux/collie-kernels-2.4-embedix.bb | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 55c0e51295..f9abebf291 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -320,7 +320,7 @@ export palmqtdir = "/opt/QtPalmtop" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" -SOURCEFORGE_MIRROR = "http://surfnet.dl.sourceforge.net" +SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net" GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download/gpephone" GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf index 0412ea359a..a77d12a53f 100644 --- a/conf/machine/include/collie-2.4.conf +++ b/conf/machine/include/collie-2.4.conf @@ -1,5 +1,8 @@ PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix" +# workaround for bug 1877 +PREFERRED_PROVIDER_hostap-modules = "hostap-modules" + SERIAL_CONSOLE = "115200 ttyS0" # # no keyboard feature because 2.4 kernel keymap works ok and we have limited flash diff --git a/packages/linux/collie-kernels-2.4-embedix.bb b/packages/linux/collie-kernels-2.4-embedix.bb index f53e86f6c4..022aca9ff8 100644 --- a/packages/linux/collie-kernels-2.4-embedix.bb +++ b/packages/linux/collie-kernels-2.4-embedix.bb @@ -6,7 +6,7 @@ PR = "r2" COMPATIBLE_HOST = "arm.*-linux" -DEPENDS = '${@base_conditional("DISTRO_TYPE", "debug", "openzaurus-sa", "collie-kernel-24-8 collie-kernel-32-0 collie-kernel-32-32 collie-kernel-40-24 collie-kernel-48-16 collie-kernel-58-6 collie-kernel-64-0",d)}' +DEPENDS = '${@base_conditional("DISTRO_TYPE", "debug", "openzaurus-sa", "collie-kernel-64-0 collie-kernel-24-8 collie-kernel-32-0 collie-kernel-32-32 collie-kernel-40-24 collie-kernel-48-16 collie-kernel-58-6",d)}' PACKAGES = "" EXCLUDE_FROM_WORLD = "1" |