All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/1] xinput-calibrator: move it from meta-oe to oe-core
@ 2013-06-17 12:26 Laurentiu Palcu
  2013-06-17 12:26 ` [PATCH 1/1] " Laurentiu Palcu
  2013-07-01 13:57 ` [PATCH v2 0/1] " Laurentiu Palcu
  0 siblings, 2 replies; 15+ messages in thread
From: Laurentiu Palcu @ 2013-06-17 12:26 UTC (permalink / raw)
  To: openembedded-core

The following changes since commit 7abcaf14ec9cd760fe94c777f0cd8426163de2c5:

  oe-buildenv-internal: Fix exit verses return (2013-06-17 10:41:01 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib lpalcu/xinput-calibrator_oe-core
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/xinput-calibrator_oe-core

Laurentiu Palcu (1):
  xinput-calibrator: move it from meta-oe to oe-core

 .../pointercal-xinput/pointercal.xinput            |    1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   17 ++++++++
 .../xinput-calibrator/xinput-calibrator.service    |   11 ++++++
 .../xinput-calibrator/xinput-calibrator_git.bb     |   41 ++++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb

-- 
1.7.9.5



^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-06-17 12:26 [PATCH 0/1] xinput-calibrator: move it from meta-oe to oe-core Laurentiu Palcu
@ 2013-06-17 12:26 ` Laurentiu Palcu
  2013-06-17 15:15   ` Burton, Ross
  2013-07-01 13:57 ` [PATCH v2 0/1] " Laurentiu Palcu
  1 sibling, 1 reply; 15+ messages in thread
From: Laurentiu Palcu @ 2013-06-17 12:26 UTC (permalink / raw)
  To: openembedded-core

People using xserver-xorg that need to calibrate their touchscreen
devices would also need meta-oe. Bringing the recipes to oe-core will
make it easier for them.

Aditionaly, drop xterm RDEPENDS. Terminal is not needed to run the menu
item.

[YOCTO #4416]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../pointercal-xinput/pointercal.xinput            |    1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   17 ++++++++
 .../xinput-calibrator/xinput-calibrator.service    |   11 ++++++
 .../xinput-calibrator/xinput-calibrator_git.bb     |   41 ++++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb

diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
new file mode 100644
index 0000000..9633fc5
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
@@ -0,0 +1 @@
+# replace with valid machine specific pointercal.xinput
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
new file mode 100644
index 0000000..8423640
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+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
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
new file mode 100644
index 0000000..2301876
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Loads xinput calibration data
+ConditionPathExists=/etc/pointercal.xinput
+Requires=display-manager.service
+After=display-manager.service
+
+[Service]
+ExecStart=/usr/bin/xinput_calibrator_once.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
new file mode 100644
index 0000000..31e20f7
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "A generic touchscreen calibration program for X.Org"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a"
+DEPENDS = "virtual/libx11 libxi"
+
+PV = "0.7.5+git${SRCPV}"
+
+inherit autotools systemd
+
+SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
+SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
+           file://xinput-calibrator.service"
+
+S = "${WORKDIR}/git"
+
+# force native X11 ui as we don't have gtk+ in DEPENDS
+EXTRA_OECONF += "--with-gui=x11"
+
+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}/xdg/autostart
+    sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop
+    install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart
+
+    if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system
+    fi
+}
+
+FILES_${PN} += "${sysconfdir}/xdg/autostart"
+RDEPENDS_${PN} = "xinput"
+RRECOMMENDS_${PN} = "pointercal-xinput"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
-- 
1.7.9.5



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-06-17 12:26 ` [PATCH 1/1] " Laurentiu Palcu
@ 2013-06-17 15:15   ` Burton, Ross
  2013-06-18 10:58     ` Laurentiu Palcu
  0 siblings, 1 reply; 15+ messages in thread
From: Burton, Ross @ 2013-06-17 15:15 UTC (permalink / raw)
  To: Laurentiu Palcu; +Cc: openembedded-core

On 17 June 2013 13:26, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> People using xserver-xorg that need to calibrate their touchscreen
> devices would also need meta-oe. Bringing the recipes to oe-core will
> make it easier for them.
>
> Aditionaly, drop xterm RDEPENDS. Terminal is not needed to run the menu
> item.

I don't really like how there's a xdg-autostart desktop file and a
systemd service file for loading the calibration and performing
calibration - a single xsession file as xtscal does will be sufficient
and actually work in Sato as it can block the rest of the UI before
continuing.

Also persistent calibration doesn't work with non-root X users, so
maybe the tool should use ~/.pointercal.xinput if it can't write to
/etc.

Apart from that I've got a touchscreen that isn't X-axis-reversed now. :)

