diff options
Diffstat (limited to 'openembedded/conf')
| -rw-r--r-- | openembedded/conf/distro/familiar-0.8.3.conf | 22 | ||||
| -rw-r--r-- | openembedded/conf/distro/familiar-distro.conf (renamed from openembedded/conf/distro/familiar.conf) | 0 | ||||
| -rw-r--r-- | openembedded/conf/distro/preferred-gpe-versions-2.7.inc | 18 | ||||
| -rw-r--r-- | openembedded/conf/machine/ipaq-pxa270.conf | 28 | ||||
| -rw-r--r-- | openembedded/conf/machine/nokia770.conf | 2 | ||||
| -rw-r--r-- | openembedded/conf/machine/zaurus-clamshell-2.6.conf | 8 |
6 files changed, 55 insertions, 23 deletions
diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf index e26468cff..475117ceb 100644 --- a/openembedded/conf/distro/familiar-0.8.3.conf +++ b/openembedded/conf/distro/familiar-0.8.3.conf @@ -1,4 +1,4 @@ -include conf/distro/familiar.conf +include conf/distro/familiar-distro.conf DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" @@ -17,13 +17,18 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_PROVIDER_virtual/libiconv=glibc +PREFERRED_PROVIDER_virtual/libintl=glibc +PREFERRED_PROVIDER_x11=diet-x11 + +PREFERRED_VERSION_hostap-modules ?= "0.3.9 # The CSL compiler is unusable because # 1) certain programs stop to compile # 2) more programs segfault -PREFERRED_VERSION_gcc = "3.4.4" -PREFERRED_VERSION_gcc-cross = "3.4.4" -PREFERRED_VERSION_gcc-cross-initial = "3.4.4" +PREFERRED_VERSION_gcc ?= "3.4.4" +PREFERRED_VERSION_gcc-cross ?= "3.4.4" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" # # Opie @@ -41,12 +46,17 @@ include conf/distro/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -#PREFERRED_PROVIDER_x11 = "diet-x11" +PREFERRED_PROVIDER_x11 = "diet-x11" include conf/distro/preferred-gpe-versions-2.7.inc # # E # -include conf/distro/preferred-e-versions.inc + + +#23:57 < mickeyl> it's no longer necessary since our cleanup +#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it + +#include conf/distro/preferred-e-versions.inc diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar-distro.conf index 497ba6a89..497ba6a89 100644 --- a/openembedded/conf/distro/familiar.conf +++ b/openembedded/conf/distro/familiar-distro.conf diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc index 2d64cf2b8..5919f351f 100644 --- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc +++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc @@ -33,22 +33,23 @@ PREFERRED_VERSION_xproto ?= "6.6.2" PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" -PREFERRED_VERSION_xst ?= "0.14" +PREFERRED_VERSION_xst ?= "0.15" #PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xhost ?= "0.0cvs20040413" PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_gpe-login ?= "0.81" -PREFERRED_VERSION_gpe-session-scripts ?= "0.63" +PREFERRED_VERSION_gpe-login ?= "0.82" +PREFERRED_VERSION_gpe-session-scripts ?= "0.66" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-todo ?= "0.54" -PREFERRED_VERSION_gpe-calendar ?= "0.63" +PREFERRED_VERSION_gpe-calendar ?= "0.65" PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" -PREFERRED_VERSION_gpe-contacts ?= "0.41" -PREFERRED_VERSION_gpe-today ?= "0.08" +PREFERRED_VERSION_gpe-contacts ?= "0.42" +PREFERRED_VERSION_gpe-today ?= "0.09" PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" PREFERRED_VERSION_dbus ?= "0.23.4" -PREFERRED_VERSION_gpe-bluetooth ?= "0.43" +PREFERRED_VERSION_gpe-beam ?= "0.2.8" +PREFERRED_VERSION_gpe-bluetooth ?= "0.44" PREFERRED_VERSION_gpe-su ?= "0.18" PREFERRED_VERSION_gpe-conf ?= "0.1.25" PREFERRED_VERSION_gpe-clock ?= "0.21" @@ -85,4 +86,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" +PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1" +PREFERRED_VERSION_poppler ?= "0.3.3" +PREFERRED_VERSION_evince ?= "0.3.2" PREFERRED_VERSION_gpe_mini_browser ?= "0.15" diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf index 9e1b677ec..0565b897b 100644 --- a/openembedded/conf/machine/ipaq-pxa270.conf +++ b/openembedded/conf/machine/ipaq-pxa270.conf @@ -9,12 +9,14 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" PREFERRED_VERSION_orinoco-modules = "0.15rc1" BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools" +BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools" +BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" -PXA270_MODULES = "g_ether pxa27x_udc" +PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \ + snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ + nls_cp437 nls_utf8" SERIAL_CONSOLE = "115200 ttyS0" @@ -29,5 +31,21 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince" include conf/machine/tune-xscale.conf BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" -HX4700_MODULES = "asic3_base asic3_mmc hx4700_bt hx4700_core hx4700_leds hx4700_navpt hx4700_pcmcia \ - hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700" +HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ + hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power" + +module_autoload_hx4700_power = "hx4700_power" +module_autoload_pcmcia = "pcmcia" +module_autoload_hx4700_pcmcia = "hx4700_pcmcia" +module_autoload_asic3_mmc = "asic3_mmc" +module_autoload_mmc_block = "mmc_block" +module_autoload_hx4700_ts = "hx4700_ts" +module_autoload_hx4700_navpt = "hx4700_navpt" +module_autoload_hx4700_bt = "hx4700_bt" +module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700" +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-pcm-oss = "snd-mixer-oss" +module_autoload_pxa27x_udc = "pxa27x_udc" + +#FIXME: this should be controlled by a userspace utility later. +module_autoload_g_ether = "g_ether" diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf index 253f8a43e..8b657281c 100644 --- a/openembedded/conf/machine/nokia770.conf +++ b/openembedded/conf/machine/nokia770.conf @@ -15,7 +15,7 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib" 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/tune-arm926ejs.conf +include conf/machine/tune-arm926ejs.conf #size of the root partition (yes, it is 123 MB) diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/zaurus-clamshell-2.6.conf index b3e0a50bc..516b07ee1 100644 --- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf +++ b/openembedded/conf/machine/zaurus-clamshell-2.6.conf @@ -27,10 +27,10 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" # Infrared Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm -# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ + kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" # USB Gadget Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ -# kernel-module-g-serial kernel-module-g-ether" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ + kernel-module-g-serial kernel-module-g-ether" |