From patchwork Sun May 16 11:46:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4285 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FjgTM2SmTz3wbf for ; Sun, 16 May 2021 11:46:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FjgTK0mcRz1Kc; Sun, 16 May 2021 11:46:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FjgTJ6Lnyz2ydk; Sun, 16 May 2021 11:46:28 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FjgTH0FwZz2xSB for ; Sun, 16 May 2021 11:46:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FjgTG1klQz1N; Sun, 16 May 2021 11:46:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621165586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fZHhYuWE3RyJ2TlMQEjm2pSHoRHAfo1wSmJwm95rob0=; b=CyTep0of/RGlSKD36KPTI4kI0NO8USYNdlkdfHpknh0PddWw2txfcL3AYAzGVKdqd/44JQ UdSTX9CLZuzfHzBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621165586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fZHhYuWE3RyJ2TlMQEjm2pSHoRHAfo1wSmJwm95rob0=; b=I0jlJxb3DjBu7Y4Vo8Cq/jJDZl+r8nxoggqqr/NOLmt9Z3kN+jA9dMsdGtupt6mI9FMZZD VY2TnCcF6zGfBTKDM6uhk1OUAwu5k5N1Fb3kCgzCz31P9Gm4KLjHBUxyPcfW3z1fnEZ8To jVxQiMasSrDnMstjctlu3uwFBWANDdK+uijNVcHsJbsAOdQtQpl262SGUxcoqykSRMXOV3 2lnMtL+u/Fm14SU6Ia4PedB8LPFYLpWg0lpRgqqaMjCrtTOuwTItgepoEeXq5YLG8jWmxv Ez1cbWlm7kpeSJ1Bj9owYV7ZWc9RI2E7tuBk3gdbBD4KHBSPxgcXRzcnfpKS6g== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] python-pyparsing: Update to 2.4.7 and migrate to python3 Date: Sun, 16 May 2021 13:46:20 +0200 Message-Id: <20210516114620.3574908-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from 2.2.0 to 2.4.7 - Migrate from python2 to python3 - Move the rootfile from common to packages as pyparsing is an addon Signed-off-by: Adolf Belka --- config/rootfiles/common/python-pyparsing | 1 - config/rootfiles/packages/python3-pyparsing | 9 +++++++++ lfs/{python-pyparsing => python3-pyparsing} | 10 +++++----- make.sh | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 config/rootfiles/common/python-pyparsing create mode 100644 config/rootfiles/packages/python3-pyparsing rename lfs/{python-pyparsing => python3-pyparsing} (94%) diff --git a/config/rootfiles/common/python-pyparsing b/config/rootfiles/common/python-pyparsing deleted file mode 100644 index 9babda975..000000000 --- a/config/rootfiles/common/python-pyparsing +++ /dev/null @@ -1 +0,0 @@ -#usr/lib/python2.7/site-packages/pyparsing-2.2.0-py2.7.egg diff --git a/config/rootfiles/packages/python3-pyparsing b/config/rootfiles/packages/python3-pyparsing new file mode 100644 index 000000000..3106ff1b6 --- /dev/null +++ b/config/rootfiles/packages/python3-pyparsing @@ -0,0 +1,9 @@ +#usr/lib/python3.8/site-packages/easy-install.pth +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/PKG-INFO +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/SOURCES.txt +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/dependency_links.txt +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/not-zip-safe +#usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/EGG-INFO/top_level.txt +usr/lib/python3.8/site-packages/pyparsing-2.4.7-py3.8.egg/pyparsing.py diff --git a/lfs/python-pyparsing b/lfs/python3-pyparsing similarity index 94% rename from lfs/python-pyparsing rename to lfs/python3-pyparsing index f42e1ac94..45e960a2b 100644 --- a/lfs/python-pyparsing +++ b/lfs/python3-pyparsing @@ -24,15 +24,15 @@ include Config -VER = 2.2.0 +VER = 2.4.7 THISAPP = pyparsing-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-pyparsing -PAK_VER = 2 +PROG = python3-pyparsing +PAK_VER = 3 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0214e42d63af850256962b6744c948d9 +$(DL_FILE)_MD5 = f0953e47a0112f7a65aec2305ffdf7b4 install : $(TARGET) @@ -77,6 +77,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install + cd $(DIR_APP) && python3 setup.py install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4af0081e9..27d1f2e87 100755 --- a/make.sh +++ b/make.sh @@ -1453,7 +1453,7 @@ buildipfire() { lfsmake2 igmpproxy lfsmake2 fbset lfsmake2 opus - lfsmake2 python-pyparsing + lfsmake2 python3-pyparsing lfsmake2 spice-protocol lfsmake2 spice lfsmake2 sdl