From d779e82840e3c9d58d86957d412fa6098e2a7157 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 29 Jun 2016 20:48:31 +0200 Subject: [PATCH] package/python: bump version to 2.7.12 Rebased 011-remove-python-symlink.patch [Peter: correct .hash file comment as pointed out by Baruch] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/python/011-remove-python-symlink.patch | 12 +++++++----- package/python/python.hash | 6 +++--- package/python/python.mk | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/python/011-remove-python-symlink.patch b/package/python/011-remove-python-symlink.patch index b0548c31df..fed46f0b86 100644 --- a/package/python/011-remove-python-symlink.patch +++ b/package/python/011-remove-python-symlink.patch @@ -5,20 +5,22 @@ Buildroot needs to control to what python interpreter (python2 or python3) the python symlink points to. Signed-off-by: Samuel Martin +Signed-off-by: Bernd Kuhls +(rebased against version 2.7.12) Index: b/Makefile.pre.in =================================================================== --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -890,17 +890,10 @@ - # $(PYTHON) -> python2 -> python$(VERSION)) - # Also create equivalent chains for other installed files - bininstall: altbininstall +@@ -974,17 +974,11 @@ + echo "Creating directory $(LIBPC)"; \ + $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \ + fi - -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \ - then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ - else true; \ - fi -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON)) + (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON)) -rm -f $(DESTDIR)$(BINDIR)/python2$(EXE) (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE)) -rm -f $(DESTDIR)$(BINDIR)/python2-config diff --git a/package/python/python.hash b/package/python/python.hash index d1cf1ba021..b7d0036008 100644 --- a/package/python/python.hash +++ b/package/python/python.hash @@ -1,4 +1,4 @@ -# From https://www.python.org/downloads/release/python-2711/ -md5 1dbcc848b4cd8399a8199d000f9f823c Python-2.7.11.tar.xz +# From https://www.python.org/downloads/release/python-2712/ +md5 57dffcee9cee8bb2ab5f82af1d8e9a69 Python-2.7.12.tar.xz # Locally calculated -sha256 962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46 Python-2.7.11.tar.xz +sha256 d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978 Python-2.7.12.tar.xz diff --git a/package/python/python.mk b/package/python/python.mk index 913dc2c55d..6117a6d4ba 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_VERSION_MAJOR = 2.7 -PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).11 +PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).12 PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION) PYTHON_LICENSE = Python software foundation license v2, others -- 2.30.2