Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2146 - in trunk/oe/packages/openmoko-base: . files
([EMAIL PROTECTED])
2. r2147 - trunk/oe/packages/tasks ([EMAIL PROTECTED])
3. r2148 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
4. r2149 - trunk/oe/packages/openmoko-base ([EMAIL PROTECTED])
5. r2150 - trunk/oe/packages/openmoko-base ([EMAIL PROTECTED])
6. r2151 - in trunk/oe: conf/machine packages/linux
packages/linux/linux-gta01 ([EMAIL PROTECTED])
--- Begin Message ---Author: mickey Date: 2007-06-04 15:56:03 +0200 (Mon, 04 Jun 2007) New Revision: 2146 Modified: trunk/oe/packages/openmoko-base/files/session trunk/oe/packages/openmoko-base/openmoko-session_svn.bb Log: oe/openmoko-base: delay playing the startup sound until most of the UI shows Modified: trunk/oe/packages/openmoko-base/files/session =================================================================== --- trunk/oe/packages/openmoko-base/files/session 2007-06-03 22:15:19 UTC (rev 2145) +++ trunk/oe/packages/openmoko-base/files/session 2007-06-04 13:56:03 UTC (rev 2146) @@ -9,13 +9,13 @@ # start old-style panel plugin to get a keyboard mbinputmgr & +# set default alsa configuration and play welcome sound +( sleep 8; alsactl restore 0 -f /etc/alsa/stereoout.state; madplay /usr/share/openmoko/sounds/startup_openmoko.mp3 ) & + +# start UI and dialer openmoko-footer & openmoko-today --desktop & openmoko-dialer & -# set default alsa configuration and play welcome sound -alsactl restore 0 -f /etc/alsa/stereoout.state -madplay /usr/share/openmoko/sounds/startup_openmoko.mp3 & - exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@ Modified: trunk/oe/packages/openmoko-base/openmoko-session_svn.bb =================================================================== --- trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-03 22:15:19 UTC (rev 2145) +++ trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-04 13:56:03 UTC (rev 2146) @@ -2,7 +2,7 @@ SECTION = "openmoko/base" RDEPENDS = "matchbox-panel-2 matchbox-wm gconf" PV = "0.1+svn${SRCDATE}" -PR = "r1" +PR = "r2" inherit openmoko-base @@ -23,6 +23,5 @@ if [ "x$D" != "x" ]; then exit 1 fi - gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/openmoko/interface/theme openmoko-standard }
--- End Message ---
--- Begin Message ---Author: mickey Date: 2007-06-04 17:00:53 +0200 (Mon, 04 Jun 2007) New Revision: 2147 Added: trunk/oe/packages/tasks/task-base.bb Modified: trunk/oe/packages/tasks/task-openmoko.bb Log: oe/task-base: add to overlay and bump (as per hrw's request) oe/task-openmoko: bump Added: trunk/oe/packages/tasks/task-base.bb =================================================================== --- trunk/oe/packages/tasks/task-base.bb 2007-06-04 13:56:03 UTC (rev 2146) +++ trunk/oe/packages/tasks/task-base.bb 2007-06-04 15:00:53 UTC (rev 2147) @@ -0,0 +1,317 @@ +DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" +PR = "r20" + +PACKAGES = "task-base \ + task-base-minimal \ + task-base-oh-minimal \ + task-base-core-default" + +ALLOW_EMPTY = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# Valid only in MACHINE_FEATURES: +# +# kernel24 +# kernel26 +# apm +# keyboard +# touchscreen +# screen +# pci +# acpi +# phone + +# Valid only in DISTRO_FEATURES: +# +# nfs +# smbfs +# ipsec +# wifi +# ppp + +# Valid COMBINED_FEATURES: +# (These features need to be supported by both the machine and the distro) +# +# alsa +# bluetooth +# ext2 +# irda +# pci +# pcmcia +# usbgadget +# usbhost + +DISTRO_CORE_PACKAGE ?= "task-base-core-default" + +# +# task-base +# +RDEPENDS_task-base = "\ + ${DISTRO_CORE_PACKAGE} \ + kernel \ + [EMAIL PROTECTED]("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \ + [EMAIL PROTECTED]("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \ + [EMAIL PROTECTED]("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \ + [EMAIL PROTECTED]("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \ + [EMAIL PROTECTED]("MACHINE_FEATURES", "keyboard", "${task-base-keyboard-rdepends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ + ${MACHINE_EXTRA_RDEPENDS} \ + ${DISTRO_EXTRA_RDEPENDS}" + +RRECOMMENDS_task-base = "\ + [EMAIL PROTECTED]("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "alsa", "${task-base-alsa-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "irda", "${task-base-irda-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "usbgadget", "${task-base-usbgadget-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rrecommends}", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \ + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ + ${MACHINE_EXTRA_RRECOMMENDS} \ + ${DISTRO_EXTRA_RRECOMMENDS}" + + +# +# task-base-oh-minimal +# An example of a small cut down machine configuration +# +RDEPENDS_task-base-oh-minimal = "\ + kernel \ + [EMAIL PROTECTED]("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \ + [EMAIL PROTECTED]("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" + +RRECOMMENDS_task-base-minimal = "\ + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" + + + +HOTPLUG ?= "linux-hotplug" + +RDEPENDS_task-base-core-default = '\ + base-files \ + base-passwd \ + busybox \ + initscripts \ + netbase \ + sysvinit \ + sysvinit-pidof \ + tinylogin \ + modutils-initscripts \ + fuser \ + setserial' +# Lets see if we can kill off hotplug... +# ${HOTPLUG} +# [EMAIL PROTECTED](d)} + + +RRECOMMENDS_task-base-core-default = '\ + dropbear ' + +task-base-kernel24-rdepends = "\ + modutils-depmod \ + linux-hotplug " + +task-base-kernel26-rdepends = "\ + udev \ + sysfsutils \ + module-init-tools" + +task-base-keyboard-rdepends = "\ + keymaps" + +task-base-pci-rdepends = "\ + pciutils" + +task-base-kernel26-extras-rrecommends = "\ + kernel-module-input \ + kernel-module-uinput" + +task-base-acpi-rdepends = "\ + acpid" + +task-base-apm-rdepends = "\ + apm \ + apmd \ + [EMAIL PROTECTED]("MACHINE_FEATURES", "kernel24", "network-suspend-scripts", "",d)}" + +task-base-ext2-rdepends = "\ + hdparm \ + e2fsprogs \ + e2fsprogs-e2fsck \ + e2fsprogs-mke2fs" + +task-base-alsa-rdepends = "\ + alsa-utils-alsactl \ + alsa-utils-alsamixer" + +task-base-alsa-rrecommends = "\ + kernel-module-snd-mixer-oss \ + kernel-module-snd-pcm-oss" + +task-base-pcmcia-rdepends = "\ + ${PCMCIA_MANAGER} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "prism3-support", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "spectrum-fw", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "hostap-conf", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "orinoco-conf", "",d)}" + +task-base-pcmcia-rrecommends = "\ + kernel-module-pcmcia \ + kernel-module-airo-cs \ + kernel-module-pcnet-cs \ + kernel-module-serial-cs \ + kernel-module-ide-cs \ + [EMAIL PROTECTED]("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} " + +task-base-pcmcia24-rrecommends = "\ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "orinoco-modules-cs", "",d)}" + +task-base-pcmcia26-rrecommends = "\ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "kernel-module-hostap-cs", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}" + +task-base-bluetooth-rdepends = "\ + blueprobe \ + bluez-utils" + +task-base-bluetooth-rrecommends = "\ + kernel-module-bluetooth \ + kernel-module-l2cap \ + kernel-module-rfcomm \ + kernel-module-hci-vhci \ + kernel-module-bnep \ + kernel-module-hidp \ + kernel-module-hci-uart \ + kernel-module-sco \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)}" + +task-base-irda-rdepends = "\ + irda-utils" + +task-base-irda-rrecommends = "\ + kernel-module-pxaficp-ir \ + kernel-module-irda \ + kernel-module-ircomm \ + kernel-module-ircomm-tty \ + kernel-module-irlan \ + [EMAIL PROTECTED]("DISTRO_FEATURES", "ppp", "kernel-module-irnet", "",d)} \ + kernel-module-irport \ + kernel-module-irtty \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "usbhost", "kernel-module-ir-usb", "",d)} " + +task-base-usbgadget-rrecommends = "\ + kernel-module-pxa27x_udc \ + kernel-module-gadgetfs \ + kernel-module-g-file-storage \ + kernel-module-g-serial \ + kernel-module-g-ether" + +task-base-usbhost-rdepends = "\ + usbutils " + +task-base-usbhost-rrecommends = "\ + kernel-module-uhci-hcd \ + kernel-module-ohci-hcd \ + kernel-module-ehci-hcd \ + kernel-module-usbcore \ + kernel-module-usbhid \ + kernel-module-usbnet \ + kernel-module-sd-mod \ + kernel-module-scsi-mod \ + kernel-module-usbmouse \ + kernel-module-mousedev \ + kernel-module-usbserial \ + kernel-module-usb-storage " + +task-distro-ppp-rdepends = "\ + ppp \ + ppp-dialin" + +task-distro-ppp-rrecommends = "\ + kernel-module-ppp-async \ + kernel-module-ppp-deflate \ + kernel-module-ppp-mppe" + +task-distro-ipsec-rdepends = "\ + openswan" + +task-distro-ipsec-rrecommends = "\ + kernel-module-ipsec" + +task-distro-wifi-rdepends = "\ + wireless-tools \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \ + [EMAIL PROTECTED]("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \ + wpa-supplicant" + +task-distro-wifi-rrecommends = "\ + kernel-module-ieee80211-crypt \ + kernel-module-ieee80211-crypt-ccmp \ + kernel-module-ieee80211-crypt-tkip \ + kernel-module-ieee80211-crypt-wep \ + kernel-module-arc4 \ + kernel-module-michael-mic \ + kernel-module-aes" + +task-distro-smbfs-rrecommends = "\ + kernel-module-cifs \ + kernel-module-smbfs" + +task-distro-cramfs-rrecommends = "\ + kernel-module-cramfs" + +task-distro-nfs-rdepends = "\ + portmap" + +task-distro-nfs-rrecommends = "\ + kernel-module-nfs \ + kernel-module-lockd \ + kernel-module-sunrpc" + + +# Tosort +# kernel-module-ipv6 +# kernel-module-nvrd +# kernel-module-mip6-mn +# kernel-module-tun +# kernel-module-ide-disk +# kernel-module-ide-probe-mo +# kernel-module-loop +# kernel-module-vfat +# kernel-module-ext2 +# kernel-module-sco +# kernel-module-af_packet +# kernel-module-ip-gre +# kernel-module-ip-tables +# kernel-module-ipip +# kernel-module-des +# kernel-module-md5 +# kernel-module-8250 +# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz + Modified: trunk/oe/packages/tasks/task-openmoko.bb =================================================================== --- trunk/oe/packages/tasks/task-openmoko.bb 2007-06-04 13:56:03 UTC (rev 2146) +++ trunk/oe/packages/tasks/task-openmoko.bb 2007-06-04 15:00:53 UTC (rev 2147) @@ -4,7 +4,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r40" +PR = "r41" PACKAGES = "\ task-openmoko-linux \ @@ -79,6 +79,7 @@ openmoko-session \ openmoko-theme-standard \ openmoko-icon-theme-standard \ + openmoko-sound-theme-standard \ # psplash \ "
--- End Message ---
--- Begin Message ---Author: mickey Date: 2007-06-04 17:07:42 +0200 (Mon, 04 Jun 2007) New Revision: 2148 Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c Log: openmoko-panel-mainmenu: disable pm until tslib-grab has been removed (we're not getting any ts events) Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c =================================================================== --- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c 2007-06-04 15:00:53 UTC (rev 2147) +++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c 2007-06-04 15:07:42 UTC (rev 2148) @@ -156,8 +156,8 @@ touchscreen_io = g_io_channel_unix_new( tsfd ); g_io_add_watch( touchscreen_io, G_IO_IN, panel_mainmenu_touchscreen_cb, NULL ); - panel_mainmenu_powersave_reset(); - panel_mainmenu_set_display( 100 ); + //panel_mainmenu_powersave_reset(); + //panel_mainmenu_set_display( 100 ); return TRUE; }
--- End Message ---
--- Begin Message ---Author: mickey Date: 2007-06-04 17:44:45 +0200 (Mon, 04 Jun 2007) New Revision: 2149 Modified: trunk/oe/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb trunk/oe/packages/openmoko-base/openmoko-session_svn.bb Log: oe/openmoko-session: bump oe/openmoko-icon-theme-standard: call gtk-icon-cache in postinst Modified: trunk/oe/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb =================================================================== --- trunk/oe/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb 2007-06-04 15:07:42 UTC (rev 2148) +++ trunk/oe/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb 2007-06-04 15:44:45 UTC (rev 2149) @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" +PV = "0.1+svn${SRCDATE}" PR = "r0" inherit openmoko-base autotools @@ -8,5 +8,12 @@ SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http" S = "${WORKDIR}/icons" +pkg_postinst_openmoko-session () { +#!/bin/sh -e +if [ "x$D" != "x" ]; then + exit 1 +fi +gtk-update-icon-cache ${datadir}/icons/openmoko-standard/ +} + PACKAGE_ARCH = "all" - Modified: trunk/oe/packages/openmoko-base/openmoko-session_svn.bb =================================================================== --- trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-04 15:07:42 UTC (rev 2148) +++ trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-04 15:44:45 UTC (rev 2149) @@ -2,7 +2,7 @@ SECTION = "openmoko/base" RDEPENDS = "matchbox-panel-2 matchbox-wm gconf" PV = "0.1+svn${SRCDATE}" -PR = "r2" +PR = "r3" inherit openmoko-base @@ -25,3 +25,5 @@ fi gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/openmoko/interface/theme openmoko-standard } + +PACKAGE_ARCH = "all"
--- End Message ---
--- Begin Message ---Author: mickey Date: 2007-06-04 19:21:42 +0200 (Mon, 04 Jun 2007) New Revision: 2150 Modified: trunk/oe/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb Log: oe/openmoko-icon-theme-standard: fix postinst Modified: trunk/oe/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb =================================================================== --- trunk/oe/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb 2007-06-04 15:44:45 UTC (rev 2149) +++ trunk/oe/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb 2007-06-04 17:21:42 UTC (rev 2150) @@ -1,19 +1,19 @@ DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" SECTION = "openmoko/base" PV = "0.1+svn${SRCDATE}" -PR = "r0" +PR = "r1" inherit openmoko-base autotools SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http" S = "${WORKDIR}/icons" -pkg_postinst_openmoko-session () { +pkg_postinst_openmoko-icon-theme-standard () { #!/bin/sh -e if [ "x$D" != "x" ]; then exit 1 fi -gtk-update-icon-cache ${datadir}/icons/openmoko-standard/ +gtk-update-icon-cache ${datadir}/icons/openmoko-standard/ } PACKAGE_ARCH = "all"
--- End Message ---
--- Begin Message ---Author: mickey Date: 2007-06-04 21:05:07 +0200 (Mon, 04 Jun 2007) New Revision: 2151 Removed: trunk/oe/packages/linux/gta01-kernel_2.6.bb trunk/oe/packages/linux/linux-gta01/gta01-vibrator.patch trunk/oe/packages/linux/qt2410-kernel_2.6.bb Modified: trunk/oe/conf/machine/fic-gta01.conf trunk/oe/packages/linux/linux-gta01_2.6.21.3.bb Log: oe: remove gta01-kernel_2.6.bb, we use linux-gta01_*.bb directly from now on. Modified: trunk/oe/conf/machine/fic-gta01.conf =================================================================== --- trunk/oe/conf/machine/fic-gta01.conf 2007-06-04 17:21:42 UTC (rev 2150) +++ trunk/oe/conf/machine/fic-gta01.conf 2007-06-04 19:05:07 UTC (rev 2151) @@ -7,7 +7,8 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" -PREFERRED_PROVIDER_virtual/kernel = "gta01-kernel" +PREFERRED_PROVIDER_virtual/kernel = "linux-gta01" +PREFERRED_VERSION_linux-gta01 = "2.6.21.3" MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" Deleted: trunk/oe/packages/linux/gta01-kernel_2.6.bb =================================================================== --- trunk/oe/packages/linux/gta01-kernel_2.6.bb 2007-06-04 17:21:42 UTC (rev 2150) +++ trunk/oe/packages/linux/gta01-kernel_2.6.bb 2007-06-04 19:05:07 UTC (rev 2151) @@ -1 +0,0 @@ -require linux-gta01_2.6.21.3.bb Deleted: trunk/oe/packages/linux/linux-gta01/gta01-vibrator.patch =================================================================== --- trunk/oe/packages/linux/linux-gta01/gta01-vibrator.patch 2007-06-04 17:21:42 UTC (rev 2150) +++ trunk/oe/packages/linux/linux-gta01/gta01-vibrator.patch 2007-06-04 19:05:07 UTC (rev 2151) @@ -1,118 +0,0 @@ -Index: linux-2.6.20.3/drivers/leds/Makefile -=================================================================== ---- linux-2.6.20.3.orig/drivers/leds/Makefile 2007-03-13 18:27:08.000000000 +0000 -+++ linux-2.6.20.3/drivers/leds/Makefile 2007-03-21 03:37:04.000000000 +0000 -@@ -14,6 +14,7 @@ - obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o - obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o - obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o -+obj-$(CONFIG_LEDS_GTA01) += leds-gta01.o - - # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -Index: linux-2.6.20.3/drivers/leds/Kconfig -=================================================================== ---- linux-2.6.20.3.orig/drivers/leds/Kconfig 2007-03-13 18:27:08.000000000 +0000 -+++ linux-2.6.20.3/drivers/leds/Kconfig 2007-03-21 03:37:04.000000000 +0000 -@@ -82,6 +82,12 @@ - help - This option enables support for the PCEngines WRAP programmable LEDs. - -+config LEDS_GTA01 -+ tristate "LED Support for the FIC Neo1973 Vibrator" -+ depends on LEDS_CLASS && MACH_GTA01 -+ help -+ This option enables support for the Vibrator on the FIC Neo1973. -+ - comment "LED Triggers" - - config LEDS_TRIGGERS -Index: linux-2.6.20.3/drivers/leds/leds-gta01.c -=================================================================== ---- linux-2.6.20.3.orig/drivers/leds/leds-gta01.c 2007-03-21 03:37:04.000000000 +0000 -+++ linux-2.6.20.3/drivers/leds/leds-gta01.c 2007-03-21 03:37:04.000000000 +0000 -@@ -11,14 +11,13 @@ - * - */ - --#include <linux/config.h> - #include <linux/kernel.h> - #include <linux/init.h> - #include <linux/platform_device.h> - #include <linux/leds.h> - #include <asm/hardware/scoop.h> - #include <asm/mach-types.h> --#include <asm/arch/hardware.h> -+#include <asm/hardware.h> - #include <asm/arch/gta01.h> - - static void gta01led_vib_set(struct led_classdev *led_cdev, enum led_brightness value) -@@ -77,18 +76,18 @@ - }, - }; - --static int __init spitzled_init(void) -+static int __init gta01led_init(void) - { - return platform_driver_register(>a01led_driver); - } - --static void __exit spitzled_exit(void) -+static void __exit gta01led_exit(void) - { - platform_driver_unregister(>a01led_driver); - } - --module_init(spitzled_init); --module_exit(spitzled_exit); -+module_init(gta01led_init); -+module_exit(gta01led_exit); - - MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>"); - MODULE_DESCRIPTION("FIC GTA01 LED driver"); -Index: linux-2.6.20.3/arch/arm/mach-s3c2410/mach-gta01.c -=================================================================== ---- linux-2.6.20.3.orig/arch/arm/mach-s3c2410/mach-gta01.c 2007-03-21 03:37:04.000000000 +0000 -+++ linux-2.6.20.3/arch/arm/mach-s3c2410/mach-gta01.c 2007-03-21 03:37:04.000000000 +0000 -@@ -384,6 +384,19 @@ - }, - }; - -+static struct resource gta01_led_resources[] = { -+ [0] = { -+ .start = GTA01_GPIO_VIBRATOR_ON, -+ .end = GTA01_GPIO_VIBRATOR_ON, -+ }, -+}; -+ -+struct platform_device gta01_led_dev = { -+ .name = "gta01-led", -+ .num_resources = ARRAY_SIZE(gta01_led_resources), -+ .resource = gta01_led_resources, -+}; -+ - static struct resource gta01_button_resources[] = { - [0] = { - .start = GTA01_GPIO_AUX_KEY, -@@ -457,6 +470,7 @@ - platform_device_register(&s3c_device_spi_lcm); - #endif - platform_device_register(>a01_bl_dev); -+ platform_device_register(>a01_led_dev); - platform_device_register(>a01_button_dev); - platform_device_register(>a01_pm_gsm_dev); - -Index: linux-2.6.20.3/include/asm-arm/arch-s3c2410/gta01.h -=================================================================== ---- linux-2.6.20.3.orig/include/asm-arm/arch-s3c2410/gta01.h 2007-03-21 03:37:04.000000000 +0000 -+++ linux-2.6.20.3/include/asm-arm/arch-s3c2410/gta01.h 2007-03-24 00:33:17.000000000 +0000 -@@ -28,7 +28,8 @@ - #define GTA01_GPIO_nSD_DETECT S3C2410_GPF5 - #define GTA01_GPIO_AUX_KEY S3C2410_GPF6 - #define GTA01_GPIO_HOLD_KEY S3C2410_GPF7 --#define GTA01_GPIO_VIBRATOR_ON S3C2410_GPG11 -+// FIXME this is only correct for GTAB01v2 and GTA01Bv3, GTA01v3 and GTA01v3 use S3C2410_GPG11 -+#define GTA01_GPIO_VIBRATOR_ON S3C2410_GPB10 - - #define GTA01_IRQ_JACK_INSERT IRQ_EINT4 - #define GTA01_IRQ_nSD_DETECT IRQ_EINT5 Modified: trunk/oe/packages/linux/linux-gta01_2.6.21.3.bb =================================================================== --- trunk/oe/packages/linux/linux-gta01_2.6.21.3.bb 2007-06-04 17:21:42 UTC (rev 2150) +++ trunk/oe/packages/linux/linux-gta01_2.6.21.3.bb 2007-06-04 19:05:07 UTC (rev 2151) @@ -1,9 +1,10 @@ require linux-gta01.inc SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http" +SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1" MOKOR = "moko10" -PR = "${MOKOR}-r2" +PR = "${MOKOR}-r3" VANILLA_VERSION = "2.6.21.3" Deleted: trunk/oe/packages/linux/qt2410-kernel_2.6.bb =================================================================== --- trunk/oe/packages/linux/qt2410-kernel_2.6.bb 2007-06-04 17:21:42 UTC (rev 2150) +++ trunk/oe/packages/linux/qt2410-kernel_2.6.bb 2007-06-04 19:05:07 UTC (rev 2151) @@ -1 +0,0 @@ -require linux-qt2410_2.6.17.14.bb
--- End Message ---
_______________________________________________ commitlog mailing list [email protected] http://lists.openmoko.org/mailman/listinfo/commitlog
