[oe] [meta-oe][PATCH 23/37] python-autmat: refresh patches

Armin Kuster akuster808 at gmail.com
Sun Apr 8 06:58:35 UTC 2018


WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file configure.ac
Hunk #1 succeeded at 7 with fuzz 2.

Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../0001-setup.py-remove-the-dependency-on-m2r.patch        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch b/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch
index 0ebb220..d6def98 100644
--- a/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch
+++ b/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch
@@ -15,10 +15,10 @@ Signed-off-by: Derek Straka <derek at asterius.io>
  setup.py | 10 ----------
  1 file changed, 10 deletions(-)
 
-diff --git a/setup.py b/setup.py
-index d360c64..7b4180a 100644
---- a/setup.py
-+++ b/setup.py
+Index: Automat-0.6.0/setup.py
+===================================================================
+--- Automat-0.6.0.orig/setup.py
++++ Automat-0.6.0/setup.py
 @@ -4,14 +4,6 @@ Setup file for automat
  
  from setuptools import setup, find_packages
@@ -46,7 +46,4 @@ index d360c64..7b4180a 100644
 -        'm2r',
      ],
      install_requires=[
-         "attrs>=16.1.0",
--- 
-2.7.4
-
+         "attrs",
-- 
2.7.4




More information about the Openembedded-devel mailing list