mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-17 20:00:07 +00:00
Merge pull request #136412 from dims/fix-npb-arm64-cross-build
Fix NPB test images arm64 cross-build failures
This commit is contained in:
@@ -24,6 +24,11 @@ ADD http://www.nas.nasa.gov/assets/npb/NPB3.4.3.tar.gz .
|
||||
RUN tar xzf NPB3.4.3.tar.gz && chmod -R a+rX NPB3.4.3
|
||||
|
||||
WORKDIR ./NPB3.4.3/NPB3.4-OMP
|
||||
|
||||
# Add missing shebangs to shell scripts - required for cross-build with QEMU emulation
|
||||
# Without shebangs, dash (default /bin/sh on Debian) fails to execute these scripts via make
|
||||
RUN sed -i '1i#!/bin/sh' sys/print_header sys/print_instructions
|
||||
|
||||
RUN if [ $(arch) != "x86_64" ]; then \
|
||||
sed s/-mcmodel=medium//g config/NAS.samples/make.def_gcc > config/make.def; \
|
||||
else \
|
||||
|
||||
@@ -1 +1 @@
|
||||
1.5
|
||||
1.6.0
|
||||
|
||||
@@ -25,6 +25,10 @@ RUN tar xzf NPB3.3.1.tar.gz && chmod -R a+rX NPB3.3.1
|
||||
|
||||
WORKDIR ./NPB3.3.1/NPB3.3-OMP
|
||||
|
||||
# Add missing shebangs to shell scripts - required for cross-build with QEMU emulation
|
||||
# Without shebangs, dash (default /bin/sh on Debian) fails to execute these scripts via make
|
||||
RUN sed -i '1i#!/bin/sh' sys/print_header sys/print_instructions
|
||||
|
||||
# Create build config based on the architecture and build the workload.
|
||||
RUN if [ $(arch) != "x86_64" ]; then \
|
||||
sed s/-mcmodel=medium//g config/NAS.samples/make.def.gcc_x86 > config/make.def; \
|
||||
|
||||
@@ -1 +1 @@
|
||||
1.4
|
||||
1.5.0
|
||||
|
||||
Reference in New Issue
Block a user