From a37c8e4783218af384e6c944f8650888d9f824df Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 10 Jan 2007 14:22:32 +0000 Subject: htcuniversal.conf: Update modules to install and load. * Closes #1692. --- conf/machine/htcuniversal.conf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'conf') 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" -- cgit v1.2.3 From ca9c8ed1d68721ada42a881f799f6f75fc4ba2a3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 11 Jan 2007 16:57:46 +0000 Subject: angstrom: prefer gtk 2.10.7 --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index b1855b0ea7..dc0cc22fc0 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -107,7 +107,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 = "" -- cgit v1.2.3 From f9759b2de5d48cc6941c7b39a9b93f51e8dc440f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 09:28:42 +0000 Subject: angstrom: prefer gconf-dbus --- conf/distro/angstrom-2007.1.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index dc0cc22fc0..d937144af1 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 = "31" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -135,6 +135,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" -- cgit v1.2.3 From 58ef4fd8dd044c7671e52f8fe48da84c89df3c31 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 10:02:21 +0000 Subject: epia: cleanup and adapt to task-base --- conf/machine/epia.conf | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'conf') 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 -- cgit v1.2.3 From 41071d2a7a6996a9df0d5b211399dcbba1c52926 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 10:03:57 +0000 Subject: angstrom: add feed arch for epia --- conf/distro/angstrom-2007.1.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index d937144af1..3d56e18331 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 = "31" +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" -- cgit v1.2.3 From cd535280b32d1c1e045055608a965646985a1fc8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 12 Jan 2007 16:07:30 +0000 Subject: include/preferred-gpe-versions.inc, sane-srcdates.inc: catch up with removal of gnome-vfs-dbus. NOTE: may need to adjust SRCDATE for gnome-vfs? --- conf/distro/include/preferred-gpe-versions-2.7.inc | 2 +- conf/distro/include/preferred-gpe-versions-2.8.inc | 2 +- conf/distro/include/preferred-gpe-versions.inc | 2 +- conf/distro/include/sane-srcdates.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'conf') 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..866741479f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -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 -- cgit v1.2.3 From b68e57bb33163d460d710fe71187b6fed037c573 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 12 Jan 2007 16:53:15 +0000 Subject: angstrom-2007.1.conf: Update htcuniversal's kernel version to known good, 2.6.19-hh7. * Marcin Juszkiewicz tested this version to build ok, and it is known to work. --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index dc0cc22fc0..e9dfd1dac8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -72,7 +72,7 @@ FEED_URIS += " \ 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_htcuniversal = "2.6.19-hh7" SRCDATE_gconf-dbus = "20060719" -- cgit v1.2.3 From babd83dc528f250c11a0011e8282037363d6f695 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 12 Jan 2007 17:28:53 +0000 Subject: h1910.conf: Specify known good kernel version. --- conf/machine/h1910.conf | 1 + 1 file changed, 1 insertion(+) (limited to '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" -- cgit v1.2.3 From 7c318bfdf81af542dc0c15747748ac886eafbda5 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 12 Jan 2007 20:03:18 +0000 Subject: htcblueangel: Specify known good kernel version. --- conf/machine/htcblueangel.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') 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" -- cgit v1.2.3 From d136678e618e308ee7a47a1650102a9886fafcb2 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 12 Jan 2007 20:03:48 +0000 Subject: rx3000.conf: Specify known good kernel version. --- conf/machine/rx3000.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') 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" -- cgit v1.2.3 From 328ccfbac39fa6fc98be06e27b9abfd7372c6179 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 21:53:08 +0000 Subject: angstrom: make kernel version overridable via machine.conf of local.conf --- conf/distro/angstrom-2007.1.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index c5e8d3249e..b1d67e0405 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -74,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.19-hh7" +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" -- cgit v1.2.3 From 04c9590b70dbfc6de6c8e40353c6206937cd35a3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 13:45:54 +0000 Subject: magician: add "phone" MACHINE_FEATURE and autoload some kernel modules --- conf/machine/magician.conf | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'conf') 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" -- cgit v1.2.3 From 78cfbc9c82c7acab44b6ba4d619f422760b9f03a Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Mon, 15 Jan 2007 16:39:21 +0000 Subject: compulab-pxa270.conf: change serial console baud to 38400 to match BL --- conf/machine/compulab-pxa270.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') 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" -- cgit v1.2.3 From b9ced4ac6df019db0d332ed7c206c6865c93c20e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Jan 2007 13:40:32 +0000 Subject: sane-src-dates: bump eds to yesterday to get some bugfixes --- conf/distro/include/sane-srcdates.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 866741479f..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" -- cgit v1.2.3