[oe-commits] Martin Jansa : xinput-calibrator: add INC_PR, move machine specific file to separate recipe
git version control
git at git.openembedded.org
Wed Jun 2 07:56:42 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: fb641200b65b3d3c465332efb1febab7001eff47
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fb641200b65b3d3c465332efb1febab7001eff47
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Wed Jun 2 09:19:37 2010 +0200
xinput-calibrator: add INC_PR, move machine specific file to separate recipe
* sorry for making whole xinput-calibrator machine specific before, this
way it should be better for upgrades (as proved by normal pointercal
for tslib)
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../om-gta01}/pointercal.xinput | 0
.../om-gta02/pointercal.xinput | 0
.../{files => pointercal-xinput}/pointercal.xinput | 0
recipes/xinput-calibrator/pointercal-xinput_0.0.bb | 18 ++++++++++++++++++
recipes/xinput-calibrator/xinput-calibrator.inc | 3 ++-
.../xinput-calibrator/xinput-calibrator_0.5.0.bb | 2 +-
.../xinput-calibrator/xinput-calibrator_0.6.0.bb | 2 +-
.../xinput-calibrator/xinput-calibrator_0.6.1.bb | 10 ++--------
recipes/xinput-calibrator/xinput-calibrator_git.bb | 1 +
9 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/recipes/xinput-calibrator/files/om-gta02/pointercal.xinput b/recipes/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput
similarity index 100%
copy from recipes/xinput-calibrator/files/om-gta02/pointercal.xinput
copy to recipes/xinput-calibrator/pointercal-xinput/om-gta01/pointercal.xinput
diff --git a/recipes/xinput-calibrator/files/om-gta02/pointercal.xinput b/recipes/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput
similarity index 100%
rename from recipes/xinput-calibrator/files/om-gta02/pointercal.xinput
rename to recipes/xinput-calibrator/pointercal-xinput/om-gta02/pointercal.xinput
diff --git a/recipes/xinput-calibrator/files/pointercal.xinput b/recipes/xinput-calibrator/pointercal-xinput/pointercal.xinput
similarity index 100%
rename from recipes/xinput-calibrator/files/pointercal.xinput
rename to recipes/xinput-calibrator/pointercal-xinput/pointercal.xinput
diff --git a/recipes/xinput-calibrator/pointercal-xinput_0.0.bb b/recipes/xinput-calibrator/pointercal-xinput_0.0.bb
new file mode 100644
index 0000000..9a2d7ab
--- /dev/null
+++ b/recipes/xinput-calibrator/pointercal-xinput_0.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
+LICENSE = "MIT/X11"
+SECTION = "base"
+
+SRC_URI = "file://pointercal.xinput"
+S = "${WORKDIR}"
+
+do_install() {
+ # Only install file if it has a contents
+ if [ -s ${S}/pointercal.xinput ]; then
+ install -d ${D}${sysconfdir}/
+ install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/
+ fi
+}
+
+ALLOW_EMPTY_${PN} = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
diff --git a/recipes/xinput-calibrator/xinput-calibrator.inc b/recipes/xinput-calibrator/xinput-calibrator.inc
index fad0786..357b0e5 100644
--- a/recipes/xinput-calibrator/xinput-calibrator.inc
+++ b/recipes/xinput-calibrator/xinput-calibrator.inc
@@ -2,6 +2,7 @@ DESCRIPTION = "A generic touchscreen calibration program for X.Org"
HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
LICENSE = "MIT/X11"
DEPENDS = "virtual/libx11 libxi"
-RDEPENDS_${PN} = "xinput"
+RDEPENDS_${PN} = "xinput pointercal-xinput"
+INC_PR = "r7"
inherit autotools
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
index 71d7931..ba04865 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
@@ -1,6 +1,6 @@
require xinput-calibrator.inc
-PR = "r6"
+PR = "${INC_PR}.0"
SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
file://xinput-calibrator.desktop \
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb
index 0e2c435..06f46d0 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb
@@ -6,7 +6,7 @@ SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
SRCREV = "d6e01d780001948f55006698e8e9e48c12894810"
S = "${WORKDIR}/git/"
-PR = "r2"
+PR = "${INC_PR}.0"
do_install_append() {
install -d ${D}${bindir}
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
index 8d0f245..7dc6f29 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
@@ -1,22 +1,16 @@
require xinput-calibrator.inc
-SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
- file://pointercal.xinput \
-"
+SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git"
SRCREV = "d2ce98b3f638667dd64b6d718721379b2dc750a7"
-PR = "r1"
+PR = "${INC_PR}.0"
S = "${WORKDIR}/git/"
do_install_append() {
install -d ${D}${bindir}
install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
- install -d ${D}${sysconfdir}
- install -m 0644 ${WORKDIR}/pointercal.xinput ${D}${sysconfdir}/pointercal.xinput
ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
install -d ${D}${datadir}/applications/
install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop
install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
}
-
-CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
diff --git a/recipes/xinput-calibrator/xinput-calibrator_git.bb b/recipes/xinput-calibrator/xinput-calibrator_git.bb
index 5fceed1..c6188e6 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_git.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_git.bb
@@ -1,6 +1,7 @@
require xinput-calibrator.inc
PV = "0.6.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"
SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git;branch=misclick"
More information about the Openembedded-commits
mailing list