diff options
author | Richard Purdie <richard@openedhand.com> | 2005-09-05 12:16:56 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-09-05 12:16:56 +0000 |
commit | 3e846ba477aef514313450d4dba343e097be1418 (patch) | |
tree | efc621e3b343883a8e4e79a63eb974257fe69707 /openembedded/conf | |
parent | c49400dab0dbfd43842fcf6bdfc59937f4c0afe6 (diff) | |
download | poky-3e846ba477aef514313450d4dba343e097be1418.tar.gz |
Updates against mainline openembedded + removal of some unneeded files
git-svn-id: https://svn.o-hand.com/repos/poky@19 311d38ba-8fff-0310-9ca6-ca027cbcb966
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 e26468cff3..475117ceba 100644 --- a/openembedded/conf/distro/familiar-0.8.3.conf +++ b/openembedded/conf/distro/familiar-0.8.3.conf | |||
@@ -1,4 +1,4 @@ | |||
1 | include conf/distro/familiar.conf | 1 | include conf/distro/familiar-distro.conf |
2 | 2 | ||
3 | DISTRO = "familiar" | 3 | DISTRO = "familiar" |
4 | DISTRO_NAME = "Familiar Linux" | 4 | DISTRO_NAME = "Familiar Linux" |
@@ -17,13 +17,18 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" | |||
17 | PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" | 17 | PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" |
18 | PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" | 18 | PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" |
19 | 19 | ||
20 | PREFERRED_PROVIDER_virtual/libiconv=glibc | ||
21 | PREFERRED_PROVIDER_virtual/libintl=glibc | ||
22 | PREFERRED_PROVIDER_x11=diet-x11 | ||
23 | |||
24 | PREFERRED_VERSION_hostap-modules ?= "0.3.9 | ||
20 | 25 | ||
21 | # The CSL compiler is unusable because | 26 | # The CSL compiler is unusable because |
22 | # 1) certain programs stop to compile | 27 | # 1) certain programs stop to compile |
23 | # 2) more programs segfault | 28 | # 2) more programs segfault |
24 | PREFERRED_VERSION_gcc = "3.4.4" | 29 | PREFERRED_VERSION_gcc ?= "3.4.4" |
25 | PREFERRED_VERSION_gcc-cross = "3.4.4" | 30 | PREFERRED_VERSION_gcc-cross ?= "3.4.4" |
26 | PREFERRED_VERSION_gcc-cross-initial = "3.4.4" | 31 | PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" |
27 | 32 | ||
28 | # | 33 | # |
29 | # Opie | 34 | # Opie |
@@ -41,12 +46,17 @@ include conf/distro/preferred-opie-versions.inc | |||
41 | 46 | ||
42 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" | 47 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" |
43 | PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" | 48 | PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" |
44 | #PREFERRED_PROVIDER_x11 = "diet-x11" | 49 | PREFERRED_PROVIDER_x11 = "diet-x11" |
45 | 50 | ||
46 | include conf/distro/preferred-gpe-versions-2.7.inc | 51 | include conf/distro/preferred-gpe-versions-2.7.inc |
47 | 52 | ||
48 | # | 53 | # |
49 | # E | 54 | # E |
50 | # | 55 | # |
51 | include conf/distro/preferred-e-versions.inc | 56 | |
57 | |||
58 | #23:57 < mickeyl> it's no longer necessary since our cleanup | ||
59 | #23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it | ||
60 | |||
61 | #include conf/distro/preferred-e-versions.inc | ||
52 | 62 | ||
diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar-distro.conf index 497ba6a89c..497ba6a89c 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 2d64cf2b8b..5919f351fb 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" | |||
33 | PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" | 33 | PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" |
34 | PREFERRED_VERSION_rxvt-unicode ?= "5.3" | 34 | PREFERRED_VERSION_rxvt-unicode ?= "5.3" |
35 | PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" | 35 | PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" |
36 | PREFERRED_VERSION_xst ?= "0.14" | 36 | PREFERRED_VERSION_xst ?= "0.15" |
37 | #PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" | 37 | #PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" |
38 | PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" | 38 | PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" |
39 | PREFERRED_VERSION_xhost ?= "0.0cvs20040413" | 39 | PREFERRED_VERSION_xhost ?= "0.0cvs20040413" |
40 | PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" | 40 | PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" |
41 | PREFERRED_VERSION_gpe-login ?= "0.81" | 41 | PREFERRED_VERSION_gpe-login ?= "0.82" |
42 | PREFERRED_VERSION_gpe-session-scripts ?= "0.63" | 42 | PREFERRED_VERSION_gpe-session-scripts ?= "0.66" |
43 | PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" | 43 | PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" |
44 | PREFERRED_VERSION_gpe-todo ?= "0.54" | 44 | PREFERRED_VERSION_gpe-todo ?= "0.54" |
45 | PREFERRED_VERSION_gpe-calendar ?= "0.63" | 45 | PREFERRED_VERSION_gpe-calendar ?= "0.65" |
46 | PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" | 46 | PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" |
47 | PREFERRED_VERSION_gpe-contacts ?= "0.41" | 47 | PREFERRED_VERSION_gpe-contacts ?= "0.42" |
48 | PREFERRED_VERSION_gpe-today ?= "0.08" | 48 | PREFERRED_VERSION_gpe-today ?= "0.09" |
49 | PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" | 49 | PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" |
50 | PREFERRED_VERSION_dbus ?= "0.23.4" | 50 | PREFERRED_VERSION_dbus ?= "0.23.4" |
51 | PREFERRED_VERSION_gpe-bluetooth ?= "0.43" | 51 | PREFERRED_VERSION_gpe-beam ?= "0.2.8" |
52 | PREFERRED_VERSION_gpe-bluetooth ?= "0.44" | ||
52 | PREFERRED_VERSION_gpe-su ?= "0.18" | 53 | PREFERRED_VERSION_gpe-su ?= "0.18" |
53 | PREFERRED_VERSION_gpe-conf ?= "0.1.25" | 54 | PREFERRED_VERSION_gpe-conf ?= "0.1.25" |
54 | PREFERRED_VERSION_gpe-clock ?= "0.21" | 55 | PREFERRED_VERSION_gpe-clock ?= "0.21" |
@@ -85,4 +86,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" | |||
85 | PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" | 86 | PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" |
86 | PREFERRED_VERSION_linphone ?= "0.12.2" | 87 | PREFERRED_VERSION_linphone ?= "0.12.2" |
87 | PREFERRED_VERSION_firefox ?= "1.0" | 88 | PREFERRED_VERSION_firefox ?= "1.0" |
89 | PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1" | ||
90 | PREFERRED_VERSION_poppler ?= "0.3.3" | ||
91 | PREFERRED_VERSION_evince ?= "0.3.2" | ||
88 | PREFERRED_VERSION_gpe_mini_browser ?= "0.15" | 92 | PREFERRED_VERSION_gpe_mini_browser ?= "0.15" |
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf index 9e1b677ecf..0565b897b7 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" | |||
9 | PREFERRED_VERSION_orinoco-modules = "0.15rc1" | 9 | PREFERRED_VERSION_orinoco-modules = "0.15rc1" |
10 | 10 | ||
11 | BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" | 11 | BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" |
12 | BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools" | 12 | BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools" |
13 | 13 | ||
14 | BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" | 14 | BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" |
15 | BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools" | 15 | BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" |
16 | 16 | ||
17 | PXA270_MODULES = "g_ether pxa27x_udc" | 17 | PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \ |
18 | snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ | ||
19 | nls_cp437 nls_utf8" | ||
18 | 20 | ||
19 | SERIAL_CONSOLE = "115200 ttyS0" | 21 | SERIAL_CONSOLE = "115200 ttyS0" |
20 | 22 | ||
@@ -29,5 +31,21 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince" | |||
29 | include conf/machine/tune-xscale.conf | 31 | include conf/machine/tune-xscale.conf |
30 | 32 | ||
31 | BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" | 33 | BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" |
32 | HX4700_MODULES = "asic3_base asic3_mmc hx4700_bt hx4700_core hx4700_leds hx4700_navpt hx4700_pcmcia \ | 34 | HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ |
33 | hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700" | 35 | hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power" |
36 | |||
37 | module_autoload_hx4700_power = "hx4700_power" | ||
38 | module_autoload_pcmcia = "pcmcia" | ||
39 | module_autoload_hx4700_pcmcia = "hx4700_pcmcia" | ||
40 | module_autoload_asic3_mmc = "asic3_mmc" | ||
41 | module_autoload_mmc_block = "mmc_block" | ||
42 | module_autoload_hx4700_ts = "hx4700_ts" | ||
43 | module_autoload_hx4700_navpt = "hx4700_navpt" | ||
44 | module_autoload_hx4700_bt = "hx4700_bt" | ||
45 | module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700" | ||
46 | module_autoload_snd-pcm-oss = "snd-pcm-oss" | ||
47 | module_autoload_snd-pcm-oss = "snd-mixer-oss" | ||
48 | module_autoload_pxa27x_udc = "pxa27x_udc" | ||
49 | |||
50 | #FIXME: this should be controlled by a userspace utility later. | ||
51 | module_autoload_g_ether = "g_ether" | ||
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf index 253f8a43e2..8b657281c7 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" | |||
15 | GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" | 15 | GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" |
16 | 16 | ||
17 | # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. | 17 | # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. |
18 | #include conf/machine/tune-arm926ejs.conf | 18 | include conf/machine/tune-arm926ejs.conf |
19 | 19 | ||
20 | 20 | ||
21 | #size of the root partition (yes, it is 123 MB) | 21 | #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 b3e0a50bc6..516b07ee15 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- | |||
27 | kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ | 27 | kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ |
28 | kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" | 28 | kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" |
29 | # Infrared Modules | 29 | # Infrared Modules |
30 | #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm | 30 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ |
31 | # kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" | 31 | kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" |
32 | 32 | ||
33 | # USB Gadget Modules | 33 | # USB Gadget Modules |
34 | #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ | 34 | BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ |
35 | # kernel-module-g-serial kernel-module-g-ether" | 35 | kernel-module-g-serial kernel-module-g-ether" |
36 | 36 | ||