Skip to content

Commit

Permalink
python-m2crypto: refresh patch
Browse files Browse the repository at this point in the history
Fix QA warning:

WARNING: python-m2crypto-native-0.26.4-r0 do_patch:
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:
Applying patch
0001-setup.py-link-in-sysroot-not-in-host-directories.patch
patching file setup.py
Hunk #1 succeeded at 127 with fuzz 1 (offset 65 lines).
Hunk #2 succeeded at 143 (offset 68 lines).

Now at patch 0001-setup.py-link-in-sysroot-not-in-host-directories.patch

Signed-off-by: Yi Zhao <[email protected]>
Signed-off-by: Armin Kuster <[email protected]>
  • Loading branch information
yizhao1 authored and akuster committed Apr 9, 2018
1 parent d2ae597 commit d564b48
Showing 1 changed file with 11 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001
From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001
From: Koen Kooi <[email protected]>
Date: Fri, 29 Mar 2013 15:17:17 +0100
Subject: [PATCH] setup.py: link in sysroot, not in host directories
Expand All @@ -10,20 +10,20 @@ Upstream-status: Unknown
setup.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Index: M2Crypto-0.23.0/setup.py
===================================================================
--- M2Crypto-0.23.0.orig/setup.py
+++ M2Crypto-0.23.0/setup.py
@@ -62,7 +62,7 @@ class _M2CryptoBuildExt(build_ext.build_
self.openssl = 'c:\\pkg'
diff --git a/setup.py b/setup.py
index 3407c82..15ed7cd 100644
--- a/setup.py
+++ b/setup.py
@@ -127,7 +127,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
self.openssl = os.path.join(self.openssl, 'OpenSSL')
else:
self.libraries = ['ssl', 'crypto']
- self.openssl = '/usr'
+ self.openssl = os.environ.get( "STAGING_DIR" )

def finalize_options(self):
'''Overloaded build_ext implementation to append custom openssl
@@ -75,8 +75,8 @@ class _M2CryptoBuildExt(build_ext.build_
@@ -143,8 +143,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
if _openssl and os.path.isdir(_openssl):
self.openssl = _openssl

Expand All @@ -34,3 +34,6 @@ Index: M2Crypto-0.23.0/setup.py

if platform.system() == "Linux":
if _multiarch: # on Fedora/RHEL it is an empty string
--
2.7.4

0 comments on commit d564b48

Please sign in to comment.