Commit 3fae17ae authored by Martin Jansa's avatar Martin Jansa
Browse files

python-chardet: rename ${bindir}/chardetect to avoid conflict with python3-chardet


* to allow both python-chardet and python3-chardet to be installed in the same image
* now it fails with:
  Collected errors:
   * check_data_file_clashes: Package python-chardet wants to install file image/1.0/rootfs/usr/bin/chardetect
        But that file is already provided by package  * python3-chardet

* the only difference is the shebang:
  --- python-chardet/3.0.4-r0/image/usr/bin/chardetect 2021-06-23 01:24:17.172638046 -0700
  +++ python3-chardet/3.0.4-r0/image/usr/bin/chardetect        2021-06-23 01:24:17.412641733 -0700
  @@ -1,4 +1,4 @@
  -#!/usr/bin/env python
  +#!/usr/bin/env python3
   # EASY-INSTALL-ENTRY-SCRIPT: 'chardet==3.0.4','console_scripts','chardetect'
   __requires__ = 'chardet==3.0.4'
   import re
Signed-off-by: default avatarMartin Jansa <Martin.Jansa@gmail.com>
No related merge requests found
Showing with 4 additions and 0 deletions
+4 -0
......@@ -26,6 +26,10 @@ RDEPENDS_${PN}_class-target += " \
inherit pypi setuptools
do_install_append() {
mv ${D}${bindir}/chardetect ${D}${bindir}/chardetect-py2
}
RDEPENDS_${PN} += "${PYTHON_PN}-argparse"
BBCLASSEXTEND = "native nativesdk"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment