<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugzilla.yoctoproject.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.6"
          urlbase="https://bugzilla.yoctoproject.org/"
          
          maintainer="it-coreprojects-helpdesk@linuxfoundation.org"
>

    <bug>
          <bug_id>8388</bug_id>
          
          <creation_ts>2015-09-24 11:11:56 +0000</creation_ts>
          <short_desc>modifying patch in middle of patch series leads to unrelated changes</short_desc>
          <delta_ts>2015-10-07 07:49:48 +0000</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>7</classification_id>
          <classification>Build System, Metadata &amp; Runtime</classification>
          <product>OE-Core</product>
          <component>devtools / tool chain</component>
          <version>unspecified</version>
          <rep_platform>x86</rep_platform>
          <op_sys>Multiple</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>Medium</priority>
          <bug_severity>normal</bug_severity>
          <target_milestone>2.0</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Jussi Kukkonen">jku</reporter>
          <assigned_to name="Paul Eggleton">bluelightning</assigned_to>
          <cc>meta.mr.watcher</cc>
    
    <cc>meta.watcher</cc>
          
          
          <cf_os>---</cf_os>
          <cf_regression_type>---</cf_regression_type>
          
          <cf_docchange>No (bug/feature does not impact docs)</cf_docchange>

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>54605</commentid>
    <comment_count>0</comment_count>
    <who name="Jussi Kukkonen">jku</who>
    <bug_when>2015-09-24 11:11:56 +0000</bug_when>
    <thetext>I did &quot;devtool modify -x connman ~/src/devtool/connman&quot;, then used &quot;git rebase --interactive&quot; to modify the first patch in the series (add_xuser_dbus_permission.patch), then did &quot;devtool update-recipe connman&quot;.

The resulting diff includes metadata changes in all other patches, see below. Things to note:
* hash changes, empty lines and version numbers are somewhat expected but still unwanted
* subject line changes as well?
* note how some message lines (Upstream-Status) are getting dropped since they are technically not part of the git message body. Arguably the patch is incorrect...


diff --git a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch b/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
index 5dc6fd6..d8e8028 100644
--- a/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
+++ b/meta/recipes-connectivity/connman/connman/0001-Detect-backtrace-API-availability-before-using-it.patch
@@ -1,14 +1,13 @@
-From 00d4447395725abaa651e12ed40095081e04011e Mon Sep 17 00:00:00 2001
+From c98397c8a29e2abc837f20c7f3f629feb277a5e0 Mon Sep 17 00:00:00 2001
 From: Khem Raj &lt;raj.khem@gmail.com&gt;
 Date: Sun, 13 Sep 2015 13:22:01 -0700
-Subject: [PATCH 1/3] Detect backtrace() API availability before using it
+Subject: [PATCH 2/4] Detect backtrace() API availability before using it
 
 C libraries besides glibc do not have backtrace() implemented
 
 Signed-off-by: Khem Raj &lt;raj.khem@gmail.com&gt;
----
-Upstream-Status: Pending
 
+---
  configure.ac | 2 ++
  src/log.c    | 5 ++---
  2 files changed, 4 insertions(+), 3 deletions(-)
@@ -51,5 +50,5 @@ index a693bd0..5b40c1f 100644
  }
 
 --
-2.5.1
+2.1.4
 
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index 0593427..e86bff9 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -1,7 +1,7 @@
-From 10b0d16d04b811b1ccd1f9b0cfe757bce8d876a1 Mon Sep 17 00:00:00 2001
+From fbd4e0d953ceb74f7fb87f52915986271d2bfa43 Mon Sep 17 00:00:00 2001
 From: Khem Raj &lt;raj.khem@gmail.com&gt;
 Date: Mon, 6 Apr 2015 23:02:21 -0700
-Subject: [PATCH 2/3] resolve: musl does not implement res_ninit
+Subject: [PATCH 3/4] resolve: musl does not implement res_ninit
 
 ported from
 http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
