diff options
| -rw-r--r-- | conf/machine/nokia770.conf | 10 | ||||
| -rw-r--r-- | packages/tslib/tslib-maemo/nokia770/ts.conf | 2 | ||||
| -rw-r--r-- | packages/tslib/tslib-maemo_0.0.1-15.bb | 9 | ||||
| -rw-r--r-- | packages/xserver/xserver-kdrive-omap_6.6.3.bb | 3 |
4 files changed, 15 insertions, 9 deletions
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index a922d5b4da..7a39104c63 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -6,7 +6,6 @@ IPKG_ARCHS = "all arm armv4 armv5te" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" -#PREFERRED_PROVIDER_virtual/tslib = "tslib-maemo" XSERVER = "xserver-kdrive-omap" @@ -26,17 +25,18 @@ ROOT_FLASH_SIZE = "123" EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers" # serial console port on devboard rev. B3 -SERIAL_CONSOLE = "115200 tts/0" +#SERIAL_CONSOLE = "115200 tts/0" +SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils nokia770-init \ +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils nokia770-init \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" -BOOTSTRAP_EXTRA_RDEPENDS = "udev sysfsutils nokia770-init \ -pcmcia-cs apm ppp wireless-tools udev-utils console-tools" +BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils nokia770-init \ +pcmcia-cs apm ppp wireless-tools console-tools" # NFS Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" diff --git a/packages/tslib/tslib-maemo/nokia770/ts.conf b/packages/tslib/tslib-maemo/nokia770/ts.conf index 24b00839e9..8eed62f7b9 100644 --- a/packages/tslib/tslib-maemo/nokia770/ts.conf +++ b/packages/tslib/tslib-maemo/nokia770/ts.conf @@ -1,2 +1,2 @@ module pressure -module linear
\ No newline at end of file +module linear diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb index 28a5f00fa9..6bc844e8dd 100644 --- a/packages/tslib/tslib-maemo_0.0.1-15.bb +++ b/packages/tslib/tslib-maemo_0.0.1-15.bb @@ -1,7 +1,8 @@ +DEFAULT_PREFERENCE = "-1" SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)." PR = "r1" -PROVIDES = "virtual/tslib" +PROVIDES = "tslib" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE}" @@ -37,6 +38,12 @@ do_install_append() { RDEPENDS_libts-maemo = "tslib-maemo-conf" +RPROVIDES_tslib-maemo-conf = "tslib-conf" +RPROVIDES_libts-maemo = "libts" +RPROVIDES_libts-maemo-dev = "libts-dev" +RPROVIDES_tslib-maemo-calibrate = "tslib-calibrate" +RPROVIDES_tslib-maemo-tests = "tslib-tests" + FILES_tslib-maemo-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" FILES_libts-maemo = "${libdir}/*.so.* ${datadir}/ts/plugins/*.so*" FILES_libts-maemo-dev = "${FILES_tslib-maemo-dev}" diff --git a/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xserver/xserver-kdrive-omap_6.6.3.bb index e4eed066dd..5b131de8bd 100644 --- a/packages/xserver/xserver-kdrive-omap_6.6.3.bb +++ b/packages/xserver/xserver-kdrive-omap_6.6.3.bb @@ -1,13 +1,12 @@ LICENSE = "MIT" DEPENDS = "xsp tslib-maemo xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext" -RDEPENDS = "libts-0.0-0" PROVIDES = "virtual/xserver" PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices" -PR = "r1" +PR = "r2" FILES_${PN} = "${bindir}/Xomap" |