Ross


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-06-17 15:15   ` Burton, Ross
@ 2013-06-18 10:58     ` Laurentiu Palcu
  2013-06-18 13:02       ` Burton, Ross
  0 siblings, 1 reply; 15+ messages in thread
From: Laurentiu Palcu @ 2013-06-18 10:58 UTC (permalink / raw)
  To: Burton, Ross; +Cc: openembedded-core

On Mon, Jun 17, 2013 at 04:15:58PM +0100, Burton, Ross wrote:
> On 17 June 2013 13:26, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> > People using xserver-xorg that need to calibrate their touchscreen
> > devices would also need meta-oe. Bringing the recipes to oe-core will
> > make it easier for them.
> >
> > Aditionaly, drop xterm RDEPENDS. Terminal is not needed to run the menu
> > item.
> 
> I don't really like how there's a xdg-autostart desktop file and a
> systemd service file for loading the calibration and performing
> calibration - a single xsession file as xtscal does will be sufficient
> and actually work in Sato as it can block the rest of the UI before
> continuing.

I'm not sure I understand what's wrong with using xdg-autostart.
Xsession parses each .desktop file in xdg/autostart and executes the
application listed in 'Exec'. Having a separate xsession file created
in /etc/X11/Xsession.d (like xtscal does) is, basically, the same thing.
Only the moment of execution differs. Or, maybe, I misunderstood your
point.

> 
> Also persistent calibration doesn't work with non-root X users, so
> maybe the tool should use ~/.pointercal.xinput if it can't write to
> /etc.

We could easily change xinput_calibrator_once.sh to save/read the calibration
data either to/from /etc or ~.

Laurentiu

> 
> Apart from that I've got a touchscreen that isn't X-axis-reversed now. :)
> 
> Ross


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-06-18 10:58     ` Laurentiu Palcu
@ 2013-06-18 13:02       ` Burton, Ross
  0 siblings, 0 replies; 15+ messages in thread
From: Burton, Ross @ 2013-06-18 13:02 UTC (permalink / raw)
  To: Laurentiu Palcu; +Cc: openembedded-core

On 18 June 2013 11:58, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> I'm not sure I understand what's wrong with using xdg-autostart.
> Xsession parses each .desktop file in xdg/autostart and executes the
> application listed in 'Exec'. Having a separate xsession file created
> in /etc/X11/Xsession.d (like xtscal does) is, basically, the same thing.
> Only the moment of execution differs. Or, maybe, I misunderstood your
> point.

XDG autostart doesn't block the app, so the rest of the system starts
up.  Really calibration should pause the startup and only when the
input is calibrated, continue.

Ross


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH v2 0/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-06-17 12:26 [PATCH 0/1] xinput-calibrator: move it from meta-oe to oe-core Laurentiu Palcu
  2013-06-17 12:26 ` [PATCH 1/1] " Laurentiu Palcu
