···

       
8
       
 
       
Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>

     

       
9
       
 
       
---

     

       
10
       
 
       
 mkosi/__init__.py   | 17 +++++++----------

     

       
11
       
-
       
 mkosi/bootloader.py |  5 +----

     

       
12
       
 
       
 mkosi/run.py        |  8 ++++----

     

       
13
       
-
       
 3 files changed, 12 insertions(+), 18 deletions(-)

     

       
14
       
 
       


     

       
15
       
 
       
diff --git a/mkosi/__init__.py b/mkosi/__init__.py

     

       
16
       
 
       
index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee6637b95bcb 100644

     
···

       
98
       
 
       
         die(

     

       
99
       
 
       
             f"Found '{ukify}' with version {v} but version {version} or newer is required to {reason}.",

     

       
100
       
 
       
diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py

     

       
101
       
-
       
index 6f112b854f72a8863dc5e7348f0154851d3dda96..8fdf2c5df7950c032bfcd36d89f7824e86ec9173 100644

     

       
102
       
 
       
--- a/mkosi/bootloader.py

     

       
103
       
 
       
+++ b/mkosi/bootloader.py

     

       
104
       
-
       
@@ -268,10 +268,7 @@ def find_signed_grub_image(context: Context) -> Optional[Path]:

     

       
105
       
-
       
 

     

       
106
       
-
       
 

     

       
107
       
 
       
 def python_binary(config: Config) -> PathString:

     

       
108
       
-
       
-    # If there's no tools tree, prefer the interpreter from MKOSI_INTERPRETER. If there is a tools

     

       
109
       
-
       
-    # tree, just use the default python3 interpreter.

     

       
110
       
 
       
-    exe = Path(sys.executable)

     

       
111
       
 
       
-    return "python3" if config.tools_tree or not exe.is_relative_to("/usr") else exe

     

       
112
       
-
       
+    return "@PYTHON_PEFILE@"

     

       
113
       
 
       
 

     

       
114
       
 
       
 

     

       
115
       
 
       
 def extract_pe_section(context: Context, binary: Path, section: str, output: Path) -> Path:

     

···

       
8
       
 
       
Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>

     

       
9
       
 
       
---

     

       
10
       
 
       
 mkosi/__init__.py   | 17 +++++++----------

     

       
11
       
+
       
 mkosi/bootloader.py |  3 +--

     

       
12
       
 
       
 mkosi/run.py        |  8 ++++----

     

       
13
       
+
       
 3 files changed, 12 insertions(+), 16 deletions(-)

     

       
14
       
 
       


     

       
15
       
 
       
diff --git a/mkosi/__init__.py b/mkosi/__init__.py

     

       
16
       
 
       
index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee6637b95bcb 100644

     
···

       
98
       
 
       
         die(

     

       
99
       
 
       
             f"Found '{ukify}' with version {v} but version {version} or newer is required to {reason}.",

     

       
100
       
 
       
diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py

     

       
101
       
+
       
index 6f112b854f72a8863dc5e7348f0154851d3dda96..28b32b9c8fcaa7c49a7d69e7e303ccf332d47d58 100644

     

       
102
       
 
       
--- a/mkosi/bootloader.py

     

       
103
       
 
       
+++ b/mkosi/bootloader.py

     

       
104
       
+
       
@@ -270,8 +270,7 @@ def find_signed_grub_image(context: Context) -> Optional[Path]:

     

       
0
       
 
       

     

       
0
       
 
       

     

       
105
       
 
       
 def python_binary(config: Config) -> PathString:

     

       
106
       
+
       
     # If there's no tools tree, prefer the interpreter from MKOSI_INTERPRETER. If there is a tools

     

       
107
       
+
       
     # tree, just use the default python3 interpreter.

     

       
108
       
 
       
-    exe = Path(sys.executable)

     

       
109
       
 
       
-    return "python3" if config.tools_tree or not exe.is_relative_to("/usr") else exe

     

       
110
       
+
       
+    return "python3" if config.tools_tree else "@PYTHON_PEFILE@"

     

       
111
       
 
       
 

     

       
112
       
 
       
 

     

       
113
       
 
       
 def extract_pe_section(context: Context, binary: Path, section: str, output: Path) -> Path: