From: Gergely Kiss <mail.g...@gmail.com>
Subject: [PATCH] [packages] python: fix file conflict between python and
python-base packages
Fix file conflicts between packages "python" and "python-base"
Signed-off-by: Gergely Kiss <mail.g...@gmail.com>
Tested-by: Gergely Kiss <mail.g...@gmail.com>
---
Hi Alexandru,
I found that a couple of built-in python library files are included in both
packages.
opkg produces the following error messages during installation:
* check_data_file_clashes: Package python-base wants to install file
/usr/lib/python2.7/re.py
But that file is already provided by package * python
* check_data_file_clashes: Package python-base wants to install file
/usr/lib/python2.7/stat.py
But that file is already provided by package * python
* check_data_file_clashes: Package python-base wants to install file
/usr/lib/python2.7/warnings.py
But that file is already provided by package * python
* check_data_file_clashes: Package python-base wants to install file
/usr/lib/python2.7/copy_reg.py
[...]
The patch below fixes this behaviour.
Regards,
Gergely
diff -rupN python.orig/Makefile python/Makefile
--- python.orig/Makefile 2014-12-14 18:58:29.000000000 +0100
+++ python/Makefile 2014-12-14 19:00:30.987697790 +0100
@@ -158,6 +158,26 @@ define PyPackage/python/filespec
-|/usr/lib/python$(PYTHON_VERSION)/*/test
-|/usr/lib/python$(PYTHON_VERSION)/*/tests
-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/readline.so
+-|/usr/lib/python$(PYTHON_VERSION)/_abcoll.py
+-|/usr/lib/python$(PYTHON_VERSION)/_sysconfigdata.py
+-|/usr/lib/python$(PYTHON_VERSION)/_weakrefset.py
+-|/usr/lib/python$(PYTHON_VERSION)/abc.py
+-|/usr/lib/python$(PYTHON_VERSION)/copy_reg.py
+-|/usr/lib/python$(PYTHON_VERSION)/genericpath.py
+-|/usr/lib/python$(PYTHON_VERSION)/linecache.py
+-|/usr/lib/python$(PYTHON_VERSION)/posixpath.py
+-|/usr/lib/python$(PYTHON_VERSION)/os.py
+-|/usr/lib/python$(PYTHON_VERSION)/re.py
+-|/usr/lib/python$(PYTHON_VERSION)/site.py
+-|/usr/lib/python$(PYTHON_VERSION)/sre_compile.py
+-|/usr/lib/python$(PYTHON_VERSION)/sre_constants.py
+-|/usr/lib/python$(PYTHON_VERSION)/sre_parse.py
+-|/usr/lib/python$(PYTHON_VERSION)/sysconfig.py
+-|/usr/lib/python$(PYTHON_VERSION)/stat.py
+-|/usr/lib/python$(PYTHON_VERSION)/traceback.py
+-|/usr/lib/python$(PYTHON_VERSION)/types.py
+-|/usr/lib/python$(PYTHON_VERSION)/UserDict.py
+-|/usr/lib/python$(PYTHON_VERSION)/warnings.py
endef
define PyPackage/python-base/install
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
