diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-07-11 11:01:15 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-07-11 11:01:15 +0000 |
| commit | 49778d7c8a0027c2920beba40fd42e5705db75b4 (patch) | |
| tree | 20bacb907ebb80df985395445a02847310e062c2 /packages | |
| parent | 13e603ff2dc08db74a8ec700375dc494d0a07c24 (diff) | |
| parent | 8734f29b172e780435e2c39800241ecc29eee3f7 (diff) | |
merge of '83d9cf101f881f4f23bd0c33560c2179b08d8874'
and 'beb1fc79f1a536fd48b5ecbd2bdfcb11369d5888'
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/gpephone/gpe-session-scripts-phone/phonesession | 10 | ||||
| -rw-r--r-- | packages/gpephone/gpe-session-scripts-phone_0.67.bb | 2 | ||||
| -rw-r--r-- | packages/gpephone/machined_svn.bb | 18 | ||||
| -rw-r--r-- | packages/linux/linux-gta01_2.6.21.5.bb | 10 |
4 files changed, 38 insertions, 2 deletions
diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession index 6f6d9d59ae..2dacc4c4c9 100755 --- a/packages/gpephone/gpe-session-scripts-phone/phonesession +++ b/packages/gpephone/gpe-session-scripts-phone/phonesession @@ -31,7 +31,12 @@ export TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache export CAL_RES_PATH=$APP_PATH/share/res # For GTK input engine -export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim +if [ -d /usr/lib/gtk-2.0/2.10.0 ]; then + export PTIM_PATH=/usr/lib/gtk-2.0/2.10.0/immodules/ptim +else + export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim +fi + export PTIM_PIXMAPS_PATH=$PTIM_PATH/pixmaps export PTIM_CONFIG_FILE=$PTIM_PATH/imconfig export PTIM_HELPER_PATH=$PTIM_PATH/helper @@ -43,6 +48,9 @@ gpe-phonepanel& gpe-applauncher& matchbox-window-manager -use_titlebar no& +# start device support daemon +machined + # Start E-Sound Server esd -nobeeps -as 2& esdplay /mnt/sd/sounds/startup.wav diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb index 00031ac546..730a549aef 100644 --- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb +++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb @@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \ file://disable-composite.xsettings \ file://standard-apps.patch;patch=1" -PR = "r6" +PR = "r7" S = "${WORKDIR}/gpe-session-scripts-${PV}" diff --git a/packages/gpephone/machined_svn.bb b/packages/gpephone/machined_svn.bb new file mode 100644 index 0000000000..549071fdb0 --- /dev/null +++ b/packages/gpephone/machined_svn.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Device abstraction and support daemon" +SECTION = "gpephone" +PRIORITY = "required" +LICENSE = "GPL" +DEPENDS = "glib-2.0" +PV = "0.1+svn-${SRCDATE}" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +inherit gpephone pkgconfig autotools + +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}" + +S = "${WORKDIR}/${PN}" + +#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps" + diff --git a/packages/linux/linux-gta01_2.6.21.5.bb b/packages/linux/linux-gta01_2.6.21.5.bb new file mode 100644 index 0000000000..ced24462e7 --- /dev/null +++ b/packages/linux/linux-gta01_2.6.21.5.bb @@ -0,0 +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}-r1" + +VANILLA_VERSION = "2.6.21.5" + |