diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-06-21 22:16:23 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-22 22:40:28 +0100 |
| commit | 32e2e1b41163ee473494a6fd3f74cb9e891e0ed2 (patch) | |
| tree | f41cf420c6805b29e97bdaacd2a03d4242a74be7 | |
| parent | d49db48d352f8b4d1a16bb7a960fa1ceb2168243 (diff) | |
| download | poky-32e2e1b41163ee473494a6fd3f74cb9e891e0ed2.tar.gz | |
python3-numpy: update 1.22.3 -> 1.22.4
(From OE-Core rev: 6d87caa86df3109b8f45d287094281b02c7c0ac0)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/python/python3-numpy/0001-generate_umath.py-do-not-write-full-path-to-output-f.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3-numpy_1.22.4.bb (renamed from meta/recipes-devtools/python/python3-numpy_1.22.3.bb) | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python3-numpy/0001-generate_umath.py-do-not-write-full-path-to-output-f.patch b/meta/recipes-devtools/python/python3-numpy/0001-generate_umath.py-do-not-write-full-path-to-output-f.patch new file mode 100644 index 0000000000..41dea89682 --- /dev/null +++ b/meta/recipes-devtools/python/python3-numpy/0001-generate_umath.py-do-not-write-full-path-to-output-f.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 3c7deaa3a961a0f3ce4ff108468e3d70118f17b3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Thu, 9 Jun 2022 17:23:42 +0200 | ||
| 4 | Subject: [PATCH] generate_umath.py: do not write full path to output files | ||
| 5 | |||
| 6 | This helps reproducibility as those paths vary in automated | ||
| 7 | build environments. | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/21707] | ||
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 11 | |||
| 12 | --- | ||
| 13 | numpy/core/code_generators/generate_umath.py | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/numpy/core/code_generators/generate_umath.py b/numpy/core/code_generators/generate_umath.py | ||
| 17 | index 292d9e0..df37941 100644 | ||
| 18 | --- a/numpy/core/code_generators/generate_umath.py | ||
| 19 | +++ b/numpy/core/code_generators/generate_umath.py | ||
| 20 | @@ -1233,7 +1233,7 @@ def make_code(funcdict, filename): | ||
| 21 | |||
| 22 | return 0; | ||
| 23 | } | ||
| 24 | - """) % (filename, code1, code2, code3) | ||
| 25 | + """) % (os.path.basename(filename), code1, code2, code3) | ||
| 26 | return code | ||
| 27 | |||
| 28 | |||
diff --git a/meta/recipes-devtools/python/python3-numpy_1.22.3.bb b/meta/recipes-devtools/python/python3-numpy_1.22.4.bb index b5b1c4e714..8ad3442413 100644 --- a/meta/recipes-devtools/python/python3-numpy_1.22.3.bb +++ b/meta/recipes-devtools/python/python3-numpy_1.22.4.bb | |||
| @@ -11,8 +11,9 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S | |||
| 11 | file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ | 11 | file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ |
| 12 | file://0001-numpy-core-Define-RISCV-32-support.patch \ | 12 | file://0001-numpy-core-Define-RISCV-32-support.patch \ |
| 13 | file://run-ptest \ | 13 | file://run-ptest \ |
| 14 | file://0001-generate_umath.py-do-not-write-full-path-to-output-f.patch \ | ||
| 14 | " | 15 | " |
| 15 | SRC_URI[sha256sum] = "a906c0b4301a3d62ccf66d058fe779a65c1c34f6719ef2058f96e1856f48bca5" | 16 | SRC_URI[sha256sum] = "b4308198d0e41efaa108e57d69973398439c7299a9d551680cdd603cf6d20709" |
| 16 | 17 | ||
| 17 | UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" | 18 | UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" |
| 18 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" | 19 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" |
