pointercal_0.0.bb : revert changes made to make this package use MACHINE_CLASS

in openmoko. Turns out screens are very different calibration for gta01/02

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index e3ddd2165bb02a69538b4c72f578be261157583a..fc679a0b6833c3b647f2571ee9972c2d01a9c548 100644 (file)
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -4,6 +4,7 @@
 #@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
 #-----------------------------------------------------------------------------
 
+require conf/distro/include/preferred-om-2008-versions.inc
 require conf/distro/include/angstrom-2007-for-openmoko.inc
 
 #
@@ -47,11 +48,6 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
 # Same kernel runs on both these machines
 PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}"
-# Same touchscreen on both these machines
-PACKAGE_ARCH_pn-pointercal_fic-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-pointercal_fic-gta02 = "${MACHINE_CLASS}"
-SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta01 = "0"
-SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta02 = "0"
 # Same kernel so same usb
 PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}"

diff --git a/packages/pointercal/files/fic-gta02/pointercal b/packages/pointercal/files/fic-gta02/pointercal
index 198fd2a77676dd03e8d18275bd515dff3b1069a6..841ec7fab2e8e37afeb8c3afa1626a62d8fd1543 100644 (file)
Binary files a/packages/pointercal/files/fic-gta02/pointercal and b/packages/pointercal/files/fic-gta02/pointercal differ

diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb
index e79ee0b889b6a0290be2b070989f73ed60fc0c94..42aae8c0c0925d517ded0e771f21135b9d64ad68 100644 (file)
--- a/packages/pointercal/pointercal_0.0.bb
+++ b/packages/pointercal/pointercal_0.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Touchscreen calibration data"
 SECTION = "base"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "file://pointercal"
 S = "${WORKDIR}"