@ 2013-07-01 13:57 ` Laurentiu Palcu
  2013-07-01 13:57   ` [PATCH v2 1/1] " Laurentiu Palcu
  2013-07-12 12:04   ` [PATCH v3 0/1] xinput-calibrator: move it from meta-oe to oe-core (cover letter only) Laurentiu Palcu
  1 sibling, 2 replies; 15+ messages in thread
From: Laurentiu Palcu @ 2013-07-01 13:57 UTC (permalink / raw)
  To: openembedded-core

Changes in v2:
 * run calibration through xsession file;
 * allow normal user to write his calibration data to ~/.pointercal/pointercal.xinput
   and then use it when system boots;

Laurentiu

The following changes since commit 80b263430453896189b704d0997943642eec6fef:

  classes/insane: remove la2 check which no longer exists from ERROR_QA (2013-06-28 16:33:08 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib lpalcu/xinput-calibrator_oe-core
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/xinput-calibrator_oe-core

Laurentiu Palcu (1):
  xinput-calibrator: move it from meta-oe to oe-core

 .../pointercal-xinput/pointercal.xinput            |    1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   17 +++++
 .../xinput-calibrator/30xinput_calibrate.sh        |    7 +++
 ...t_calibrator_pointercal.sh-to-be-run-as-n.patch |   66 ++++++++++++++++++++
 .../xinput-calibrator/xinput-calibrator_git.bb     |   34 ++++++++++
 5 files changed, 125 insertions(+)
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb

-- 
1.7.9.5



^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH v2 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-07-01 13:57 ` [PATCH v2 0/1] " Laurentiu Palcu
@ 2013-07-01 13:57   ` Laurentiu Palcu
  2013-07-02 15:25     ` Burton, Ross
  2013-07-12 12:04   ` [PATCH v3 0/1] xinput-calibrator: move it from meta-oe to oe-core (cover letter only) Laurentiu Palcu
  1 sibling, 1 reply; 15+ messages in thread
From: Laurentiu Palcu @ 2013-07-01 13:57 UTC (permalink / raw)
  To: openembedded-core

People using xserver-xorg that need to calibrate their touchscreen
devices would also need meta-oe. Bringing the recipes to oe-core will
make it easier for them.

Aditionaly:
 * drop xterm RDEPENDS. Terminal is not needed to run the menu item;
 * change xinput_calibrator_pointercal.sh so that it can be run as
   normal user: pointercal.xinput is saved to ~/.pointercal/ and it will
   be used when the system boots;
 * have the calibration run through an Xsession file;
 * remove the systemd service since calibration is run by Xsession;

[YOCTO #4416]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../pointercal-xinput/pointercal.xinput            |    1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   17 +++++
 .../xinput-calibrator/30xinput_calibrate.sh        |    7 +++
 ...t_calibrator_pointercal.sh-to-be-run-as-n.patch |   66 ++++++++++++++++++++
 .../xinput-calibrator/xinput-calibrator_git.bb     |   34 ++++++++++
 5 files changed, 125 insertions(+)
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb

diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
new file mode 100644
index 0000000..9633fc5
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
@@ -0,0 +1 @@
+# replace with valid machine specific pointercal.xinput
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
new file mode 100644
index 0000000..8423640
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+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
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
new file mode 100644
index 0000000..5290726
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. /etc/formfactor/config
+
+if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
+	/usr/bin/xinput_calibrator_once.sh
+fi
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
new file mode 100644
index 0000000..8698292
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
@@ -0,0 +1,66 @@
+Upstream-Status: Pending
+
+From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001
+From: Laurentiu Palcu <laurentiu.palcu@intel.com>
+Date: Mon, 1 Jul 2013 15:38:02 +0300
+Subject: [PATCH] Allow xinput_calibrator_pointercal.sh to be run as normal
+ user
+
+Allow normal user to create their own pointercal.xinput files that
+override the system pointercal file in /etc.
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+---
+ scripts/xinput_calibrator_pointercal.sh |   33 +++++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 10 deletions(-)
+
+diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh
+index fccb197..0ada7da 100755
+--- a/scripts/xinput_calibrator_pointercal.sh
++++ b/scripts/xinput_calibrator_pointercal.sh
+@@ -11,19 +11,32 @@
+ PATH="/usr/bin:$PATH"
+ 
+ BINARY="xinput_calibrator"
+-CALFILE="/etc/pointercal.xinput"
+-LOGFILE="/var/log/xinput_calibrator.pointercal.log"
++SYS_CALFILE="/etc/pointercal.xinput"
++USER_CALFILE="$HOME/.pointercal/pointercal.xinput"
+ 
+-if [ -e $CALFILE ] ; then
+-  if grep replace $CALFILE ; then
+-    echo "Empty calibration file found, removing it"
+-    rm $CALFILE
+-  else
+-    echo "Using calibration data stored in $CALFILE"
+-    . $CALFILE && exit 0
+-  fi
++if [ "$USER" = "root" ]; then
++  LOGFILE="/var/log/xinput_calibrator.pointercal.log"
++  CALFILES="$SYS_CALFILE"
++else
++  LOGFILE="$HOME/.pointercal/xinput_calibrator.pointercal.log"
++  CALFILES="$USER_CALFILE $SYS_CALFILE"
++  mkdir -p "$HOME/.pointercal"
+ fi
+ 
++for CALFILE in $CALFILES; do
++  if [ -e $CALFILE ]; then
++    if grep replace $CALFILE ; then
++      echo "Empty calibration file found, removing it"
++      rm $CALFILE 2>/dev/null || true
++    else
++      echo "Using calibration data stored in $CALFILE"
++      . $CALFILE && exit 0
++    fi
++  fi
++done
++
++[ "$USER" != "root" ] && CALFILE=$USER_CALFILE
++
+ CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep '    xinput set' | sed 's/^    //g; s/$/;/g'`
+ if [ ! -z "$CALDATA" ] ; then
+   echo $CALDATA > $CALFILE
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
new file mode 100644
index 0000000..06872bc
--- /dev/null
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "A generic touchscreen calibration program for X.Org"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a"
+DEPENDS = "virtual/libx11 libxi"
+
+PV = "0.7.5+git${SRCPV}"
+
+inherit autotools systemd
+
+SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
+SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
+           file://30xinput_calibrate.sh \
+           file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch"
+
+S = "${WORKDIR}/git"
+
+# force native X11 ui as we don't have gtk+ in DEPENDS
+EXTRA_OECONF += "--with-gui=x11"
+
+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}/X11/Xsession.d/
+    install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/
+}
+
+RDEPENDS_${PN} = "xinput"
+RRECOMMENDS_${PN} = "pointercal-xinput"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
-- 
1.7.9.5



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-07-01 13:57   ` [PATCH v2 1/1] " Laurentiu Palcu
@ 2013-07-02 15:25     ` Burton, Ross
  2013-07-02 16:21       ` Laurentiu Palcu
  2013-07-02 16:50       ` Martin Jansa
  0 siblings, 2 replies; 15+ messages in thread
