- 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 adolf.belka@ipfire.org --- 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