[oe-commits] [meta-openembedded] 32/47: python-thrift: set downloadfilename to prevent conflicts with thrift itself

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 16dbfded41b9ee772f8f56e85098e7589a8b25c5
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Thu Sep 20 22:37:12 2018 +0000

    python-thrift: set downloadfilename to prevent conflicts with thrift itself
    
    * I was building thrift-0.9.3 from meta-oe and do_fetch was failing with wrong checksum
      because my premirror already had thrift-0.9.3.tar.gz from python-thrift, unpacking
      the archives to find what's wrong revealed what's wrong:
    
    thrift-0.9.3.old/thrift-0.9.3/:
    PKG-INFO  setup.cfg  setup.py  src  thrift.egg-info
    
    thrift-0.9.3/thrift-0.9.3/:
    aclocal     appveyor.yml  build    CMakeLists.txt  compiler       config.guess  config.hin  configure     contrib          debian   doap.rdf  install-sh        lib      ltmain.sh    Makefile.in  NOTICE        rat_exclude  sonar-project.properties  tutorial
    aclocal.m4  bower.json    CHANGES  compile         composer.json  config.h      config.sub  configure.ac  CONTRIBUTING.md  depcomp  doc       json-schema.json  LICENSE  Makefile.am  missing      package.json  README.md    test                      ylwrap
    
      you can get the same by comparing:
      http://mirror.switch.ch/mirror/apache/dist/thrift/0.9.3/thrift-0.9.3.tar.gz
      http://sources.openembedded.org/thrift-0.9.3.tar.gz
      the later is the python-thrift one from:
      http://git.openembedded.org/meta-openembedded/commit/?id=5cc904be9d6551f6e9a6465e990df1e2de940004
    
      your premirror might already be polluted by this and thrift-0.10.0.tar.gz + thrift-0.11.0.tar.gz from:
      http://git.openembedded.org/meta-openembedded/commit/?id=c0416d417115fbae55d83c2d9fa3f3fca1a9e1a0
      http://git.openembedded.org/meta-openembedded/commit/?id=960ae72e101d753b712e8bc40d8bdb4a0bcb0c5e
    
    * this should be backported all the way to morty where the conflicting
      archive was introduced and manual cleanup on sources.openembedded.org
      will be needed as well
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb b/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb
index 8047ec7..10cff42 100644
--- a/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb
+++ b/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb
@@ -7,6 +7,9 @@ SRC_URI[sha256sum] = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8
 
 inherit pypi setuptools
 
+# Use different filename to prevent conflicts with thrift itself
+PYPI_SRC_URI_append = ";downloadfilename=${BP}.${PYPI_PACKAGE_EXT}"
+
 RDEPENDS_${PN} += "\
     ${PYTHON_PN}-logging \
     ${PYTHON_PN}-six \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.