From: Burton, Ross @ 2013-07-02 15:25 UTC (permalink / raw)
  To: Laurentiu Palcu; +Cc: openembedded-core

On 1 July 2013 14:57, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> +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
> +}

The file always has content because the file in the main recipe has a
comment in.  Personally I think not installing a useless file is the
right thing to do, so we should change the default pointercal.xinput
to be empty.

Relatedly, interestingly Weston has a different approach and attaches
the calibration to the device using udev properties, which means
systems where touch devices can be hotplugged actually work.  I'm
incredibly tempted to extend xinput-calibrator to write out udev
fragments and make Xi respect them if they exist...

> +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
> +inherit autotools systemd

systemd?

> +RPROVIDES_${PN} += "${PN}-systemd"
> +RREPLACES_${PN} += "${PN}-systemd"
> +RCONFLICTS_${PN} += "${PN}-systemd"

It doesn't anymore, so these can be dropped.

Ross


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-07-02 15:25     ` Burton, Ross
@ 2013-07-02 16:21       ` Laurentiu Palcu
  2013-07-02 16:31         ` Burton, Ross
  2013-07-02 16:50       ` Martin Jansa
  1 sibling, 1 reply; 15+ messages in thread
From: Laurentiu Palcu @ 2013-07-02 16:21 UTC (permalink / raw)
  To: Burton, Ross; +Cc: openembedded-core



