Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/armv5tel/python3 | 18 +++++++++++++----- config/rootfiles/packages/i586/python3 | 18 +++++++++++++----- config/rootfiles/packages/x86_64/python3 | 18 +++++++++++++----- lfs/python3 | 6 +++--- 4 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/config/rootfiles/packages/armv5tel/python3 b/config/rootfiles/packages/armv5tel/python3 index b9cee32..38fbcb8 100644 --- a/config/rootfiles/packages/armv5tel/python3 +++ b/config/rootfiles/packages/armv5tel/python3 @@ -2765,9 +2765,9 @@ usr/lib/python3.6/lib-dynload/xxlimited.cpython-36m-arm-linux-gnueabi.so usr/lib/python3.6/lib-dynload/zlib.cpython-36m-arm-linux-gnueabi.so #usr/lib/python3.6/lib2to3 usr/lib/python3.6/lib2to3/Grammar.txt -usr/lib/python3.6/lib2to3/Grammar3.6.0.final.0.pickle +usr/lib/python3.6/lib2to3/Grammar3.6.1.final.0.pickle usr/lib/python3.6/lib2to3/PatternGrammar.txt -usr/lib/python3.6/lib2to3/PatternGrammar3.6.0.final.0.pickle +usr/lib/python3.6/lib2to3/PatternGrammar3.6.1.final.0.pickle usr/lib/python3.6/lib2to3/__init__.py usr/lib/python3.6/lib2to3/__main__.py #usr/lib/python3.6/lib2to3/__pycache__ @@ -3297,8 +3297,7 @@ usr/lib/python3.6/shelve.py usr/lib/python3.6/shlex.py usr/lib/python3.6/shutil.py usr/lib/python3.6/signal.py -usr/lib/python3.6/site-packages -usr/lib/python3.6/site-packages/README +#usr/lib/python3.6/site-packages usr/lib/python3.6/site-packages/README.txt #usr/lib/python3.6/site-packages/__pycache__ usr/lib/python3.6/site-packages/__pycache__/easy_install.cpython-36.pyc @@ -7447,7 +7446,6 @@ usr/lib/python3.6/venv/__pycache__/__main__.cpython-36.opt-2.pyc usr/lib/python3.6/venv/__pycache__/__main__.cpython-36.pyc usr/lib/python3.6/venv/scripts usr/lib/python3.6/venv/scripts/posix -usr/lib/python3.6/venv/scripts/posix/activate usr/lib/python3.6/venv/scripts/posix/activate.csh usr/lib/python3.6/venv/scripts/posix/activate.fish usr/lib/python3.6/warnings.py @@ -7597,3 +7595,13 @@ usr/lib/python3.6/zipapp.py usr/lib/python3.6/zipfile.py #usr/share/man/man1/python3.1 #usr/share/man/man1/python3.6.1 +usr/lib/python3.6/test/mod_generics_cache.py +usr/lib/python3.6/test/mp_preload.py +usr/lib/python3.6/venv/scripts/common +usr/lib/python3.6/venv/scripts/common/activate +#usr/lib/python3.6/test/__pycache__/mod_generics_cache.cpython-36.opt-1.pyc +#usr/lib/python3.6/test/__pycache__/mod_generics_cache.cpython-36.opt-2.pyc +#usr/lib/python3.6/test/__pycache__/mod_generics_cache.cpython-36.pyc +#usr/lib/python3.6/test/__pycache__/mp_preload.cpython-36.opt-1.pyc +#usr/lib/python3.6/test/__pycache__/mp_preload.cpython-36.opt-2.pyc +#usr/lib/python3.6/test/__pycache__/mp_preload.cpython-36.pyc diff --git a/config/rootfiles/packages/i586/python3 b/config/rootfiles/packages/i586/python3 index 4cf30f5..325391f 100644 --- a/config/rootfiles/packages/i586/python3 +++ b/config/rootfiles/packages/i586/python3 @@ -2765,9 +2765,9 @@ usr/lib/python3.6/lib-dynload/xxlimited.cpython-36m-i386-linux-gnu.so usr/lib/python3.6/lib-dynload/zlib.cpython-36m-i386-linux-gnu.so #usr/lib/python3.6/lib2to3 usr/lib/python3.6/lib2to3/Grammar.txt -usr/lib/python3.6/lib2to3/Grammar3.6.0.final.0.pickle +usr/lib/python3.6/lib2to3/Grammar3.6.1.final.0.pickle usr/lib/python3.6/lib2to3/PatternGrammar.txt -usr/lib/python3.6/lib2to3/PatternGrammar3.6.0.final.0.pickle +usr/lib/python3.6/lib2to3/PatternGrammar3.6.1.final.0.pickle usr/lib/python3.6/lib2to3/__init__.py usr/lib/python3.6/lib2to3/__main__.py #usr/lib/python3.6/lib2to3/__pycache__ @@ -3297,8 +3297,7 @@ usr/lib/python3.6/shelve.py usr/lib/python3.6/shlex.py usr/lib/python3.6/shutil.py usr/lib/python3.6/signal.py -usr/lib/python3.6/site-packages -usr/lib/python3.6/site-packages/README +#usr/lib/python3.6/site-packages usr/lib/python3.6/site-packages/README.txt #usr/lib/python3.6/site-packages/__pycache__ usr/lib/python3.6/site-packages/__pycache__/easy_install.cpython-36.pyc @@ -7447,7 +7446,6 @@ usr/lib/python3.6/venv/__pycache__/__main__.cpython-36.opt-2.pyc usr/lib/python3.6/venv/__pycache__/__main__.cpython-36.pyc usr/lib/python3.6/venv/scripts usr/lib/python3.6/venv/scripts/posix -usr/lib/python3.6/venv/scripts/posix/activate usr/lib/python3.6/venv/scripts/posix/activate.csh usr/lib/python3.6/venv/scripts/posix/activate.fish usr/lib/python3.6/warnings.py @@ -7597,3 +7595,13 @@ usr/lib/python3.6/zipapp.py usr/lib/python3.6/zipfile.py #usr/share/man/man1/python3.1 #usr/share/man/man1/python3.6.1 +usr/lib/python3.6/test/mod_generics_cache.py +usr/lib/python3.6/test/mp_preload.py +usr/lib/python3.6/venv/scripts/common +usr/lib/python3.6/venv/scripts/common/activate +#usr/lib/python3.6/test/__pycache__/mod_generics_cache.cpython-36.opt-1.pyc +#usr/lib/python3.6/test/__pycache__/mod_generics_cache.cpython-36.opt-2.pyc +#usr/lib/python3.6/test/__pycache__/mod_generics_cache.cpython-36.pyc +#usr/lib/python3.6/test/__pycache__/mp_preload.cpython-36.opt-1.pyc +#usr/lib/python3.6/test/__pycache__/mp_preload.cpython-36.opt-2.pyc +#usr/lib/python3.6/test/__pycache__/mp_preload.cpython-36.pyc diff --git a/config/rootfiles/packages/x86_64/python3 b/config/rootfiles/packages/x86_64/python3 index dfc5ab2..7cb2ade 100644 --- a/config/rootfiles/packages/x86_64/python3 +++ b/config/rootfiles/packages/x86_64/python3 @@ -2765,9 +2765,9 @@ usr/lib/python3.6/lib-dynload/xxlimited.cpython-36m-x86_64-linux-gnu.so usr/lib/python3.6/lib-dynload/zlib.cpython-36m-x86_64-linux-gnu.so #usr/lib/python3.6/lib2to3 usr/lib/python3.6/lib2to3/Grammar.txt -usr/lib/python3.6/lib2to3/Grammar3.6.0.final.0.pickle +usr/lib/python3.6/lib2to3/Grammar3.6.1.final.0.pickle usr/lib/python3.6/lib2to3/PatternGrammar.txt -usr/lib/python3.6/lib2to3/PatternGrammar3.6.0.final.0.pickle +usr/lib/python3.6/lib2to3/PatternGrammar3.6.1.final.0.pickle usr/lib/python3.6/lib2to3/__init__.py usr/lib/python3.6/lib2to3/__main__.py #usr/lib/python3.6/lib2to3/__pycache__ @@ -3297,8 +3297,7 @@ usr/lib/python3.6/shelve.py usr/lib/python3.6/shlex.py usr/lib/python3.6/shutil.py usr/lib/python3.6/signal.py -usr/lib/python3.6/site-packages -usr/lib/python3.6/site-packages/README +#usr/lib/python3.6/site-packages usr/lib/python3.6/site-packages/README.txt #usr/lib/python3.6/site-packages/__pycache__ usr/lib/python3.6/site-packages/__pycache__/easy_install.cpython-36.pyc @@ -4112,6 +4111,12 @@ usr/lib/python3.6/test #usr/lib/python3.6/test/__pycache__/__main__.cpython-36.opt-1.pyc #usr/lib/python3.6/test/__pycache__/__main__.cpython-36.opt-2.pyc #usr/lib/python3.6/test/__pycache__/__main__.cpython-36.pyc +#usr/lib/python3.6/test/__pycache__/mod_generics_cache.cpython-36.opt-1.pyc +#usr/lib/python3.6/test/__pycache__/mod_generics_cache.cpython-36.opt-2.pyc +#usr/lib/python3.6/test/__pycache__/mod_generics_cache.cpython-36.pyc +#usr/lib/python3.6/test/__pycache__/mp_preload.cpython-36.opt-1.pyc +#usr/lib/python3.6/test/__pycache__/mp_preload.cpython-36.opt-2.pyc +#usr/lib/python3.6/test/__pycache__/mp_preload.cpython-36.pyc #usr/lib/python3.6/test/__pycache__/_test_multiprocessing.cpython-36.opt-1.pyc #usr/lib/python3.6/test/__pycache__/_test_multiprocessing.cpython-36.opt-2.pyc #usr/lib/python3.6/test/__pycache__/_test_multiprocessing.cpython-36.pyc @@ -7447,7 +7452,6 @@ usr/lib/python3.6/venv/__pycache__/__main__.cpython-36.opt-2.pyc usr/lib/python3.6/venv/__pycache__/__main__.cpython-36.pyc usr/lib/python3.6/venv/scripts usr/lib/python3.6/venv/scripts/posix -usr/lib/python3.6/venv/scripts/posix/activate usr/lib/python3.6/venv/scripts/posix/activate.csh usr/lib/python3.6/venv/scripts/posix/activate.fish usr/lib/python3.6/warnings.py @@ -7597,3 +7601,7 @@ usr/lib/python3.6/zipapp.py usr/lib/python3.6/zipfile.py #usr/share/man/man1/python3.1 #usr/share/man/man1/python3.6.1 +usr/lib/python3.6/test/mod_generics_cache.py +usr/lib/python3.6/test/mp_preload.py +usr/lib/python3.6/venv/scripts/common +usr/lib/python3.6/venv/scripts/common/activate diff --git a/lfs/python3 b/lfs/python3 index 6821062..0fe493b 100644 --- a/lfs/python3 +++ b/lfs/python3 @@ -24,7 +24,7 @@
include Config
-VER = 3.6.0 +VER = 3.6.1
THISAPP = Python-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3 -PAK_VER = 1 +PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 82b143ebbf4514d7e05876bed7a6b1f5 +$(DL_FILE)_MD5 = 692b4fc3a2ba0d54d1495d4ead5b0b5c
install : $(TARGET)
-
Jonatan Schlag