From patchwork Sun Dec 14 18:26:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gergely Kiss X-Patchwork-Id: 420899 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E34391400DE for ; Mon, 15 Dec 2014 05:26:53 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A080B28A993; Sun, 14 Dec 2014 19:24:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 982BE28A69D for ; Sun, 14 Dec 2014 19:24:54 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 14 Dec 2014 19:24:54 +0100 (CET) Received: by mail-wg0-f43.google.com with SMTP id l18so12995920wgh.16 for ; Sun, 14 Dec 2014 10:26:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=lpxjrL64HujN2lG3oO/TTvadv3xSinwsyVBLg+HgkFo=; b=q8kwePKbxPVPLwKo8mmMifhLVUA2EH64u17D5C1kL/71YsoMOqQKhIziuXECmCTR7O 4XEAddCcBBBWv2X61atyr80G1cDfrX2J7vHdL5G2ik7cnBsCxqY8mTTWRgOLSVPhJ7vE E+Fg4u/ZfbIf6a/d8aYwSFlklDDQTV0+Z+NfumUiCcxZPUZj6gKwm2GfC0c1yNNqSBr/ gPkeDYEi4P4kk21VT90RL3bEXpsUxyy8laDecXaQY9yCnL/6jDYCacd83WzaaKidZNbl ORiyjJjJd9Zj+EJqWrGpN/EaMuk5PIp3/EsUTDPITVE5Y3X8NX1BYnK6SQeE4E95xPkW ustw== X-Received: by 10.194.237.101 with SMTP id vb5mr45808193wjc.30.1418581602328; Sun, 14 Dec 2014 10:26:42 -0800 (PST) Received: from nb.nb (catv-80-99-31-146.catv.broadband.hu. [80.99.31.146]) by mx.google.com with ESMTPSA id h13sm10182905wiw.4.2014.12.14.10.26.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Dec 2014 10:26:41 -0800 (PST) Message-ID: <548DD660.1020004@gmail.com> Date: Sun, 14 Dec 2014 19:26:40 +0100 From: Gergely Kiss User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Alexandru Ardelean Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH] [packages] python: file conflicts X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" From: Gergely Kiss 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 Tested-by: Gergely Kiss --- 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