Skip to content

Commit d564b48

Browse files
yizhao1akuster
authored andcommitted
python-m2crypto: refresh patch
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]>
1 parent d2ae597 commit d564b48

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001
1+
From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001
22
From: Koen Kooi <[email protected]>
33
Date: Fri, 29 Mar 2013 15:17:17 +0100
44
Subject: [PATCH] setup.py: link in sysroot, not in host directories
@@ -10,20 +10,20 @@ Upstream-status: Unknown
1010
setup.py | 6 +++---
1111
1 file changed, 3 insertions(+), 3 deletions(-)
1212

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

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

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

3535
if platform.system() == "Linux":
3636
if _multiarch: # on Fedora/RHEL it is an empty string
37+
--
38+
2.7.4
39+

0 commit comments

Comments
 (0)