@@ -9,6 +9,7 @@ http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj &lt;raj.khem@gmail.com&gt;
+
 ---
  gweb/gresolv.c | 33 ++++++++++++---------------------
  1 file changed, 12 insertions(+), 21 deletions(-)
@@ -73,5 +74,5 @@ index 5cf7a9a..3ad8e70 100644
 
                if (!resolv-&gt;nameserver_list)
 --
-2.5.1
+2.1.4
 
diff --git a/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch b/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch
index 6327aa2..d0515ad 100644
--- a/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch
+++ b/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch
@@ -1,12 +1,11 @@
-From 67645a01a2f3f52625d8dd77f2811a9e213e1b7d Mon Sep 17 00:00:00 2001
+From db846f5909fd6be29f4b2397182012993998cc1f Mon Sep 17 00:00:00 2001
 From: Khem Raj &lt;raj.khem@gmail.com&gt;
 Date: Sun, 13 Sep 2015 13:28:20 -0700
-Subject: [PATCH] Fix header inclusions for musl
+Subject: [PATCH 4/4] Fix header inclusions for musl
 
 Signed-off-by: Khem Raj &lt;raj.khem@gmail.com&gt;
----
-Upstream-Status: Pending
 
+---
  gweb/gresolv.c        | 1 +
  plugins/wifi.c        | 3 +--
  src/tethering.c       | 2 --
@@ -81,5 +80,5 @@ index 551cae9..226ba86 100644
  #include &lt;netinet/in.h&gt;
  #include &lt;sys/types.h&gt;
 --
-2.5.1
+2.1.4
 
diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
index 707b3ca..666e87f 100644
--- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
+++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
@@ -1,9 +1,17 @@
-Because Poky doesn&apos;t support at_console we need to special-case the session
-user.
+From cd934d3de8a5336f26f7c13b3a0583d0054e6a73 Mon Sep 17 00:00:00 2001
+From: Ross Burton &lt;ross.burton@intel.com&gt;
+Date: Thu, 24 Sep 2015 13:31:57 +0300
+Subject: [PATCH 1/4] Because Poky doesn&apos;t support at_console we need to
+ special-case the session user.
 
 Upstream-Status: Inappropriate [configuration]
 
-Signed-off-by: Ross Burton &lt;ross.burton@intel.com&gt;
+Signed-off-by: Jussi Kukkonen &lt;jussi.kukkonen@intel.com&gt;
+
+---
+ src/connman-dbus.conf | 3 +++
+ vpn/vpn-dbus.conf     | 3 +++
+ 2 files changed, 6 insertions(+)
 
 diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
 index 98a773e..466809c 100644
@@ -19,3 +27,20 @@ index 98a773e..466809c 100644
      &lt;policy at_console=&quot;true&quot;&gt;
          &lt;allow send_destination=&quot;net.connman&quot;/&gt;
      &lt;/policy&gt;
+diff --git a/vpn/vpn-dbus.conf b/vpn/vpn-dbus.conf
+index 0f0c8da..9ad05b9 100644
+--- a/vpn/vpn-dbus.conf
++++ b/vpn/vpn-dbus.conf
+@@ -6,6 +6,9 @@
+         &lt;allow send_destination=&quot;net.connman.vpn&quot;/&gt;
+         &lt;allow send_interface=&quot;net.connman.vpn.Agent&quot;/&gt;
+     &lt;/policy&gt;
++    &lt;policy user=&quot;xuser&quot;&gt;
++        &lt;allow send_destination=&quot;net.connman&quot;/&gt;
++    &lt;/policy&gt;
+     &lt;policy at_console=&quot;true&quot;&gt;
+         &lt;allow send_destination=&quot;net.connman.vpn&quot;/&gt;
+     &lt;/policy&gt;
+--
+2.1.4
+</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>55011</commentid>
    <comment_count>1</comment_count>
    <who name="Paul Eggleton">bluelightning</who>
    <bug_when>2015-10-07 07:49:48 +0000</bug_when>
    <thetext>Fix merged to master:

http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e9616885fce0bef5009de851843efc83ab0a8ff3</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>