diff options
Diffstat (limited to 'recipes-extended/ceph/ceph/0001-cephadm-build.py-avoid-using-python3-from-sysroot-wh.patch')
-rw-r--r-- | recipes-extended/ceph/ceph/0001-cephadm-build.py-avoid-using-python3-from-sysroot-wh.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/recipes-extended/ceph/ceph/0001-cephadm-build.py-avoid-using-python3-from-sysroot-wh.patch b/recipes-extended/ceph/ceph/0001-cephadm-build.py-avoid-using-python3-from-sysroot-wh.patch new file mode 100644 index 00000000..a353a2f7 --- /dev/null +++ b/recipes-extended/ceph/ceph/0001-cephadm-build.py-avoid-using-python3-from-sysroot-wh.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From b9867e6b744b77d97d22333eca3ab3d23d47e2e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Thu, 14 Mar 2024 00:19:19 -0700 | ||
4 | Subject: [PATCH] cephadm/build.py: avoid using python3 from sysroot when | ||
5 | creating zipapp archive | ||
6 | |||
7 | ceph has the assumption that the python used during build | ||
8 | is the python used at target, but this is not true for | ||
9 | cross compilation. We'll need to use the target python3 here, | ||
10 | otherwise, the cephadm zipapp cannot be executed. | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
15 | --- | ||
16 | src/cephadm/build.py | 4 ++-- | ||
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/src/cephadm/build.py b/src/cephadm/build.py | ||
20 | index 4264b814f1e..a4483d6f79d 100755 | ||
21 | --- a/src/cephadm/build.py | ||
22 | +++ b/src/cephadm/build.py | ||
23 | @@ -93,7 +93,7 @@ def _compile(dest, tempdir): | ||
24 | zipapp.create_archive( | ||
25 | source=tempdir, | ||
26 | target=dest, | ||
27 | - interpreter=sys.executable, | ||
28 | + interpreter='/usr/bin/python3', | ||
29 | compressed=True, | ||
30 | ) | ||
31 | log.info("Zipapp created with compression") | ||
32 | @@ -102,7 +102,7 @@ def _compile(dest, tempdir): | ||
33 | zipapp.create_archive( | ||
34 | source=tempdir, | ||
35 | target=dest, | ||
36 | - interpreter=sys.executable, | ||
37 | + interpreter='/usr/bin/python3', | ||
38 | ) | ||
39 | log.info("Zipapp created without compression") | ||
40 | |||
41 | -- | ||
42 | 2.42.0 | ||
43 | |||