| Message ID | 1364567102-6409-1-git-send-email-koen@dominion.thruhere.net |
|---|---|
| State | Accepted |
| Commit | 7d6f5f468566b7f475da246328ff95844ba60f61 |
| Headers | show |
diff --git a/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch new file mode 100644 index 0000000..bcbdf24 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch @@ -0,0 +1,39 @@ +From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Fri, 29 Mar 2013 15:17:17 +0100 +Subject: [PATCH] setup.py: link in sysroot, not in host directories + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> + +Upstream-status: Unknown +--- + setup.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index e7c49eb..8deaa34 100644 +--- a/setup.py ++++ b/setup.py +@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): + self.openssl = 'c:\\pkg' + else: + self.libraries = ['ssl', 'crypto'] +- self.openssl = '/usr' ++ self.openssl = os.environ.get( "STAGING_DIR" ) + + + def finalize_options(self): +@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): + + build_ext.build_ext.finalize_options(self) + +- opensslIncludeDir = os.path.join(self.openssl, 'include') +- opensslLibraryDir = os.path.join(self.openssl, 'lib') ++ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) ++ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) + + self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ + [opensslIncludeDir]] +-- +1.8.1.4 + diff --git a/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb new file mode 100644 index 0000000..9babc04 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "A Python crypto and SSL toolkit" +HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto" + +DEPENDS = "openssl swig-native" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" + +SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ + file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch" + +SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" +SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" + +S = "${WORKDIR}/M2Crypto-${PV}" + +inherit setuptools + +BBCLASSEXTEND = "native"
Hey Koen, [[oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.03.29 (Fri 15:25) Koen Kooi wrote: > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > --- > ...y-link-in-sysroot-not-in-host-directories.patch | 39 ++++++++++++++++++++++ > .../python/python-m2crypto_0.21.1.bb | 19 +++++++++++ > 2 files changed, 58 insertions(+) > create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > > diff --git a/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > new file mode 100644 > index 0000000..bcbdf24 > --- /dev/null > +++ b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > @@ -0,0 +1,39 @@ > +From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 > +From: Koen Kooi <koen@dominion.thruhere.net> > +Date: Fri, 29 Mar 2013 15:17:17 +0100 > +Subject: [PATCH] setup.py: link in sysroot, not in host directories > + > +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > + > +Upstream-status: Unknown Does this mean you haven't determined if it should be sent upstream yet, or you did and it's gone off into an apparent black hole of a mailing list somewhere? -J. > +--- > + setup.py | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/setup.py b/setup.py > +index e7c49eb..8deaa34 100644 > +--- a/setup.py > ++++ b/setup.py > +@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): > + self.openssl = 'c:\\pkg' > + else: > + self.libraries = ['ssl', 'crypto'] > +- self.openssl = '/usr' > ++ self.openssl = os.environ.get( "STAGING_DIR" ) > + > + > + def finalize_options(self): > +@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): > + > + build_ext.build_ext.finalize_options(self) > + > +- opensslIncludeDir = os.path.join(self.openssl, 'include') > +- opensslLibraryDir = os.path.join(self.openssl, 'lib') > ++ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) > ++ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) > + > + self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ > + [opensslIncludeDir]] > +-- > +1.8.1.4 > + > diff --git a/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > new file mode 100644 > index 0000000..9babc04 > --- /dev/null > +++ b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > @@ -0,0 +1,19 @@ > +DESCRIPTION = "A Python crypto and SSL toolkit" > +HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto" > + > +DEPENDS = "openssl swig-native" > + > +LICENSE = "BSD" > +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" > + > +SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ > + file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch" > + > +SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" > +SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" > + > +S = "${WORKDIR}/M2Crypto-${PV}" > + > +inherit setuptools > + > +BBCLASSEXTEND = "native"
Op 1 apr. 2013, om 20:13 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > Hey Koen, > > [[oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.03.29 (Fri 15:25) Koen Kooi wrote: > >> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >> --- >> ...y-link-in-sysroot-not-in-host-directories.patch | 39 ++++++++++++++++++++++ >> .../python/python-m2crypto_0.21.1.bb | 19 +++++++++++ >> 2 files changed, 58 insertions(+) >> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch >> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb >> >> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch >> new file mode 100644 >> index 0000000..bcbdf24 >> --- /dev/null >> +++ b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch >> @@ -0,0 +1,39 @@ >> +From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 >> +From: Koen Kooi <koen@dominion.thruhere.net> >> +Date: Fri, 29 Mar 2013 15:17:17 +0100 >> +Subject: [PATCH] setup.py: link in sysroot, not in host directories >> + >> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >> + >> +Upstream-status: Unknown > > Does this mean you haven't determined if it should be sent upstream yet, > or you did and it's gone off into an apparent black hole of a mailing > list somewhere? The former > > -J. > >> +--- >> + setup.py | 6 +++--- >> + 1 file changed, 3 insertions(+), 3 deletions(-) >> + >> +diff --git a/setup.py b/setup.py >> +index e7c49eb..8deaa34 100644 >> +--- a/setup.py >> ++++ b/setup.py >> +@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): >> + self.openssl = 'c:\\pkg' >> + else: >> + self.libraries = ['ssl', 'crypto'] >> +- self.openssl = '/usr' >> ++ self.openssl = os.environ.get( "STAGING_DIR" ) >> + >> + >> + def finalize_options(self): >> +@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): >> + >> + build_ext.build_ext.finalize_options(self) >> + >> +- opensslIncludeDir = os.path.join(self.openssl, 'include') >> +- opensslLibraryDir = os.path.join(self.openssl, 'lib') >> ++ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) >> ++ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) >> + >> + self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ >> + [opensslIncludeDir]] >> +-- >> +1.8.1.4 >> + >> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb >> new file mode 100644 >> index 0000000..9babc04 >> --- /dev/null >> +++ b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb >> @@ -0,0 +1,19 @@ >> +DESCRIPTION = "A Python crypto and SSL toolkit" >> +HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto" >> + >> +DEPENDS = "openssl swig-native" >> + >> +LICENSE = "BSD" >> +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" >> + >> +SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ >> + file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch" >> + >> +SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" >> +SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" >> + >> +S = "${WORKDIR}/M2Crypto-${PV}" >> + >> +inherit setuptools >> + >> +BBCLASSEXTEND = "native" > -- > -Joe MacDonald. > :wq
[Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 20:15) Koen Kooi wrote: > > Op 1 apr. 2013, om 20:13 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > > > Hey Koen, > > > > [[oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.03.29 (Fri 15:25) Koen Kooi wrote: > > > >> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > >> --- > >> ...y-link-in-sysroot-not-in-host-directories.patch | 39 ++++++++++++++++++++++ > >> .../python/python-m2crypto_0.21.1.bb | 19 +++++++++++ > >> 2 files changed, 58 insertions(+) > >> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > >> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > >> > >> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > >> new file mode 100644 > >> index 0000000..bcbdf24 > >> --- /dev/null > >> +++ b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > >> @@ -0,0 +1,39 @@ > >> +From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 > >> +From: Koen Kooi <koen@dominion.thruhere.net> > >> +Date: Fri, 29 Mar 2013 15:17:17 +0100 > >> +Subject: [PATCH] setup.py: link in sysroot, not in host directories > >> + > >> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > >> + > >> +Upstream-status: Unknown > > > > Does this mean you haven't determined if it should be sent upstream yet, > > or you did and it's gone off into an apparent black hole of a mailing > > list somewhere? > > The former Okay. Isn't that normally 'Pending' then? I can make that tweak in my merge, but I wanted to confirm I had the right information there first. -J. > > > > > -J. > > > >> +--- > >> + setup.py | 6 +++--- > >> + 1 file changed, 3 insertions(+), 3 deletions(-) > >> + > >> +diff --git a/setup.py b/setup.py > >> +index e7c49eb..8deaa34 100644 > >> +--- a/setup.py > >> ++++ b/setup.py > >> +@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): > >> + self.openssl = 'c:\\pkg' > >> + else: > >> + self.libraries = ['ssl', 'crypto'] > >> +- self.openssl = '/usr' > >> ++ self.openssl = os.environ.get( "STAGING_DIR" ) > >> + > >> + > >> + def finalize_options(self): > >> +@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): > >> + > >> + build_ext.build_ext.finalize_options(self) > >> + > >> +- opensslIncludeDir = os.path.join(self.openssl, 'include') > >> +- opensslLibraryDir = os.path.join(self.openssl, 'lib') > >> ++ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) > >> ++ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) > >> + > >> + self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ > >> + [opensslIncludeDir]] > >> +-- > >> +1.8.1.4 > >> + > >> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > >> new file mode 100644 > >> index 0000000..9babc04 > >> --- /dev/null > >> +++ b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > >> @@ -0,0 +1,19 @@ > >> +DESCRIPTION = "A Python crypto and SSL toolkit" > >> +HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto" > >> + > >> +DEPENDS = "openssl swig-native" > >> + > >> +LICENSE = "BSD" > >> +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" > >> + > >> +SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ > >> + file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch" > >> + > >> +SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" > >> +SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" > >> + > >> +S = "${WORKDIR}/M2Crypto-${PV}" > >> + > >> +inherit setuptools > >> + > >> +BBCLASSEXTEND = "native" > > -- > > -Joe MacDonald. > > :wq >
[Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 14:21) Joe MacDonald wrote: > [Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 20:15) Koen Kooi wrote: > > > > > Op 1 apr. 2013, om 20:13 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > > > > > Hey Koen, > > > > > > [[oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.03.29 (Fri 15:25) Koen Kooi wrote: > > > > > >> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > > >> --- > > >> ...y-link-in-sysroot-not-in-host-directories.patch | 39 ++++++++++++++++++++++ > > >> .../python/python-m2crypto_0.21.1.bb | 19 +++++++++++ > > >> 2 files changed, 58 insertions(+) > > >> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > > >> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > > >> > > >> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > > >> new file mode 100644 > > >> index 0000000..bcbdf24 > > >> --- /dev/null > > >> +++ b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > > >> @@ -0,0 +1,39 @@ > > >> +From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 > > >> +From: Koen Kooi <koen@dominion.thruhere.net> > > >> +Date: Fri, 29 Mar 2013 15:17:17 +0100 > > >> +Subject: [PATCH] setup.py: link in sysroot, not in host directories > > >> + > > >> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > > >> + > > >> +Upstream-status: Unknown > > > > > > Does this mean you haven't determined if it should be sent upstream yet, > > > or you did and it's gone off into an apparent black hole of a mailing > > > list somewhere? > > > > The former > > Okay. Isn't that normally 'Pending' then? I can make that tweak in my > merge, but I wanted to confirm I had the right information there first. Except now that I'm looking at my merge tree again I noticed this is in meta-oe not meta-networking, so I'll not merge that at all unless asked. :-) -J. > > -J. > > > > > > > > > -J. > > > > > >> +--- > > >> + setup.py | 6 +++--- > > >> + 1 file changed, 3 insertions(+), 3 deletions(-) > > >> + > > >> +diff --git a/setup.py b/setup.py > > >> +index e7c49eb..8deaa34 100644 > > >> +--- a/setup.py > > >> ++++ b/setup.py > > >> +@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): > > >> + self.openssl = 'c:\\pkg' > > >> + else: > > >> + self.libraries = ['ssl', 'crypto'] > > >> +- self.openssl = '/usr' > > >> ++ self.openssl = os.environ.get( "STAGING_DIR" ) > > >> + > > >> + > > >> + def finalize_options(self): > > >> +@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): > > >> + > > >> + build_ext.build_ext.finalize_options(self) > > >> + > > >> +- opensslIncludeDir = os.path.join(self.openssl, 'include') > > >> +- opensslLibraryDir = os.path.join(self.openssl, 'lib') > > >> ++ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) > > >> ++ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) > > >> + > > >> + self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ > > >> + [opensslIncludeDir]] > > >> +-- > > >> +1.8.1.4 > > >> + > > >> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > > >> new file mode 100644 > > >> index 0000000..9babc04 > > >> --- /dev/null > > >> +++ b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > > >> @@ -0,0 +1,19 @@ > > >> +DESCRIPTION = "A Python crypto and SSL toolkit" > > >> +HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto" > > >> + > > >> +DEPENDS = "openssl swig-native" > > >> + > > >> +LICENSE = "BSD" > > >> +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" > > >> + > > >> +SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ > > >> + file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch" > > >> + > > >> +SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" > > >> +SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" > > >> + > > >> +S = "${WORKDIR}/M2Crypto-${PV}" > > >> + > > >> +inherit setuptools > > >> + > > >> +BBCLASSEXTEND = "native" > > > -- > > > -Joe MacDonald. > > > :wq > > >
Op 1 apr. 2013, om 20:21 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > [Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 20:15) Koen Kooi wrote: > >> >> Op 1 apr. 2013, om 20:13 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: >> >>> Hey Koen, >>> >>> [[oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.03.29 (Fri 15:25) Koen Kooi wrote: >>> >>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>> --- >>>> ...y-link-in-sysroot-not-in-host-directories.patch | 39 ++++++++++++++++++++++ >>>> .../python/python-m2crypto_0.21.1.bb | 19 +++++++++++ >>>> 2 files changed, 58 insertions(+) >>>> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch >>>> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb >>>> >>>> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch >>>> new file mode 100644 >>>> index 0000000..bcbdf24 >>>> --- /dev/null >>>> +++ b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch >>>> @@ -0,0 +1,39 @@ >>>> +From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 >>>> +From: Koen Kooi <koen@dominion.thruhere.net> >>>> +Date: Fri, 29 Mar 2013 15:17:17 +0100 >>>> +Subject: [PATCH] setup.py: link in sysroot, not in host directories >>>> + >>>> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>> + >>>> +Upstream-status: Unknown >>> >>> Does this mean you haven't determined if it should be sent upstream yet, >>> or you did and it's gone off into an apparent black hole of a mailing >>> list somewhere? >> >> The former > > Okay. Isn't that normally 'Pending' then? I can make that tweak in my > merge, but I wanted to confirm I had the right information there first. If you think 'Pending' reflects the status better than 'Unknown', go for it, but 'Pending' has been the catch-all for Upstream-status fields, so anytime you see 'Pending' you know you can't trust the Upstream-status field. > > -J. > >> >>> >>> -J. >>> >>>> +--- >>>> + setup.py | 6 +++--- >>>> + 1 file changed, 3 insertions(+), 3 deletions(-) >>>> + >>>> +diff --git a/setup.py b/setup.py >>>> +index e7c49eb..8deaa34 100644 >>>> +--- a/setup.py >>>> ++++ b/setup.py >>>> +@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): >>>> + self.openssl = 'c:\\pkg' >>>> + else: >>>> + self.libraries = ['ssl', 'crypto'] >>>> +- self.openssl = '/usr' >>>> ++ self.openssl = os.environ.get( "STAGING_DIR" ) >>>> + >>>> + >>>> + def finalize_options(self): >>>> +@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): >>>> + >>>> + build_ext.build_ext.finalize_options(self) >>>> + >>>> +- opensslIncludeDir = os.path.join(self.openssl, 'include') >>>> +- opensslLibraryDir = os.path.join(self.openssl, 'lib') >>>> ++ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) >>>> ++ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) >>>> + >>>> + self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ >>>> + [opensslIncludeDir]] >>>> +-- >>>> +1.8.1.4 >>>> + >>>> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb >>>> new file mode 100644 >>>> index 0000000..9babc04 >>>> --- /dev/null >>>> +++ b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb >>>> @@ -0,0 +1,19 @@ >>>> +DESCRIPTION = "A Python crypto and SSL toolkit" >>>> +HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto" >>>> + >>>> +DEPENDS = "openssl swig-native" >>>> + >>>> +LICENSE = "BSD" >>>> +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" >>>> + >>>> +SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ >>>> + file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch" >>>> + >>>> +SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" >>>> +SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" >>>> + >>>> +S = "${WORKDIR}/M2Crypto-${PV}" >>>> + >>>> +inherit setuptools >>>> + >>>> +BBCLASSEXTEND = "native" >>> -- >>> -Joe MacDonald. >>> :wq >> > > -- > -Joe MacDonald. > :wq
[Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 22:33) Koen Kooi wrote: > > Op 1 apr. 2013, om 20:21 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > > > [Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 20:15) Koen Kooi wrote: > > > >> > >> Op 1 apr. 2013, om 20:13 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > >> > >>> Hey Koen, > >>> > >>> [[oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.03.29 (Fri 15:25) Koen Kooi wrote: > >>> > >>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > >>>> --- > >>>> ...y-link-in-sysroot-not-in-host-directories.patch | 39 ++++++++++++++++++++++ > >>>> .../python/python-m2crypto_0.21.1.bb | 19 +++++++++++ > >>>> 2 files changed, 58 insertions(+) > >>>> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > >>>> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > >>>> > >>>> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > >>>> new file mode 100644 > >>>> index 0000000..bcbdf24 > >>>> --- /dev/null > >>>> +++ b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > >>>> @@ -0,0 +1,39 @@ > >>>> +From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 > >>>> +From: Koen Kooi <koen@dominion.thruhere.net> > >>>> +Date: Fri, 29 Mar 2013 15:17:17 +0100 > >>>> +Subject: [PATCH] setup.py: link in sysroot, not in host directories > >>>> + > >>>> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > >>>> + > >>>> +Upstream-status: Unknown > >>> > >>> Does this mean you haven't determined if it should be sent upstream yet, > >>> or you did and it's gone off into an apparent black hole of a mailing > >>> list somewhere? > >> > >> The former > > > > Okay. Isn't that normally 'Pending' then? I can make that tweak in my > > merge, but I wanted to confirm I had the right information there first. > > If you think 'Pending' reflects the status better than 'Unknown', go for it, but 'Pending' has been the catch-all for Upstream-status fields, so anytime you see 'Pending' you know you can't trust the Upstream-status field. Yeah, certainly no argument here, 'Pending' implies something to me that simply isn't so based both on experience and the strict definition on the website. But that does seem to fit the definition reasonably well. So since the meta-networking bit depends on the meta-oe bit being merged, do you want me to merge both at the same time? Or if you would prefer to do the merge, I'm happy with the meta-networking piece of this, so feel free. -J. > > > > > -J. > > > >> > >>> > >>> -J. > >>> > >>>> +--- > >>>> + setup.py | 6 +++--- > >>>> + 1 file changed, 3 insertions(+), 3 deletions(-) > >>>> + > >>>> +diff --git a/setup.py b/setup.py > >>>> +index e7c49eb..8deaa34 100644 > >>>> +--- a/setup.py > >>>> ++++ b/setup.py > >>>> +@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): > >>>> + self.openssl = 'c:\\pkg' > >>>> + else: > >>>> + self.libraries = ['ssl', 'crypto'] > >>>> +- self.openssl = '/usr' > >>>> ++ self.openssl = os.environ.get( "STAGING_DIR" ) > >>>> + > >>>> + > >>>> + def finalize_options(self): > >>>> +@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): > >>>> + > >>>> + build_ext.build_ext.finalize_options(self) > >>>> + > >>>> +- opensslIncludeDir = os.path.join(self.openssl, 'include') > >>>> +- opensslLibraryDir = os.path.join(self.openssl, 'lib') > >>>> ++ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) > >>>> ++ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) > >>>> + > >>>> + self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ > >>>> + [opensslIncludeDir]] > >>>> +-- > >>>> +1.8.1.4 > >>>> + > >>>> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > >>>> new file mode 100644 > >>>> index 0000000..9babc04 > >>>> --- /dev/null > >>>> +++ b/meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > >>>> @@ -0,0 +1,19 @@ > >>>> +DESCRIPTION = "A Python crypto and SSL toolkit" > >>>> +HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto" > >>>> + > >>>> +DEPENDS = "openssl swig-native" > >>>> + > >>>> +LICENSE = "BSD" > >>>> +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" > >>>> + > >>>> +SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ > >>>> + file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch" > >>>> + > >>>> +SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" > >>>> +SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" > >>>> + > >>>> +S = "${WORKDIR}/M2Crypto-${PV}" > >>>> + > >>>> +inherit setuptools > >>>> + > >>>> +BBCLASSEXTEND = "native" > >>> -- > >>> -Joe MacDonald. > >>> :wq > >> > > > > -- > > -Joe MacDonald. > > :wq >
Op 1 apr. 2013, om 23:03 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > [Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 22:33) Koen Kooi wrote: > >> >> Op 1 apr. 2013, om 20:21 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: >> >>> [Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 20:15) Koen Kooi wrote: >>> >>>> >>>> Op 1 apr. 2013, om 20:13 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: >>>> >>>>> Hey Koen, >>>>> >>>>> [[oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.03.29 (Fri 15:25) Koen Kooi wrote: >>>>> >>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>>> --- >>>>>> ...y-link-in-sysroot-not-in-host-directories.patch | 39 ++++++++++++++++++++++ >>>>>> .../python/python-m2crypto_0.21.1.bb | 19 +++++++++++ >>>>>> 2 files changed, 58 insertions(+) >>>>>> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch >>>>>> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb >>>>>> >>>>>> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch >>>>>> new file mode 100644 >>>>>> index 0000000..bcbdf24 >>>>>> --- /dev/null >>>>>> +++ b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch >>>>>> @@ -0,0 +1,39 @@ >>>>>> +From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 >>>>>> +From: Koen Kooi <koen@dominion.thruhere.net> >>>>>> +Date: Fri, 29 Mar 2013 15:17:17 +0100 >>>>>> +Subject: [PATCH] setup.py: link in sysroot, not in host directories >>>>>> + >>>>>> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>>> + >>>>>> +Upstream-status: Unknown >>>>> >>>>> Does this mean you haven't determined if it should be sent upstream yet, >>>>> or you did and it's gone off into an apparent black hole of a mailing >>>>> list somewhere? >>>> >>>> The former >>> >>> Okay. Isn't that normally 'Pending' then? I can make that tweak in my >>> merge, but I wanted to confirm I had the right information there first. >> >> If you think 'Pending' reflects the status better than 'Unknown', go for it, but 'Pending' has been the catch-all for Upstream-status fields, so anytime you see 'Pending' you know you can't trust the Upstream-status field. > > Yeah, certainly no argument here, 'Pending' implies something to me that > simply isn't so based both on experience and the strict definition on > the website. But that does seem to fit the definition reasonably well. > > So since the meta-networking bit depends on the meta-oe bit being > merged, do you want me to merge both at the same time? Or if you would > prefer to do the merge, I'm happy with the meta-networking piece of > this, so feel free. Feel free to merge both
[Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.02 (Tue 08:06) Koen Kooi wrote: > > Op 1 apr. 2013, om 23:03 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > > > [Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 22:33) Koen Kooi wrote: > > > >> > >> Op 1 apr. 2013, om 20:21 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > >> > >>> [Re: [oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.04.01 (Mon 20:15) Koen Kooi wrote: > >>> > >>>> > >>>> Op 1 apr. 2013, om 20:13 heeft Joe MacDonald <Joe.MacDonald@windriver.com> het volgende geschreven: > >>>> > >>>>> Hey Koen, > >>>>> > >>>>> [[oe] [meta-networking][meta-oe][PATCH 1/2] python-m2crypto: add 0.21.1] On 13.03.29 (Fri 15:25) Koen Kooi wrote: > >>>>> > >>>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > >>>>>> --- > >>>>>> ...y-link-in-sysroot-not-in-host-directories.patch | 39 ++++++++++++++++++++++ > >>>>>> .../python/python-m2crypto_0.21.1.bb | 19 +++++++++++ > >>>>>> 2 files changed, 58 insertions(+) > >>>>>> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > >>>>>> create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb > >>>>>> > >>>>>> diff --git a/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > >>>>>> new file mode 100644 > >>>>>> index 0000000..bcbdf24 > >>>>>> --- /dev/null > >>>>>> +++ b/meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch > >>>>>> @@ -0,0 +1,39 @@ > >>>>>> +From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 > >>>>>> +From: Koen Kooi <koen@dominion.thruhere.net> > >>>>>> +Date: Fri, 29 Mar 2013 15:17:17 +0100 > >>>>>> +Subject: [PATCH] setup.py: link in sysroot, not in host directories > >>>>>> + > >>>>>> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > >>>>>> + > >>>>>> +Upstream-status: Unknown > >>>>> > >>>>> Does this mean you haven't determined if it should be sent upstream yet, > >>>>> or you did and it's gone off into an apparent black hole of a mailing > >>>>> list somewhere? > >>>> > >>>> The former > >>> > >>> Okay. Isn't that normally 'Pending' then? I can make that tweak in my > >>> merge, but I wanted to confirm I had the right information there first. > >> > >> If you think 'Pending' reflects the status better than 'Unknown', go for it, but 'Pending' has been the catch-all for Upstream-status fields, so anytime you see 'Pending' you know you can't trust the Upstream-status field. > > > > Yeah, certainly no argument here, 'Pending' implies something to me that > > simply isn't so based both on experience and the strict definition on > > the website. But that does seem to fit the definition reasonably well. > > > > So since the meta-networking bit depends on the meta-oe bit being > > merged, do you want me to merge both at the same time? Or if you would > > prefer to do the merge, I'm happy with the meta-networking piece of > > this, so feel free. > > Feel free to merge both Okay, all done.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- ...y-link-in-sysroot-not-in-host-directories.patch | 39 ++++++++++++++++++++++ .../python/python-m2crypto_0.21.1.bb | 19 +++++++++++ 2 files changed, 58 insertions(+) create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch create mode 100644 meta-oe/recipes-devtools/python/python-m2crypto_0.21.1.bb