From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 02/24] python3: do not compile .pyc in parallel during do_install()
Date: Mon, 20 Jan 2020 18:24:48 +0100 [thread overview]
Message-ID: <20200120172510.22648-2-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200120172510.22648-1-alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...file-do-not-compile-.pyc-in-parallel.patch | 58 +++++++++++++++++++
...fig-append-STAGING_LIBDIR-python-sys.patch | 2 +-
...tutils-prefix-is-inside-staging-area.patch | 2 +-
meta/recipes-devtools/python/python3_3.8.1.bb | 1 +
4 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
diff --git a/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch b/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
new file mode 100644
index 00000000000..b1bceac512e
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
@@ -0,0 +1,58 @@
+From c501e121a872cbcef8ffe626c1de173a125be9f8 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 16 Jan 2020 12:34:20 +0100
+Subject: [PATCH] Makefile: do not compile .pyc in parallel
+
+This was found to break reproducibility, and produce strange file ownership
+races.
+
+The upstream commit introducing the change was:
+https://github.com/python/cpython/commit/1a2dd82f56bd813aacc570e172cefe55a8a41504
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Makefile.pre.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 1241112..5dfdf44 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1457,30 +1457,30 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
+ fi
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST) -f \
++ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ $(DESTDIR)$(LIBDEST)
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST) -f \
++ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ $(DESTDIR)$(LIBDEST)
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST) -f \
++ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ $(DESTDIR)$(LIBDEST)
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST)/site-packages -f \
++ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST)/site-packages -f \
++ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST)/site-packages -f \
++ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
index 03719cafcdf..03f60088fe6 100644
--- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
@@ -1,4 +1,4 @@
-From 14eecf00459c0af698ed811e4f8bea460aada681 Mon Sep 17 00:00:00 2001
+From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 31 Jan 2019 16:46:30 +0100
Subject: [PATCH] distutils/sysconfig: append
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index 3105f0d1760..6fe9839f776 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,4 +1,4 @@
-From 6ca960869738fc89041a2e672d8e28b51e73d3c6 Mon Sep 17 00:00:00 2001
+From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 14 May 2013 15:00:26 -0700
Subject: [PATCH] python3: Add target and native recipes
diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb
index a798f9828a6..a71c207d9fa 100644
--- a/meta/recipes-devtools/python/python3_3.8.1.bb
+++ b/meta/recipes-devtools/python/python3_3.8.1.bb
@@ -28,6 +28,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0001-test_locale.py-correct-the-test-output-format.patch \
file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \
file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
+ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \
"
SRC_URI_append_class-native = " \
--
2.17.1
next prev parent reply other threads:[~2020-01-20 17:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 17:24 [PATCH 01/24] python3: update to 3.8.1 Alexander Kanavin
2020-01-20 17:24 ` Alexander Kanavin [this message]
2020-01-20 17:24 ` [PATCH 03/24] python3: correctly process ptest output with sed Alexander Kanavin
2020-01-20 17:24 ` [PATCH 04/24] gstreamer1.0-python: add a patch to fix python 3.8 builds Alexander Kanavin
2020-01-20 17:24 ` [PATCH 05/24] nss: update to 3.49.1 Alexander Kanavin
2020-01-21 12:04 ` Andreas Müller
2020-01-21 12:47 ` Richard Purdie
2020-01-21 19:35 ` Khem Raj
2020-01-21 20:22 ` Richard Purdie
2020-01-21 22:02 ` Khem Raj
2020-01-22 8:13 ` Khem Raj
2020-01-20 17:24 ` [PATCH 06/24] libcap: update to 2.31 Alexander Kanavin
2020-01-20 17:24 ` [PATCH 07/24] selftest: check maintainers.inc for entries without recipes Alexander Kanavin
2020-01-20 17:24 ` [PATCH 08/24] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-01-20 17:24 ` [PATCH 09/24] ptests: exclude mdadm from ptesting Alexander Kanavin
2020-01-20 17:24 ` [PATCH 10/24] ptests: exclude lttng-tools Alexander Kanavin
2020-01-20 17:37 ` Jonathan Rajotte-Julien
2020-01-20 17:44 ` Alexander Kanavin
2020-01-24 12:47 ` Alexander Kanavin
2020-01-24 15:35 ` Jonathan Rajotte-Julien
2020-01-20 22:46 ` Richard Purdie
2020-01-20 17:24 ` [PATCH 11/24] openssh: applied upstream fix for "cert not yet valid" test Alexander Kanavin
2020-01-20 17:24 ` [PATCH 12/24] openssh: explicitly skip unit tests Alexander Kanavin
2020-01-20 17:24 ` [PATCH 13/24] parted: fix more ptests Alexander Kanavin
2020-01-20 17:25 ` [PATCH 14/24] qemu.inc: add vfat to MACHINE_FEATURES Alexander Kanavin
2020-01-20 17:25 ` [PATCH 15/24] rt-tests: exclude another development version (1.6) Alexander Kanavin
2020-01-20 17:25 ` [PATCH 16/24] btrfs-tools: upgrade 5.4 -> 5.4.1 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 17/24] libpipeline: upgrade 1.5.1 -> 1.5.2 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 18/24] msmtp: upgrade 1.8.6 -> 1.8.7 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 19/24] ffmpeg: upgrade 4.2.1 -> 4.2.2 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 20/24] epiphany: upgrade 3.34.2 -> 3.34.3.1 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 21/24] libwebp: upgrade 1.0.3 -> 1.1.0 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 22/24] createrepo-c: upgrade 0.15.4 -> 0.15.5 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 23/24] libsecret: upgrade 0.19.1 -> 0.20.0 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 24/24] meson: update 0.52.1 -> 0.53.0 Alexander Kanavin
2020-01-21 8:24 ` Richard Purdie
2020-01-21 18:44 ` Khem Raj
2020-01-23 15:48 ` Alexander Kanavin
2020-01-23 15:52 ` Khem Raj
2020-01-20 17:32 ` ✗ patchtest: failure for "python3: update to 3.8.1..." and 23 more Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200120172510.22648-2-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox