diff options
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 5 | ||||
| -rw-r--r-- | conf/machine/nokia770.conf | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index ce11ddf08c..4159d99962 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -59,10 +59,13 @@ PREFERRED_VERSION_glibc ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.4" + + PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" PREFERRED_VERSION_dbus = "0.61" - +PREFERRED_VERSION_gstreamer = "0.10.4" +PREFERRED_PROVIDER_hostap-conf = "hostap-conf" #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 44cb860fc9..bc15823f26 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -11,7 +11,6 @@ XSERVER = "xserver-kdrive-omap" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-arm926ejs.conf @@ -30,7 +29,7 @@ SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ -${PCMCIA_MANAGER} apm ppp wireless-tools console-tools" + apm ppp wireless-tools console-tools" # NFS Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" @@ -52,5 +51,4 @@ ${PCMCIA_MANAGER} apm ppp wireless-tools console-tools" ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -include conf/machine/include/handheld-common.conf |