Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From c2d279b4a19de7a32e8a73e320423f699d408380 Mon Sep 17 00:00:00 2001
|
||||
From 868823f15bab031caf05dc5e8ce2eac076bfc82b Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Wed, 22 Feb 2017 17:15:31 -0800
|
||||
Subject: [PATCH] Add an option to disable lib2to3
|
||||
@@ -17,20 +17,20 @@ Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
|
||||
3 files changed, 21 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index badb2af35d..931cc3ed07 100644
|
||||
index 6fa0549a56..3e1f130532 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1235,7 +1235,9 @@ ifeq (@PYDOC@,yes)
|
||||
@@ -1293,7 +1293,9 @@ ifeq (@PYDOC@,yes)
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
|
||||
endif
|
||||
-rm -f $(DESTDIR)$(BINDIR)/2to3
|
||||
+ifeq (@LIB2TO3@,yes)
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
|
||||
+endif
|
||||
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
|
||||
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
|
||||
@@ -1272,7 +1274,6 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \
|
||||
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \
|
||||
@@ -1328,7 +1330,6 @@ LIBSUBDIRS= tkinter site-packages \
|
||||
html json http dbm xmlrpc \
|
||||
sqlite3 \
|
||||
logging csv wsgiref urllib \
|
||||
@@ -38,7 +38,7 @@ index badb2af35d..931cc3ed07 100644
|
||||
ctypes ctypes/macholib \
|
||||
idlelib idlelib/Icons \
|
||||
distutils distutils/command $(XMLLIBSUBDIRS) \
|
||||
@@ -1342,9 +1343,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1402,9 +1403,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
test/test_email test/test_email/data \
|
||||
test/test_json \
|
||||
sqlite3/test \
|
||||
@@ -48,7 +48,7 @@ index badb2af35d..931cc3ed07 100644
|
||||
ctypes/test \
|
||||
idlelib/idle_test \
|
||||
distutils/tests \
|
||||
@@ -1352,6 +1350,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
@@ -1412,6 +1410,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
||||
test/test_tools test/test_warnings test/test_warnings/data \
|
||||
unittest/test unittest/test/testmock
|
||||
|
||||
@@ -63,8 +63,8 @@ index badb2af35d..931cc3ed07 100644
|
||||
ifeq (@TEST_MODULES@,yes)
|
||||
LIBSUBDIRS += $(TESTSUBDIRS)
|
||||
endif
|
||||
@@ -1451,10 +1457,12 @@ ifeq (@PYC_BUILD@,yes)
|
||||
-d $(LIBDEST)/site-packages -f \
|
||||
@@ -1511,10 +1517,12 @@ ifeq (@PYC_BUILD@,yes)
|
||||
-j0 -d $(LIBDEST)/site-packages -f \
|
||||
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
||||
endif
|
||||
+ifeq (@LIB2TO3@,yes)
|
||||
@@ -74,13 +74,13 @@ index badb2af35d..931cc3ed07 100644
|
||||
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
|
||||
+endif
|
||||
|
||||
python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
||||
@ # Substitution happens here, as the completely-expanded BINDIR
|
||||
# bpo-21536: Misc/python-config.sh is generated in the build directory
|
||||
# from $(srcdir)Misc/python-config.sh.in.
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1621fa1611..13b2edf8b7 100644
|
||||
index f53cc86d89..caa8eaf88a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3238,6 +3238,12 @@ AC_ARG_ENABLE(test-modules,
|
||||
@@ -3225,6 +3225,12 @@ AC_ARG_ENABLE(test-modules,
|
||||
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
|
||||
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
|
||||
|
||||
@@ -94,10 +94,10 @@ index 1621fa1611..13b2edf8b7 100644
|
||||
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
|
||||
AC_MSG_CHECKING([if --enable-ipv6 is specified])
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 94dd337fef..76429e1326 100644
|
||||
index 748c269960..1669797cad 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2377,10 +2377,11 @@ def main():
|
||||
@@ -2402,10 +2402,11 @@ def main():
|
||||
import warnings
|
||||
warnings.filterwarnings("ignore",category=DeprecationWarning)
|
||||
|
||||
@@ -112,5 +112,5 @@ index 94dd337fef..76429e1326 100644
|
||||
setup(# PyPI Metadata (PEP 301)
|
||||
name = "Python",
|
||||
--
|
||||
2.13.5
|
||||
2.20.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user