]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
make.sh: Install the QEMU helper only once
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Jul 2024 10:18:23 +0000 (10:18 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Jul 2024 15:21:20 +0000 (15:21 +0000)
This needs to be done only once when we initialize the environment.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
make.sh

diff --git a/make.sh b/make.sh
index 1d65e4ecdf59bb0153a17525c3a13f469aab326d..d436867dcfca4aebca0caa5484b709b4e20098c4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -574,6 +574,9 @@ prepareenv() {
        export CCACHE_TEMPDIR="/tmp"
        export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER} ${BUILD_ARCH}"
 
+       # Install the QEMU helper
+       qemu_install_helper
+
        # Remove pre-install list of installed files in case user erase some files before rebuild
        rm -f "${BUILD_DIR}/usr/src/lsalr"
 
@@ -615,9 +618,6 @@ prepareenv() {
 }
 
 enterchroot() {
-       # Install QEMU helper, if needed
-       qemu_install_helper
-
        local PATH="${TOOLS_DIR}/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:${TOOLS_DIR}/sbin:${TOOLS_DIR}/bin"
 
        # Check if we are running in our namespace