Merge pull request #136412 from dims/fix-npb-arm64-cross-build

Fix NPB test images arm64 cross-build failures
This commit is contained in:
Kubernetes Prow Robot 2026-01-22 09:09:26 +05:30 committed by GitHub
commit 0eabb569fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 2 deletions

View file

@ -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 \

View file

@ -1 +1 @@
1.5
1.6.0

View file

@ -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; \

View file

@ -1 +1 @@
1.4
1.5.0