[3/4] livepatch: do the initial build using CROSS_COMPILE

Commit Message

Roger Pau Monné March 2, 2022, 2:27 p.m. UTC

Setting it afterwards for further builds will cause the build logic to
detect a change and thus force a rebuild of all sources.

Signed-off-by: Roger Pau Monné <[e-mail]>
---
 livepatch-build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Doebel, Bjoern March 2, 2022, 4:24 p.m. UTC | #1

On 02.03.22 15:27, Roger Pau Monne wrote:
> CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
> 
> 
> 
> Setting it afterwards for further builds will cause the build logic to
> detect a change and thus force a rebuild of all sources.
> 
> Signed-off-by: Roger Pau Monné <[e-mail]>
> ---
>   livepatch-build | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/livepatch-build b/livepatch-build
> index e1715ea..38a92be 100755
> --- a/livepatch-build
> +++ b/livepatch-build
> @@ -92,7 +92,6 @@ function build_special()
>       cd "${SRCDIR}" || die
> 
>       # Capture .o files from the patched build
> -    export CROSS_COMPILE="${TOOLSDIR}/livepatch-gcc "
>       export LIVEPATCH_BUILD_DIR="$(pwd)/"
>       export LIVEPATCH_CAPTURE_DIR="$OUTPUT/${name}"
>       mkdir -p "$LIVEPATCH_CAPTURE_DIR"
> @@ -408,6 +407,8 @@ if [ "${SKIP}" != "build" ]; then
>           XEN_DEBUG="debug=$XEN_DEBUG"
>       fi
> 
> +    export CROSS_COMPILE="${TOOLSDIR}/livepatch-gcc "
> +
>       echo "Perform full initial build with ${CPUS} CPU(s)..."
>       build_full
> 

Reviewed-by: Bjoern Doebel <[e-mail]>



Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879

Ross Lagerwall March 8, 2022, 1:52 p.m. UTC | #2

> From: Roger Pau Monne <[e-mail]>
> Sent: Wednesday, March 2, 2022 2:27 PM
> To: [e-mail] <[e-mail]>
> Cc: Ross Lagerwall <[e-mail]>; [e-mail] <[e-mail]>; [e-mail] <[e-mail]>; [e-mail] <[e-mail]>; Andrew Cooper <[e-mail]>; Roger Pau Monne <[e-mail]>
> Subject: [PATCH 3/4] livepatch: do the initial build using CROSS_COMPILE 
>  
> Setting it afterwards for further builds will cause the build logic to
> detect a change and thus force a rebuild of all sources.
> 
> Signed-off-by: Roger Pau Monné <[e-mail]>
> ---
>  livepatch-build | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/livepatch-build b/livepatch-build
> index e1715ea..38a92be 100755
> --- a/livepatch-build
> +++ b/livepatch-build
> @@ -92,7 +92,6 @@ function build_special()
>      cd "${SRCDIR}" || die
>  
>      # Capture .o files from the patched build
> -    export CROSS_COMPILE="${TOOLSDIR}/livepatch-gcc "
>      export LIVEPATCH_BUILD_DIR="$(pwd)/"
>      export LIVEPATCH_CAPTURE_DIR="$OUTPUT/${name}"
>      mkdir -p "$LIVEPATCH_CAPTURE_DIR"
> @@ -408,6 +407,8 @@ if [ "${SKIP}" != "build" ]; then
>          XEN_DEBUG="debug=$XEN_DEBUG"
>      fi
>  
> +    export CROSS_COMPILE="${TOOLSDIR}/livepatch-gcc "
> +
>      echo "Perform full initial build with ${CPUS} CPU(s)..."
>      build_full
>  
> -- 
> 2.34.1

Reviewed-by: Ross Lagerwall <[e-mail]>

Patch

diff --git a/livepatch-build b/livepatch-build
index e1715ea..38a92be 100755
--- a/livepatch-build
+++ b/livepatch-build
@@ -92,7 +92,6 @@  function build_special()
     cd "${SRCDIR}" || die
 
     # Capture .o files from the patched build
-    export CROSS_COMPILE="${TOOLSDIR}/livepatch-gcc "
     export LIVEPATCH_BUILD_DIR="$(pwd)/"
     export LIVEPATCH_CAPTURE_DIR="$OUTPUT/${name}"
     mkdir -p "$LIVEPATCH_CAPTURE_DIR"
@@ -408,6 +407,8 @@  if [ "${SKIP}" != "build" ]; then
         XEN_DEBUG="debug=$XEN_DEBUG"
     fi
 
+    export CROSS_COMPILE="${TOOLSDIR}/livepatch-gcc "
+
     echo "Perform full initial build with ${CPUS} CPU(s)..."
     build_full