On 07/02/2013 06:25 PM, Burton, Ross wrote:
> On 1 July 2013 14:57, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
>> +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
>> +}
> 
> The file always has content because the file in the main recipe has a
> comment in.  Personally I think not installing a useless file is the
> right thing to do, so we should change the default pointercal.xinput
> to be empty.
Then why install it at all if it's empty? I believe a zero sized file in
/etc it's even worse.

> 
> Relatedly, interestingly Weston has a different approach and attaches
> the calibration to the device using udev properties, which means
> systems where touch devices can be hotplugged actually work.  I'm
> incredibly tempted to extend xinput-calibrator to write out udev
> fragments and make Xi respect them if they exist...
Ross, you requested (according to the description in bugzilla:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=4416#c0 ) to just move
xinput-calibrator to oe-core from meta-oe. Technically, the first
patchset did just that. It would have been easier for me, from the
planning point of view at least, if I had known in advance the
additional changes you needed for this package. I admit I don't know how
all packages in oe-core or meta-oe should or shouldn't work... I'm
working on improving that though. ;)

So, perhaps it would be better for all of us if you documented all these
additional change requests in bugzilla. Would that be OK with you?

> 
>> +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
>> +inherit autotools systemd
> 
> systemd?
Will be removed

> 
>> +RPROVIDES_${PN} += "${PN}-systemd"
>> +RREPLACES_${PN} += "${PN}-systemd"
>> +RCONFLICTS_${PN} += "${PN}-systemd"
> 
> It doesn't anymore, so these can be dropped.
Ack

Laurentiu


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-07-02 16:21       ` Laurentiu Palcu
@ 2013-07-02 16:31         ` Burton, Ross
  0 siblings, 0 replies; 15+ messages in thread
From: Burton, Ross @ 2013-07-02 16:31 UTC (permalink / raw)
  To: Laurentiu Palcu; +Cc: openembedded-core

On 2 July 2013 17:21, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
>> The file always has content because the file in the main recipe has a
>> comment in.  Personally I think not installing a useless file is the
>> right thing to do, so we should change the default pointercal.xinput
>> to be empty.
> Then why install it at all if it's empty? I believe a zero sized file in
> /etc it's even worse.

Exactly, this test will spot the empty file and not install it.

>> Relatedly, interestingly Weston has a different approach and attaches
>> the calibration to the device using udev properties, which means
>> systems where touch devices can be hotplugged actually work.  I'm
>> incredibly tempted to extend xinput-calibrator to write out udev
>> fragments and make Xi respect them if they exist...
>
> Ross, you requested (according to the description in bugzilla:
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=4416#c0 ) to just move
> xinput-calibrator to oe-core from meta-oe. Technically, the first
> patchset did just that. It would have been easier for me, from the
> planning point of view at least, if I had known in advance the
> additional changes you needed for this package. I admit I don't know how
> all packages in oe-core or meta-oe should or shouldn't work... I'm
> working on improving that though. ;)

My talk of udev properties is just talk, I should have made that
clear: it's nothing I expect you to do.  Once the systemd bits are
purged entirely, I'm happy to see this merged.

Cheers,
Ross


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-07-02 15:25     ` Burton, Ross
  2013-07-02 16:21       ` Laurentiu Palcu
@ 2013-07-02 16:50       ` Martin Jansa
  2013-07-02 17:01         ` Paul Eggleton
  1 sibling, 1 reply; 15+ messages in thread
From: Martin Jansa @ 2013-07-02 16:50 UTC (permalink / raw)
  To: Burton, Ross; +Cc: openembedded-core

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

On Tue, Jul 02, 2013 at 04:25:19PM +0100, Burton, Ross wrote:
> On 1 July 2013 14:57, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> > +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
> > +}
> 
> The file always has content because the file in the main recipe has a
> comment in.  Personally I think not installing a useless file is the
> right thing to do, so we should change the default pointercal.xinput
> to be empty.
> 
> Relatedly, interestingly Weston has a different approach and attaches
> the calibration to the device using udev properties, which means
> systems where touch devices can be hotplugged actually work.  I'm
> incredibly tempted to extend xinput-calibrator to write out udev
> fragments and make Xi respect them if they exist...
> 
> > +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
> > +inherit autotools systemd
> 
> systemd?
> 
> > +RPROVIDES_${PN} += "${PN}-systemd"
> > +RREPLACES_${PN} += "${PN}-systemd"
> > +RCONFLICTS_${PN} += "${PN}-systemd"
> 
> It doesn't anymore, so these can be dropped.

That means that xinput-calibrator-systemd will stay installed on devices
which already have it.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 1/1] xinput-calibrator: move it from meta-oe to oe-core
  2013-07-02 16:50       ` Martin Jansa
@ 2013-07-02 17:01         ` Paul Eggleton
  0 siblings, 0 replies; 15+ messages in thread
From: Paul Eggleton @ 2013-07-02 17:01 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembedded-core

On Tuesday 02 July 2013 18:50:27 Martin Jansa wrote:
> On Tue, Jul 02, 2013 at 04:25:19PM +0100, Burton, Ross wrote:
> > > +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
> > > +inherit autotools systemd
> > 
> > systemd?
> > 
> > > +RPROVIDES_${PN} += "${PN}-systemd"
> > > +RREPLACES_${PN} += "${PN}-systemd"
> > > +RCONFLICTS_${PN} += "${PN}-systemd"
> > 
> > It doesn't anymore, so these can be dropped.
> 
> That means that xinput-calibrator-systemd will stay installed on devices
> which already have it.

I'd suggest solving that with a bbappend in meta-systemd as with the rest of 
these.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH v3 0/1] xinput-calibrator: move it from meta-oe to oe-core (cover letter only)
  2013-07-01 13:57 ` [PATCH v2 0/1] " Laurentiu Palcu
  2013-07-01 13:57   ` [PATCH v2 1/1] " Laurentiu Palcu
@ 2013-07-12 12:04   ` Laurentiu Palcu
  2013-07-17 12:40     ` Paul Eggleton
  2013-07-22 14:13     ` [PATCH v4 " Laurentiu Palcu
  1 sibling, 2 replies; 15+ messages in thread
From: Laurentiu Palcu @ 2013-07-12 12:04 UTC (permalink / raw)
  To: openembedded-core

Changes in v3:
 * do not install pointercal.xinput if it's the default one;

Changes in v2:
 * run calibration through xsession file;
 * allow normal user to write his calibration data to ~/.pointercal/pointercal.xinput
   and then use it when system boots;

Laurentiu

The following changes since commit a63229917a5708de2d161aba0d67168ce0da6365:

  meta-yocto-bsp: update reference board SRCREVs (2013-07-10 09:45:51 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib lpalcu/xinput-calibrator_oe-core_v3
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/xinput-calibrator_oe-core_v3

Laurentiu Palcu (1):
  xinput-calibrator: move it from meta-oe to oe-core

 .../pointercal-xinput/pointercal.xinput            |    1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   18 ++++++
 .../xinput-calibrator/30xinput_calibrate.sh        |    7 +++
 ...t_calibrator_pointercal.sh-to-be-run-as-n.patch |   66 ++++++++++++++++++++
 .../xinput-calibrator/xinput-calibrator_git.bb     |   30 +++++++++
 5 files changed, 122 insertions(+)
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb

-- 
1.7.9.5



^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v3 0/1] xinput-calibrator: move it from meta-oe to oe-core (cover letter only)
  2013-07-12 12:04   ` [PATCH v3 0/1] xinput-calibrator: move it from meta-oe to oe-core (cover letter only) Laurentiu Palcu
