Skip to content

Commit

Permalink
Use new cross-build capabilities of mkimage-iso-efi
Browse files Browse the repository at this point in the history
mkimage-iso-efi recently gained the capability to build for another architecture
other than the one it is running on. This takes advantage of it.

Signed-off-by: Avi Deitcher <avi@deitcher.net>
  • Loading branch information
deitch committed Mar 8, 2025
1 parent 5c74998 commit 11716ee
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/makeiso.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi
EVE="$(cd "$(dirname "$0")" && pwd)/../"
PATH="$EVE/build-tools/bin:$PATH"
INSTALLER_TAR="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
MKIMAGE_TAG="$(linuxkit pkg show-tag "$EVE/pkg/mkimage-iso-efi")-${ARCH}"
MKIMAGE_TAG="$(linuxkit pkg show-tag "$EVE/pkg/mkimage-iso-efi")

Check failure on line 21 in tools/makeiso.sh

View workflow job for this annotation

GitHub Actions / yetus

shellcheck: warning: Did you forget to close this double quoted string? [SC1078]

Check failure on line 21 in tools/makeiso.sh

View workflow job for this annotation

GitHub Actions / yetus

shellcheck: note: The mentioned syntax error was in this simple command. [SC1009]
ISO="$(cd "$(dirname "$2")" && pwd)/$(basename "$2")"

Check failure on line 22 in tools/makeiso.sh

View workflow job for this annotation

GitHub Actions / yetus

shellcheck: note: This is actually an end quote, but due to next char it looks suspect. [SC1079]
if [ ! -f "$INSTALLER_TAR" ] || [ $# -lt 2 ]; then

Check failure on line 24 in tools/makeiso.sh

View workflow job for this annotation

GitHub Actions / yetus

shellcheck: warning: Did you forget to close this double quoted string? [SC1078]
Expand All @@ -28,4 +28,4 @@ fi
: > "$ISO"
# shellcheck disable=SC2086
cat $INSTALLER_TAR | docker run -i --platform "linux/${ARCH}" --rm -e DEBUG="$DEBUG" -e VOLUME_LABEL=EVEISO -v "$ISO:/output.iso" "$MKIMAGE_TAG" $3
cat $INSTALLER_TAR | docker run -i --rm -e DEBUG="$DEBUG" -e VOLUME_LABEL=EVEISO -e TARGETARCH=${ARCH} -v "$ISO:/output.iso" "$MKIMAGE_TAG" $3

0 comments on commit 11716ee

Please sign in to comment.