diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-13 23:19:29 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-16 21:23:43 +0100 |
| commit | a4b94a7ff21289282fb7dbc00c351d42366bb39c (patch) | |
| tree | 7905d53dc546e5cc18fae4bcb7d2bd903a4bd2d4 /meta | |
| parent | 262d2c6b6c4f357a8ec083af0934dcbb3acd169c (diff) | |
| download | poky-a4b94a7ff21289282fb7dbc00c351d42366bb39c.tar.gz | |
python3: Add a fix for a make install race
Add a fix for reproducibility issues where pyc files for python-config.py
may not always be generated.
(From OE-Core rev: d1c3a87c48b598b6e5624d0affe8bd89320631bf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/python/python3/makerace.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3_3.9.6.bb | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch new file mode 100644 index 0000000000..96744cb557 --- /dev/null +++ b/meta/recipes-devtools/python/python3/makerace.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | libainstall installs python-config.py but the .pyc cache files are generated | ||
| 2 | by the libinstall target. This means some builds may not generate the pyc files | ||
| 3 | for python-config.py depending on the order things happen in. This means builds | ||
| 4 | are not always reproducible. | ||
| 5 | |||
| 6 | Add a dependency to avoid the race. | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 10 | |||
| 11 | Index: Python-3.9.6/Makefile.pre.in | ||
| 12 | =================================================================== | ||
| 13 | --- Python-3.9.6.orig/Makefile.pre.in | ||
| 14 | +++ Python-3.9.6/Makefile.pre.in | ||
| 15 | @@ -1486,7 +1486,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter | ||
| 16 | venv venv/scripts venv/scripts/common venv/scripts/posix \ | ||
| 17 | curses pydoc_data \ | ||
| 18 | zoneinfo | ||
| 19 | -libinstall: build_all $(srcdir)/Modules/xxmodule.c | ||
| 20 | +libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall | ||
| 21 | @for i in $(SCRIPTDIR) $(LIBDEST); \ | ||
| 22 | do \ | ||
| 23 | if test ! -d $(DESTDIR)$$i; then \ | ||
diff --git a/meta/recipes-devtools/python/python3_3.9.6.bb b/meta/recipes-devtools/python/python3_3.9.6.bb index af7ed208b9..986dfda83d 100644 --- a/meta/recipes-devtools/python/python3_3.9.6.bb +++ b/meta/recipes-devtools/python/python3_3.9.6.bb | |||
| @@ -31,6 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
| 31 | file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \ | 31 | file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \ |
| 32 | file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \ | 32 | file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \ |
| 33 | file://0001-test_ctypes.test_find-skip-without-tools-sdk.patch \ | 33 | file://0001-test_ctypes.test_find-skip-without-tools-sdk.patch \ |
| 34 | file://makerace.patch \ | ||
| 34 | " | 35 | " |
| 35 | 36 | ||
| 36 | SRC_URI_append_class-native = " \ | 37 | SRC_URI_append_class-native = " \ |
