summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf15
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.7.inc2
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.8.inc2
-rw-r--r--conf/distro/include/preferred-gpe-versions.inc2
-rw-r--r--conf/distro/include/sane-srcdates.inc4
-rw-r--r--conf/machine/compulab-pxa270.conf2
-rw-r--r--conf/machine/epia.conf13
-rw-r--r--conf/machine/h1910.conf1
-rw-r--r--conf/machine/htcblueangel.conf1
-rw-r--r--conf/machine/htcuniversal.conf11
-rw-r--r--conf/machine/magician.conf13
-rw-r--r--conf/machine/rx3000.conf1
12 files changed, 45 insertions, 22 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index b1855b0ea7..b1d67e0405 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
#DISTRO_VERSION = "2007.3"
DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "30"
+DISTRO_REVISION = "32"
require conf/distro/include/angstrom.inc
require conf/distro/include/sane-srcdates.inc
@@ -46,6 +46,10 @@ FEED_ARCH_poodle = "armv5te"
FEED_ARCH_spitz = "armv5te"
FEED_ARCH_tosa = "armv5te"
+
+#i586 machines
+FEED_ARCH_epia = "i586"
+
#i686 machines
FEED_ARCH_guinness = "i686"
@@ -70,9 +74,9 @@ FEED_URIS += " \
# We will lock down a SRCDATE when we go into release mode
#SRCDATE = "20070303"
-PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh9"
-PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7"
-PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
+PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh7"
+PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh7"
SRCDATE_gconf-dbus = "20060719"
@@ -107,7 +111,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-PREFERRED_VERSION_gtk+ = "2.10.6"
+PREFERRED_VERSION_gtk+ = "2.10.7"
#zap extra stuff taking place in $MACHINE.conf
GPE_EXTRA_INSTALL = ""
@@ -135,6 +139,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
+PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
PREFERRED_PROVIDER_tslib ?= "tslib"
PREFERRED_PROVIDER_tslib-conf ?= "tslib"
PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
index 662dfc386f..cbdaec0a21 100644
--- a/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -7,7 +7,7 @@
#set some preferred providers:
PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
#specify versions, as the header says :)
PREFERRED_VERSION_libmatchbox ?= "1.7"
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index bf00aa8d01..a246633e07 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -4,7 +4,7 @@
#set some preferred providers:
PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
index 7d4efea06e..5db9d7f06a 100644
--- a/conf/distro/include/preferred-gpe-versions.inc
+++ b/conf/distro/include/preferred-gpe-versions.inc
@@ -7,7 +7,7 @@
#set some preferred providers:
PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
#specify versions, as the header says :)
#PREFERRED_VERSION_libmatchbox ?= "1.6"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index f73fa22e34..27e34856fd 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -22,7 +22,7 @@ SRCDATE_xxf86vmext ?= "20060814"
SRCDATE_contacts ?= "20060707"
SRCDATE_dates ?= "20060707"
SRCDATE_fstests ?= "20061122"
-SRCDATE_eds-dbus ?= "20061215"
+SRCDATE_eds-dbus ?= "20070115"
SRCDATE_libmatchbox ?= "20060612"
SRCDATE_libfakekey ?= "20051101"
SRCDATE_matchbox-common ?= "20060612"
@@ -46,7 +46,7 @@ SRCDATE_gpesyncd ?= "20061128"
# GNOME
SRCDATE_gconf-dbus ?= "20060719"
-SRCDATE_gnome-vfs-dbus ?= "20060119"
+SRCDATE_gnome-vfs ?= "20060119"
SRCDATE_gtkhtml2 ?= "20060323"
#Misc apps, sorted by alphabet
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index 3968bcb6f2..95be1624f0 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
require conf/machine/include/tune-xscale.conf
# used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttySA0"
+SERIAL_CONSOLE = "38400 ttySA0"
# used by opie-collections.inc
ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 189021747a..86e9429506 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -1,13 +1,12 @@
TARGET_ARCH = "i586"
-TARGET_VENDOR = "-oe"
+PACKAGE_EXTRA_ARCHS = "i386 i486"
+
PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
-IMAGE_FSTYPES = "ext2.gz"
-BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules"
-udevdir = "/dev"
OLDEST_KERNEL = "2.6.5"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-PACKAGE_EXTRA_ARCHS = "i386"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
require conf/machine/include/tune-c3.conf
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 72c2d33713..e81dbdeaa9 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -19,6 +19,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
# Software/packages selection
#
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index e92aee9972..77bb0b5639 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -19,6 +19,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
# Software/packages selection
#
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 843e26bed0..485d90df7f 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -31,17 +31,24 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \
kernel-module-af-key \
kernel-module-bsd-comp \
kernel-module-i2c-pxa \
- kernel-module-htcuniversal-power \
kernel-module-snd-htcuniversal-audio \
kernel-module-htcuniversal-acx \
kernel-module-acx \
+ kernel-module-i2c-algo-bit \
+ kernel-module-rtc-sa1100 \
+ kernel-module-rtc-dev \
+ kernel-module-rtc-proc \
+ kernel-module-rtc-sysfs \
"
#
# Modules autoload and other boot properties
#
-module_autoload_acx = "acx"
+#module_autoload_acx = "acx"
module_autoload_htcuniversal_acx = "htcuniversal_acx"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-htcuniversal_audio = "snd-htcuniversal_audio"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 4e6c9a625a..3d1b602def 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf
ROOT_FLASH_SIZE = "80"
VOLATILE_STORAGE_SIZE = "64"
GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget"
#
# Software/packages selection
@@ -34,7 +34,11 @@ MACHINE_EXTRA_RRECOMMENDS = " \
kernel-module-pxaficp-ir \
kernel-module-uinput \
kernel-module-hci-usb \
- "
+ kernel-module-magician-flash \
+ kernel-module-magician-ds1wm \
+ kernel-module-magician-battery \
+ kernel-module-magician-phone \
+ kernel-module-snd-soc-magician"
#
# Modules autoload and other boot properties
@@ -44,6 +48,11 @@ module_autoload_leds-magician = "leds-magician"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
module_autoload_pxa27x_udc = "pxa27x_udc"
+module_autoload_magician_ds1wm = "magician_ds1wm"
+module_autoload_magician-battery = "magician-battery"
+module_autoload_magician_phone = "magician_phone"
+module_autoload_snd-soc-magician = "snd-soc-magician"
+module_autoload_hci_usb = "hci_usb"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
index 40b13667b6..e39844d943 100644
--- a/conf/machine/rx3000.conf
+++ b/conf/machine/rx3000.conf
@@ -20,6 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
# Software/packages selection
#
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:38:43 +0000