<div dir="ltr">It looks like the .so files (specifically gdbm and bsddb) are getting dropped from the manifest when I run the create manifest task. I'll have to take a look at why those aren't getting pulled into the dependency list.</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 29, 2018 at 2:49 PM, Derek Straka <span dir="ltr"><<a href="mailto:derek@asterius.io" target="_blank">derek@asterius.io</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Oh no, I did not. I will send a v2 with an updated manifest. Thanks for catching that.<span class="HOEnZb"><font color="#888888"><div><br></div><div>-Derek</div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 29, 2018 at 2:23 PM, Alejandro Enedino Hernandez Samaniego <span dir="ltr"><<a href="mailto:alejandro.enedino.hernandez-samaniego@xilinx.com" target="_blank">alejandro.enedino.hernandez-<wbr>samaniego@xilinx.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hey Derek,<br>
<br>
<br>
Just a quick question, did you run the create manifest task along with the upgrade?<br>
<br>
<br>
Cheers,<br>
<br>
<br>
Alejandro<div class="m_-808748226281533204HOEnZb"><div class="m_-808748226281533204h5"><br>
<br>
<br>
On 01/26/2018 11:25 AM, Derek Straka wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Rebased:<br>
- python/01-use-proper-tools-for<wbr>-cross-build.patch<br>
- python/fix-makefile-for-ptest.<wbr>patch<br>
- python/parallel-makeinst-creat<wbr>e-bindir.patch<br>
<br>
Removed Upstreamed Patch:<br>
- python/Don-t-use-getentropy-on<wbr>-Linux.patch<br>
<br>
Updated license checksum for changes in the copyright date. The license<br>
terms remain unchanged<br>
<br>
Added an extra do_compile item to create the native pgen that no longer<br>
gets compiled by default<br>
<br>
Signed-off-by: Derek Straka <<a href="mailto:derek@asterius.io" target="_blank">derek@asterius.io</a>><br>
---<br>
...<a href="http://on-native_2.7.13.bb" rel="noreferrer" target="_blank">on-native_2.7.13.bb</a> => <a href="http://python-native_2.7.14.bb" rel="noreferrer" target="_blank">python-native_2.7.14.bb</a>} | 6 ++++<br>
meta/recipes-devtools/python/p<wbr>ython.inc | 6 ++--<br>
.../01-use-proper-tools-for-cr<wbr>oss-build.patch | 17 +++++----<br>
.../python/Don-t-use-getentrop<wbr>y-on-Linux.patch | 41 ----------------------<br>
.../python/python/fix-makefile<wbr>-for-ptest.patch | 6 ++--<br>
.../python/parallel-makeinst-c<wbr>reate-bindir.patch | 12 +++----<br>
.../python/{<a href="http://python_2.7.13.bb" rel="noreferrer" target="_blank">python_2.7.13.bb</a> => <a href="http://python_2.7.14.bb" rel="noreferrer" target="_blank">python_2.7.14.bb</a>} | 1 -<br>
7 files changed, 28 insertions(+), 61 deletions(-)<br>
rename meta/recipes-devtools/python/{<a href="http://python-native_2.7.13.bb" rel="noreferrer" target="_blank"><wbr>python-native_2.7.13.bb</a> => <a href="http://python-native_2.7.14.bb" rel="noreferrer" target="_blank">python-native_2.7.14.bb</a>} (94%)<br>
delete mode 100644 meta/recipes-devtools/python/p<wbr>ython/Don-t-use-getentropy-on-<wbr>Linux.patch<br>
rename meta/recipes-devtools/python/{<a href="http://python_2.7.13.bb" rel="noreferrer" target="_blank"><wbr>python_2.7.13.bb</a> => <a href="http://python_2.7.14.bb" rel="noreferrer" target="_blank">python_2.7.14.bb</a>} (99%)<br>
<br>
diff --git a/meta/recipes-devtools/python<wbr>/<a href="http://python-native_2.7.13.bb" rel="noreferrer" target="_blank">python-native_2.7.13.bb</a> b/meta/recipes-devtools/python<wbr>/<a href="http://python-native_2.7.14.bb" rel="noreferrer" target="_blank">python-native_2.7.14.bb</a><br>
similarity index 94%<br>
rename from meta/recipes-devtools/python/<a href="http://python-native_2.7.13.bb" rel="noreferrer" target="_blank">p<wbr>ython-native_2.7.13.bb</a><br>
rename to meta/recipes-devtools/python/<a href="http://python-native_2.7.14.bb" rel="noreferrer" target="_blank">p<wbr>ython-native_2.7.14.bb</a><br>
index 2b74003..622cb38 100644<br>
--- a/meta/recipes-devtools/python<wbr>/<a href="http://python-native_2.7.13.bb" rel="noreferrer" target="_blank">python-native_2.7.13.bb</a><br>
+++ b/meta/recipes-devtools/python<wbr>/<a href="http://python-native_2.7.14.bb" rel="noreferrer" target="_blank">python-native_2.7.14.bb</a><br>
@@ -36,6 +36,12 @@ do_configure_append() {<br>
autoreconf --verbose --install --force --exclude=autopoint ../Python-${PV}/Modules/_ctype<wbr>s/libffi<br>
}<br>
+# Regenerate all of the generated files<br>
+# This ensures that pgen and friends get created during the compile phase<br>
+do_compile_prepend() {<br>
+ oe_runmake regen-all<br>
+}<br>
+<br>
do_install() {<br>
oe_runmake 'DESTDIR=${D}' install<br>
install -d ${D}${bindir}/${PN}<br>
diff --git a/meta/recipes-devtools/python<wbr>/python.inc b/meta/recipes-devtools/python<wbr>/python.inc<br>
index b40f551..979b601 100644<br>
--- a/meta/recipes-devtools/python<wbr>/python.inc<br>
+++ b/meta/recipes-devtools/python<wbr>/python.inc<br>
@@ -5,12 +5,12 @@ SECTION = "devel/python"<br>
# bump this on every change in contrib/python/<a href="http://generate-manifest-2.7.py" rel="noreferrer" target="_blank">generate-manife<wbr>st-2.7.py</a><br>
INC_PR = "r1"<br>
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6b60258130<wbr>e4ed10d3101517eb5b9385"<br>
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f741e51de9<wbr>1d4eeea5930b9c3c7fa69d"<br>
SRC_URI = "<a href="http://www.python.org/ftp/python/$%7BPV%7D/Python-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">http://www.python.org/ftp/pyt<wbr>hon/${PV}/Python-${PV}.tar.xz</a>"<br>
-SRC_URI[md5sum] = "53b43534153bb2a0363f08bae8b9d<wbr>990"<br>
-SRC_URI[sha256sum] = "35d543986882f78261f97787fd3e0<wbr>6274bfa6df29fac9b4a94f73930ff9<wbr>8f731"<br>
+SRC_URI[md5sum] = "1f6db41ad91d9eb0a6f0c769b8613<wbr>c5b"<br>
+SRC_URI[sha256sum] = "71ffb26e09e78650e424929b2b457<wbr>b9c912ac216576e6bd9e7d204ed032<wbr>96a66"<br>
# python recipe is actually python 2.x<br>
# also, exclude pre-releases for both python 2.x and 3.x<br>
diff --git a/meta/recipes-devtools/python<wbr>/python/01-use-proper-tools-fo<wbr>r-cross-build.patch b/meta/recipes-devtools/python<wbr>/python/01-use-proper-tools-fo<wbr>r-cross-build.patch<br>
index 366ce3e..e795a74 100644<br>
--- a/meta/recipes-devtools/python<wbr>/python/01-use-proper-tools-fo<wbr>r-cross-build.patch<br>
+++ b/meta/recipes-devtools/python<wbr>/python/01-use-proper-tools-fo<wbr>r-cross-build.patch<br>
@@ -9,6 +9,9 @@ Signed-off-by: Paul Eggleton <<a href="mailto:paul.eggleton@linux.intel.com" target="_blank">paul.eggleton@linux.intel.com</a><wbr>><br>
Rebased for python-2.7.9<br>
Signed-off-by: Alejandro Hernandez <<a href="mailto:alejandro.hernandez@linux.intel.com" target="_blank">alejandro.hernandez@linux.int<wbr>el.com</a>><br>
+Rebased for python-2.7.14<br>
+Signed-off-by: Derek Straka <<a href="mailto:derek@asterius.io" target="_blank">derek@asterius.io</a>><br>
+<br>
Index: Python-2.7.13/<a href="http://Makefile.pre.in" rel="noreferrer" target="_blank">Makefile.pre.in</a><br>
==============================<wbr>==============================<wbr>=======<br>
--- Python-2.7.13.orig/<a href="http://Makefile.pre.in" rel="noreferrer" target="_blank">Makefile.pr<wbr>e.in</a><br>
@@ -30,14 +33,14 @@ Index: Python-2.7.13/<a href="http://Makefile.pre.in" rel="noreferrer" target="_blank">Makefile.pre.in</a><br>
# Create build directory and generate the sysconfig build-time data there.<br>
# pybuilddir.txt contains the name of the build dir and is used for<br>
-@@ -681,7 +682,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p<br>
-<br>
- $(GRAMMAR_H): @GENERATED_COMMENT@ $(GRAMMAR_INPUT) $(PGEN)<br>
+@@ -663,7 +663,7 @@<br>
+ # Regenerate Include/graminit.h and Python/graminit.c<br>
+ # from Grammar/Grammar using pgen<br>
@$(MKDIR_P) Include<br>
-- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)<br>
-+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)<br>
- $(GRAMMAR_C): @GENERATED_COMMENT@ $(GRAMMAR_H)<br>
- touch $(GRAMMAR_C)<br>
+- $(PGEN) $(srcdir)/Grammar/Grammar \<br>
++ $(HOSTPGEN) $(srcdir)/Grammar/Grammar \<br>
+ $(srcdir)/Include/graminit.h \<br>
+ $(srcdir)/Python/graminit.c<br>
@@ -1121,27 +1122,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL<br>
$(DESTDIR)$(LIBDEST)/distutils<wbr>/tests ; \<br>
diff --git a/meta/recipes-devtools/python<wbr>/python/Don-t-use-getentropy-o<wbr>n-Linux.patch b/meta/recipes-devtools/python<wbr>/python/Don-t-use-getentropy-o<wbr>n-Linux.patch<br>
deleted file mode 100644<br>
index 38e5377..0000000<br>
--- a/meta/recipes-devtools/python<wbr>/python/Don-t-use-getentropy-o<wbr>n-Linux.patch<br>
+++ /dev/null<br>
@@ -1,41 +0,0 @@<br>
-Upstream-Status: Backport<br>
-<br>
-Signed-off-by: Andreas Oberritter <<a href="mailto:obi@opendreambox.org" target="_blank">obi@opendreambox.org</a>><br>
-<br>
-From 905d1b30ac7cb0e31c57cec0533825<wbr>c8f170b942 Mon Sep 17 00:00:00 2001<br>
-From: Victor Stinner <<a href="mailto:victor.stinner@gmail.com" target="_blank">victor.stinner@gmail.com</a>><br>
-Date: Mon, 9 Jan 2017 11:10:41 +0100<br>
-Subject: [PATCH] Don't use getentropy() on Linux<br>
-<br>
-Issue #29188: Support glibc 2.24 on Linux: don't use getentropy() function but<br>
-read from /dev/urandom to get random bytes, for example in os.urandom(). On<br>
-Linux, getentropy() is implemented which getrandom() is blocking mode, whereas<br>
-os.urandom() should not block.<br>
-<br>
-(cherry picked from commit 2687486756721e39164fa9f597e468<wbr>c35d495227)<br>
----<br>
- Python/random.c | 11 +++++++++--<br>
- 1 file changed, 9 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/Python/random.c b/Python/random.c<br>
-index b4bc1f3..f3f5d14 100644<br>
---- a/Python/random.c<br>
-+++ b/Python/random.c<br>
-@@ -94,8 +94,15 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise)<br>
- }<br>
-<br>
- /* Issue #25003: Don't use getentropy() on Solaris (available since<br>
-- * Solaris 11.3), it is blocking whereas os.urandom() should not block. */<br>
--#elif defined(HAVE_GETENTROPY) && !defined(sun)<br>
-+ Solaris 11.3), it is blocking whereas os.urandom() should not block.<br>
-+<br>
-+ Issue #29188: Don't use getentropy() on Linux since the glibc 2.24<br>
-+ implements it with the getrandom() syscall which can fail with ENOSYS,<br>
-+ and this error is not supported in py_getentropy() and getrandom() is called<br>
-+ with flags=0 which blocks until system urandom is initialized, which is not<br>
-+ the desired behaviour to seed the Python hash secret nor for os.urandom():<br>
-+ see the PEP 524 which was only implemented in Python 3.6. */<br>
-+#elif defined(HAVE_GETENTROPY) && !defined(sun) && !defined(linux)<br>
- #define PY_GETENTROPY 1<br>
-<br>
- /* Fill buffer with size pseudo-random bytes generated by getentropy().<br>
diff --git a/meta/recipes-devtools/python<wbr>/python/fix-makefile-for-ptest<wbr>.patch b/meta/recipes-devtools/python<wbr>/python/fix-makefile-for-ptest<wbr>.patch<br>
index 669112d..90dcd57 100644<br>
--- a/meta/recipes-devtools/python<wbr>/python/fix-makefile-for-ptest<wbr>.patch<br>
+++ b/meta/recipes-devtools/python<wbr>/python/fix-makefile-for-ptest<wbr>.patch<br>
@@ -15,7 +15,7 @@ diff -ruN a/<a href="http://Makefile.pre.in" rel="noreferrer" target="_blank">Makefile.pre.in</a> b/<a href="http://Makefile.pre.in" rel="noreferrer" target="_blank">Makefile.pre.in</a><br>
+TESTOPTS= -l -v $(EXTRATESTOPTS)<br>
TESTPROG= $(srcdir)/Lib/test/regrtest.py<br>
-TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)<br>
--test: all platform<br>
+-test: @DEF_MAKE_RULE@ platform<br>
- -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f<br>
+TESTPYTHON= $(RUNSHARED) $(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)<br>
+test: build-test<br>
@@ -26,8 +26,8 @@ diff -ruN a/<a href="http://Makefile.pre.in" rel="noreferrer" target="_blank">Makefile.pre.in</a> b/<a href="http://Makefile.pre.in" rel="noreferrer" target="_blank">Makefile.pre.in</a><br>
-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)<br>
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)<br>
-+build-test: all platform<br>
++build-test: @DEF_MAKE_RULE@ platform<br>
+<br>
- testall: all platform<br>
+ testall: @DEF_MAKE_RULE@ platform<br>
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f<br>
$(TESTPYTHON) $(srcdir)/Lib/compileall.py<br>
diff --git a/meta/recipes-devtools/python<wbr>/python/parallel-makeinst-crea<wbr>te-bindir.patch b/meta/recipes-devtools/python<wbr>/python/parallel-makeinst-crea<wbr>te-bindir.patch<br>
index 951cb46..abab41e 100644<br>
--- a/meta/recipes-devtools/python<wbr>/python/parallel-makeinst-crea<wbr>te-bindir.patch<br>
+++ b/meta/recipes-devtools/python<wbr>/python/parallel-makeinst-crea<wbr>te-bindir.patch<br>
@@ -8,12 +8,12 @@ Upstream-Status: Pending<br>
--- Python-2.7.3.orig/<a href="http://Makefile.pre.in" rel="noreferrer" target="_blank">Makefile.pre<wbr>.in</a><br>
+++ Python-2.7.3/<a href="http://Makefile.pre.in" rel="noreferrer" target="_blank">Makefile.pre.in</a><br>
-@@ -1008,7 +1008,7 @@ LIBPL= $(LIBP)/config<br>
+@@ -1187,7 +1187,7 @@<br>
LIBPC= $(LIBDIR)/pkgconfig<br>
-<br>
- libainstall: all python-config<br>
+<br>
+ libainstall: @DEF_MAKE_RULE@ python-config<br>
- @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \<br>
+ @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC) $(BINDIR); \<br>
- do \<br>
- if test ! -d $(DESTDIR)$$i; then \<br>
- echo "Creating directory $$i"; \<br>
+ do \<br>
+ if test ! -d $(DESTDIR)$$i; then \<br>
+ echo "Creating directory $$i"; \<br>
diff --git a/meta/recipes-devtools/python<wbr>/<a href="http://python_2.7.13.bb" rel="noreferrer" target="_blank">python_2.7.13.bb</a> b/meta/recipes-devtools/python<wbr>/<a href="http://python_2.7.14.bb" rel="noreferrer" target="_blank">python_2.7.14.bb</a><br>
similarity index 99%<br>
rename from meta/recipes-devtools/python/<a href="http://python_2.7.13.bb" rel="noreferrer" target="_blank">p<wbr>ython_2.7.13.bb</a><br>
rename to meta/recipes-devtools/python/<a href="http://python_2.7.14.bb" rel="noreferrer" target="_blank">p<wbr>ython_2.7.14.bb</a><br>
index dbafb95..13455ff 100644<br>
--- a/meta/recipes-devtools/python<wbr>/<a href="http://python_2.7.13.bb" rel="noreferrer" target="_blank">python_2.7.13.bb</a><br>
+++ b/meta/recipes-devtools/python<wbr>/<a href="http://python_2.7.14.bb" rel="noreferrer" target="_blank">python_2.7.14.bb</a><br>
@@ -28,7 +28,6 @@ SRC_URI += "\<br>
file://parallel-makeinst-creat<wbr>e-bindir.patch \<br>
file://use_sysroot_ncurses_ins<wbr>tead_of_host.patch \<br>
file://add-CROSSPYTHONPATH-for<wbr>-PYTHON_FOR_BUILD.patch \<br>
- file://Don-t-use-getentropy-on<wbr>-Linux.patch \<br>
file://pass-missing-libraries-<wbr>to-Extension-for-mul.patch \<br>
file://support_SOURCE_DATE_EPO<wbr>CH_in_py_compile_2.7.patch \<br>
"<br>
</blockquote>
</div></div></blockquote></div><br></div>
</div></div></blockquote></div><br></div>