Patchwork dbus-wait: fix the help message typo

login
register
mail settings
Submitter jackie huang
Date June 17, 2013, 9:39 a.m.
Message ID <1371461969-16134-1-git-send-email-jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/51805/
State New
Headers show

Comments

jackie huang - June 17, 2013, 9:39 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../dbus-wait/dbus-wait/fix-dbus-wait-typo.patch   |   31 ++++++++++++++++++++
 meta/recipes-core/dbus-wait/dbus-wait_git.bb       |    6 ++-
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-core/dbus-wait/dbus-wait/fix-dbus-wait-typo.patch

--
1.7.4.1
Richard Purdie - June 17, 2013, 10:59 a.m.
On Mon, 2013-06-17 at 17:39 +0800, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>  .../dbus-wait/dbus-wait/fix-dbus-wait-typo.patch   |   31 ++++++++++++++++++++
>  meta/recipes-core/dbus-wait/dbus-wait_git.bb       |    6 ++-
>  2 files changed, 35 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-core/dbus-wait/dbus-wait/fix-dbus-wait-typo.patch

I took this but since the Yocto Project is the upstream for this, I
merged that, then updated the SRCREV instead.

Cheers,

Richard
jackie huang - June 17, 2013, 11:27 a.m.
On 6/17/2013 6:59 PM, Richard Purdie wrote:
> On Mon, 2013-06-17 at 17:39 +0800, jackie.huang@windriver.com wrote:
>> From: Jackie Huang <jackie.huang@windriver.com>
>>
>> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
>> ---
>>   .../dbus-wait/dbus-wait/fix-dbus-wait-typo.patch   |   31 ++++++++++++++++++++
>>   meta/recipes-core/dbus-wait/dbus-wait_git.bb       |    6 ++-
>>   2 files changed, 35 insertions(+), 2 deletions(-)
>>   create mode 100644 meta/recipes-core/dbus-wait/dbus-wait/fix-dbus-wait-typo.patch
>
> I took this but since the Yocto Project is the upstream for this, I
> merged that, then updated the SRCREV instead.

Ok, that's better, thanks!

Thanks,
Jackie

>
> Cheers,
>
> Richard
>
>

Patch

diff --git a/meta/recipes-core/dbus-wait/dbus-wait/fix-dbus-wait-typo.patch b/meta/recipes-core/dbus-wait/dbus-wait/fix-dbus-wait-typo.patch
new file mode 100644
index 0000000..d31a59e
--- /dev/null
+++ b/meta/recipes-core/dbus-wait/dbus-wait/fix-dbus-wait-typo.patch
@@ -0,0 +1,31 @@ 
+From ccba3bf3aa1d311e27a3ef0bd5cf1ce826a22cc9 Mon Sep 17 00:00:00 2001
+From: Song.Li <Song.Li@windriver.com>
+Date: Wed, 9 Jan 2013 17:29:48 +0800
+Subject: [PATCH] fix dbus-wait typo
+
+fix the help message typo
+
+Upstream-Status: Submitted [ross.burton@intel.com]
+
+Signed-off-by: Song.Li <Song.Li@windriver.com>
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ dbus-wait.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dbus-wait.c b/dbus-wait.c
+index b74c205..4d3e83a 100644
+--- a/dbus-wait.c
++++ b/dbus-wait.c
+@@ -56,7 +56,7 @@ main (int argc, char **argv)
+   char *match = NULL;
+
+   if (argc < 3 || argc > 4) {
+-    fprintf (stderr, "$ dbus-watch <INTERFACE> <MEMBER> [PATH]\n");
++    fprintf (stderr, "$ dbus-wait <INTERFACE> <MEMBER> [PATH]\n");
+     return EXIT_FAILURE;
+   }
+
+--
+1.7.1
+
diff --git a/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/meta/recipes-core/dbus-wait/dbus-wait_git.bb
index fb31662..5e2b6e4 100644
--- a/meta/recipes-core/dbus-wait/dbus-wait_git.bb
+++ b/meta/recipes-core/dbus-wait/dbus-wait_git.bb
@@ -8,9 +8,11 @@  DEPENDS = "dbus"

 SRCREV = "1a3e1343761b30750bed70e0fd688f6d3c7b3717"
 PV = "0.1+git${SRCPV}"
-PR = "r2"
+PR = "r3"

-SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+           file://fix-dbus-wait-typo.patch \
+"

 S = "${WORKDIR}/git"