@ 2013-07-17 12:40     ` Paul Eggleton
  2013-07-22 14:13     ` [PATCH v4 " Laurentiu Palcu
  1 sibling, 0 replies; 15+ messages in thread
From: Paul Eggleton @ 2013-07-17 12:40 UTC (permalink / raw)
  To: openembedded-core

Hi Laurentiu,

On Friday 12 July 2013 15:04:02 Laurentiu Palcu wrote:
> Changes in v3:
>  * do not install pointercal.xinput if it's the default one;
> 
> Changes in v2:
>  * run calibration through xsession file;
>  * allow normal user to write his calibration data to
> ~/.pointercal/pointercal.xinput and then use it when system boots;

I'm not sure if you saw, but I noticed when this was in Saul's consolidated 
pull that this drops PR (previous value was "r6"). I know it seems trivial but 
we're not increasing PV so if we hope to supersede the recipe from meta-oe, 
this will have to be preserved. Same goes for pointercal-xinput which had a PR 
value of "r4". Thus, this patch hasn't yet been merged.

Could you send a v4 which restores these?

Thanks,
Paul 

-- 

Paul Eggleton
Intel Open Source Technology Centre


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH v4 0/1] xinput-calibrator: move it from meta-oe to oe-core (cover letter only)
  2013-07-12 12:04   ` [PATCH v3 0/1] xinput-calibrator: move it from meta-oe to oe-core (cover letter only) Laurentiu Palcu
  2013-07-17 12:40     ` Paul Eggleton
@ 2013-07-22 14:13     ` Laurentiu Palcu
  1 sibling, 0 replies; 15+ messages in thread
From: Laurentiu Palcu @ 2013-07-22 14:13 UTC (permalink / raw)
  To: openembedded-core

Changes in v4:
 * restore original PR for both recipes;

Changes in v3:
 * do not install pointercal.xinput if it's the default one;

Changes in v2:
 * run calibration through xsession file;
 * allow normal user to write his calibration data to ~/.pointercal/pointercal.xinput
   and then use it when system boots;

Laurentiu

The following changes since commit 31e6eee860b5f9f4ac9ef0889bcff5648de6e3f9:

  poky-tiny.conf: blacklist core-image-weston option (2013-07-18 21:26:58 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib lpalcu/xinput-calibrator_oe-core_v4
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/xinput-calibrator_oe-core_v4

Laurentiu Palcu (1):
  xinput-calibrator: move it from meta-oe to oe-core

 .../pointercal-xinput/pointercal.xinput            |    1 +
 .../xinput-calibrator/pointercal-xinput_0.0.bb     |   20 ++++++
 .../xinput-calibrator/30xinput_calibrate.sh        |    7 +++
 ...t_calibrator_pointercal.sh-to-be-run-as-n.patch |   66 ++++++++++++++++++++
 .../xinput-calibrator/xinput-calibrator_git.bb     |   31 +++++++++
 5 files changed, 125 insertions(+)
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
 create mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
 create mode 100644 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb

-- 
1.7.9.5



^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2013-07-22 14:13 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-17 12:26 [PATCH 0/1] xinput-calibrator: move it from meta-oe to oe-core Laurentiu Palcu
2013-06-17 12:26 ` [PATCH 1/1] " Laurentiu Palcu
2013-06-17 15:15   ` Burton, Ross
2013-06-18 10:58     ` Laurentiu Palcu
2013-06-18 13:02       ` Burton, Ross
2013-07-01 13:57 ` [PATCH v2 0/1] " Laurentiu Palcu
2013-07-01 13:57   ` [PATCH v2 1/1] " Laurentiu Palcu
2013-07-02 15:25     ` Burton, Ross
2013-07-02 16:21       ` Laurentiu Palcu
2013-07-02 16:31         ` Burton, Ross
2013-07-02 16:50       ` Martin Jansa
2013-07-02 17:01         ` Paul Eggleton
2013-07-12 12:04   ` [PATCH v3 0/1] xinput-calibrator: move it from meta-oe to oe-core (cover letter only) Laurentiu Palcu
2013-07-17 12:40     ` Paul Eggleton
2013-07-22 14:13     ` [PATCH v4 " Laurentiu Palcu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.