diff options
| -rw-r--r-- | classes/cross.bbclass | 4 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 8 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 3 | ||||
| -rw-r--r-- | packages/freesmartphone/frameworkd/frameworkd.conf | 1 | ||||
| -rw-r--r-- | packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf | 11 | ||||
| -rw-r--r-- | packages/freesmartphone/frameworkd_git.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-omap2_git.bb | 4 |
7 files changed, 22 insertions, 11 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 89cb3e9569..a35f4dfb79 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -49,8 +49,8 @@ bindir = "${exec_prefix}/bin" sbindir = "${exec_prefix}/bin" libexecdir = "${exec_prefix}/libexec" libdir = "${exec_prefix}/lib" -includedir = "${exec_prefix}/include" -oldincludedir = "${exec_prefix}/include" +includedir = "${STAGING_DIR_TARGET}/${layout_includedir}" +oldincludedir = "${STAGING_DIR_TARGET}/${layout_includedir}" do_stage () { oe_runmake install diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index b84e2d46e2..5ba510a4b7 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1369,8 +1369,8 @@ PREFERRED_VERSION_openssl-native ?= "0.9.7g" PREFERRED_VERSION_openswan ?= "2.4.7" PREFERRED_VERSION_openttd ?= "0.4.0.1" PREFERRED_VERSION_openvpn ?= "2.0.9" -PREFERRED_VERSION_opkg-native ?= "4488" -PREFERRED_VERSION_opkg ?= "4488" +SRCREV_pn-opkg-native ?= "4488" +SRCREV_pn-opkg ?= "4488" PREFERRED_VERSION_oplinux-packages ?= "1.0" PREFERRED_VERSION_oprofile ?= "0.9.3" PREFERRED_VERSION_orage ?= "4.4.1" @@ -1530,8 +1530,8 @@ PREFERRED_VERSION_python-pyfits ?= "1.1" PREFERRED_VERSION_python-pyflakes ?= "0.2.1" PREFERRED_VERSION_python-pygame ?= "1.7.1" PREFERRED_VERSION_python-pygnome ?= "2.16.2" -PREFERRED_VERSION_python-pygobject ?= "2.12.3" -PREFERRED_VERSION_python-pygobject-native ?= "2.12.3" +PREFERRED_VERSION_python-pygobject ?= "2.14.2" +PREFERRED_VERSION_python-pygobject-native ?= "2.14.2" PREFERRED_VERSION_python-pygoogle ?= "0.6" PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12" PREFERRED_VERSION_python-pygtk ?= "2.10.4" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 3acc8b2bc2..8661e5b065 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -166,5 +166,8 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" +PREFERRED_PROVIDER_avahi ?= "avahi" +PREFERRED_PROVIDER_gconf ?= "gconf" + require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc diff --git a/packages/freesmartphone/frameworkd/frameworkd.conf b/packages/freesmartphone/frameworkd/frameworkd.conf index e69de29bb2..8b13789179 100644 --- a/packages/freesmartphone/frameworkd/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/frameworkd.conf @@ -0,0 +1 @@ + diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf index 0076639f98..b38425129f 100644 --- a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf @@ -1,8 +1,15 @@ [idlenotifier] -# don't read from accellerometers for now +# don't read from accellerometers for GTA02 ignoreinput=2,3 [input] -# don't read from accellerometers for now +# don't read from accellerometers for GTA02 ignoreinput=2,3 +[ophoned] +# GTA02 has TI Calypso +modemtype = ti_calypso + +[opreferencesd] +rootdir = +../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 53ea10f0fb..4d3e498f9e 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" PV = "0.8.0+gitr${SRCREV}" -PR = "r0" +PR = "r1" inherit distutils update-rc.d diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 29cfb35bdb..3147ef46a7 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,9 +2,9 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "6604ac6c8a14d583a463159f3a1601427dab7e05" +SRCREV = "af933cd32a5e14f119a4acb4fe20055f6f8ab1aa" -PV = "2.6.25+2.6.26-rc7+${PR}+git${SRCREV}" +PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}" PR = "r30" |