public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: "Maxin B. John" <maxin.john@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 05/10] xinput-calibrator: remove bash dependency
Date: Wed, 10 Aug 2016 12:30:24 +0300	[thread overview]
Message-ID: <1470821429-6094-6-git-send-email-maxin.john@intel.com> (raw)
In-Reply-To: <1470821429-6094-1-git-send-email-maxin.john@intel.com>

Refresh add-geometry-input-when-calibrating.patch to remove
bashism from it.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 .../add-geometry-input-when-calibrating.patch      | 31 +++++++++++-----------
 .../xinput-calibrator/xinput-calibrator_git.bb     |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
index 9351331..9dc94ae 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
@@ -1,33 +1,34 @@
-Upstream-Status: Inappropriate [no longer maintained]
-
-From 93abf28d602da637376b78de8c88b7ab5cf13b4f Mon Sep 17 00:00:00 2001
-From: Jonathan David <jonathan.david@ni.com>
-Date: Mon, 30 Nov 2015 12:12:20 -0600
+From 1cb83759632bb218559c4d0d65ff79f868c03dc5 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <maxin.john@intel.com>
+Date: Tue, 9 Aug 2016 17:03:31 +0300
 Subject: [PATCH] add geometry input when calibrating
 
 Send monitor geometry to xinput_calibrator when running the script
+Update:
+        Remove bashism
+
+Upstream-Status: Inappropriate [no longer maintained]
 
 Signed-off-by: Jonathan David <jonathan.david@ni.com>
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
 ---
- scripts/xinput_calibrator_pointercal.sh | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ scripts/xinput_calibrator_pointercal.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh
-index 0ada7da..6a3aded 100755
+index fccb197..fea7c2f 100755
 --- a/scripts/xinput_calibrator_pointercal.sh
 +++ b/scripts/xinput_calibrator_pointercal.sh
-@@ -37,7 +37,10 @@ done
- 
- [ "$USER" != "root" ] && CALFILE=$USER_CALFILE
+@@ -24,7 +24,8 @@ if [ -e $CALFILE ] ; then
+   fi
+ fi
  
 -CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep '    xinput set' | sed 's/^    //g; s/$/;/g'`
-+read RESOLUTION <<< $(xrandr | awk -F '[[:space:]+]' '/ connected/ \
-+  { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }')
-+
++RESOLUTION=$(xrandr | awk -F '[[:space:]+]' '/ connected/ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }')
 +CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep '    xinput set' | sed 's/^    //g; s/$/;/g'`
  if [ ! -z "$CALDATA" ] ; then
    echo $CALDATA > $CALFILE
    echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
 -- 
-1.9.1
+2.4.0
 
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 98ce7ee..57c3a7a 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -34,5 +34,5 @@ do_install_append() {
 }
 
 FILES_${PN} += "${sysconfdir}/xdg/autostart"
-RDEPENDS_${PN} = "xinput formfactor xrandr bash"
+RDEPENDS_${PN} = "xinput formfactor xrandr"
 RRECOMMENDS_${PN} = "pointercal-xinput"
-- 
2.4.0



  parent reply	other threads:[~2016-08-10  9:29 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-10  9:30 [PATCH v2 00/10] replace xtscal with xinput-calibrator Maxin B. John
2016-08-10  9:30 ` [PATCH 01/10] xtscal: remove recipe Maxin B. John
2016-08-10  9:30 ` [PATCH 02/10] x11-common: replace xtscal with xinput-calibrator Maxin B. John
2016-08-10  9:30 ` [PATCH 03/10] pointercal-xinput: add a dummy calibration file for qemu Maxin B. John
2016-08-10  9:30 ` [PATCH 04/10] packagegroup-core-x11-base.bb: remove pointercal Maxin B. John
2016-08-10  9:30 ` Maxin B. John [this message]
2016-08-10  9:30 ` [PATCH 06/10] pointercal: remove recipe Maxin B. John
2016-08-10  9:30 ` [PATCH 07/10] tslib: " Maxin B. John
2016-08-16 21:39   ` Burton, Ross
2016-08-17  9:33     ` Maxin B. John
2016-08-28 14:19   ` Enrico Scholz
2016-08-10  9:30 ` [PATCH 08/10] packagegroup-core-tools-testapps: remove tslib references Maxin B. John
2016-08-10  9:30 ` [PATCH 09/10] distro_alias.inc: remove xtscal, pointercal and " Maxin B. John
2016-08-10  9:30 ` [PATCH 10/10] layer.conf: remove pointercal Maxin B. John
2016-08-10  9:58 ` [PATCH v2 00/10] replace xtscal with xinput-calibrator Martin Jansa
2016-08-10 11:10   ` Maxin B. John

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1470821429-6094-6-git-send-email-maxin.john@intel.com \
    --to=maxin.john@intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox