--- config/rootfiles/common/armv5tel/python | 16 ++++++++++------ config/rootfiles/common/i586/python | 16 ++++++++++------ config/rootfiles/common/x86_64/python | 18 ++++++++++++------ lfs/python | 12 ++++++++---- make.sh | 4 ++-- 5 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/config/rootfiles/common/armv5tel/python b/config/rootfiles/common/armv5tel/python index a308ae0..409d758 100644 --- a/config/rootfiles/common/armv5tel/python +++ b/config/rootfiles/common/armv5tel/python @@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1718,6 +1718,10 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyc #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyo #usr/lib/python2.7/idlelib/extend.txt +#usr/lib/python2.7/idlelib/help.html +#usr/lib/python2.7/idlelib/help.py +#usr/lib/python2.7/idlelib/help.pyc +#usr/lib/python2.7/idlelib/help.pyo #usr/lib/python2.7/idlelib/help.txt #usr/lib/python2.7/idlelib/idle.bat #usr/lib/python2.7/idlelib/idle.py @@ -1916,7 +1920,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.11-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1957,7 +1961,7 @@ usr/lib/python2.7/lib-dynload/cStringIO.so usr/lib/python2.7/lib-dynload/cmath.so usr/lib/python2.7/lib-dynload/crypt.so usr/lib/python2.7/lib-dynload/datetime.so -#usr/lib/python2.7/lib-dynload/dbm_failed.so +usr/lib/python2.7/lib-dynload/dbm.so usr/lib/python2.7/lib-dynload/dl.so usr/lib/python2.7/lib-dynload/fcntl.so usr/lib/python2.7/lib-dynload/future_builtins.so @@ -2092,9 +2096,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.11.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.11.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo diff --git a/config/rootfiles/common/i586/python b/config/rootfiles/common/i586/python index a308ae0..409d758 100644 --- a/config/rootfiles/common/i586/python +++ b/config/rootfiles/common/i586/python @@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1718,6 +1718,10 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyc #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyo #usr/lib/python2.7/idlelib/extend.txt +#usr/lib/python2.7/idlelib/help.html +#usr/lib/python2.7/idlelib/help.py +#usr/lib/python2.7/idlelib/help.pyc +#usr/lib/python2.7/idlelib/help.pyo #usr/lib/python2.7/idlelib/help.txt #usr/lib/python2.7/idlelib/idle.bat #usr/lib/python2.7/idlelib/idle.py @@ -1916,7 +1920,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.11-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1957,7 +1961,7 @@ usr/lib/python2.7/lib-dynload/cStringIO.so usr/lib/python2.7/lib-dynload/cmath.so usr/lib/python2.7/lib-dynload/crypt.so usr/lib/python2.7/lib-dynload/datetime.so -#usr/lib/python2.7/lib-dynload/dbm_failed.so +usr/lib/python2.7/lib-dynload/dbm.so usr/lib/python2.7/lib-dynload/dl.so usr/lib/python2.7/lib-dynload/fcntl.so usr/lib/python2.7/lib-dynload/future_builtins.so @@ -2092,9 +2096,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.11.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.11.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo diff --git a/config/rootfiles/common/x86_64/python b/config/rootfiles/common/x86_64/python index 0155f24..409d758 100644 --- a/config/rootfiles/common/x86_64/python +++ b/config/rootfiles/common/x86_64/python @@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1718,6 +1718,10 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyc #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyo #usr/lib/python2.7/idlelib/extend.txt +#usr/lib/python2.7/idlelib/help.html +#usr/lib/python2.7/idlelib/help.py +#usr/lib/python2.7/idlelib/help.pyc +#usr/lib/python2.7/idlelib/help.pyo #usr/lib/python2.7/idlelib/help.txt #usr/lib/python2.7/idlelib/idle.bat #usr/lib/python2.7/idlelib/idle.py @@ -1916,7 +1920,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.11-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1957,11 +1961,13 @@ usr/lib/python2.7/lib-dynload/cStringIO.so usr/lib/python2.7/lib-dynload/cmath.so usr/lib/python2.7/lib-dynload/crypt.so usr/lib/python2.7/lib-dynload/datetime.so -#usr/lib/python2.7/lib-dynload/dbm_failed.so +usr/lib/python2.7/lib-dynload/dbm.so +usr/lib/python2.7/lib-dynload/dl.so usr/lib/python2.7/lib-dynload/fcntl.so usr/lib/python2.7/lib-dynload/future_builtins.so usr/lib/python2.7/lib-dynload/gdbm.so usr/lib/python2.7/lib-dynload/grp.so +usr/lib/python2.7/lib-dynload/imageop.so usr/lib/python2.7/lib-dynload/itertools.so #usr/lib/python2.7/lib-dynload/linuxaudiodev.so usr/lib/python2.7/lib-dynload/math.so @@ -2090,9 +2096,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.11.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.11.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo diff --git a/lfs/python b/lfs/python index 013f9c1..25bf185 100644 --- a/lfs/python +++ b/lfs/python @@ -24,7 +24,7 @@
include Config
-VER = 2.7.10 +VER = 2.7.11
THISAPP = Python-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c685ef0b8e9f27b5e3db5db12b268ac6 +$(DL_FILE)_MD5 = 1dbcc848b4cd8399a8199d000f9f823c
install : $(TARGET)
@@ -71,9 +71,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} - cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \ - --prefix=/usr --enable-shared --with-system-ffi + cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \ + --prefix=/usr \ + --enable-shared \ + --with-system-ffi \ + --enable-unicode=ucs4 cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + chmod -v 755 /usr/lib/libpython2.7.so.1.0 @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index d156c61..d23f395 100755 --- a/make.sh +++ b/make.sh @@ -487,8 +487,6 @@ buildipfire() { ipfiremake bind ipfiremake dhcp ipfiremake dhcpcd - ipfiremake python - ipfiremake boost ipfiremake linux-atm ipfiremake expat ipfiremake gdbm @@ -497,6 +495,8 @@ buildipfire() { ipfiremake tcl ipfiremake sqlite ipfiremake libffi + ipfiremake python + ipfiremake boost ipfiremake ca-certificates ipfiremake fireinfo ipfiremake libnet