@@ -223,7 +223,7 @@ jobs:
223
223
if [ "${build_host_linux_aarch64}" == "y" ]; then
224
224
MATRIX_HOSTS+='{
225
225
"name": "linux-aarch64",
226
- "runner": "zephyr-runner-linux-x64 -4xlarge",
226
+ "runner": "zephyr-runner-linux-arm64 -4xlarge",
227
227
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.2.3",
228
228
"archive": "tar.xz"
229
229
},'
@@ -416,12 +416,7 @@ jobs:
416
416
pkg-config texinfo p7zip
417
417
418
418
# Install dependencies for cross compilation
419
- if [ "${{ matrix.host.name }}" == "linux-aarch64" ]; then
420
- # Install aarch64-linux-gnu cross toolchain
421
- sudo apt-get install -y binutils-aarch64-linux-gnu \
422
- gcc-aarch64-linux-gnu \
423
- g++-aarch64-linux-gnu
424
- elif [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then
419
+ if [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then
425
420
# Install MinGW-w64 cross toolchain
426
421
sudo apt-get install -y binutils-mingw-w64 gcc-mingw-w64 \
427
422
g++-mingw-w64
@@ -634,13 +629,7 @@ jobs:
634
629
EOF
635
630
636
631
# Set Canadian cross compilation configurations
637
- if [ "${{ matrix.host.name }}" == "linux-aarch64" ]; then
638
- # Building for linux-aarch64 on linux-x86_64
639
- cat <<EOF >> .config
640
- CT_CANADIAN=y
641
- CT_HOST="aarch64-linux-gnu"
642
- EOF
643
- elif [ "${{ matrix.host.name }}" == "macos-aarch64" ]; then
632
+ if [ "${{ matrix.host.name }}" == "macos-aarch64" ]; then
644
633
# Building for macos-aarch64 on macos-x86_64
645
634
cat <<EOF >> .config
646
635
CT_CANADIAN=y
@@ -660,18 +649,7 @@ jobs:
660
649
CT_GDB_CROSS_PYTHON_VARIANT=y
661
650
EOF
662
651
663
- if [ "${{ matrix.host.name }}" == "linux-aarch64" ]; then
664
- # Clone crosskit-aarch64-linux-libpython cross compilation kit
665
- git clone \
666
- https://github.com/stephanosio/crosskit-aarch64-linux-libpython.git \
667
- ${WORKSPACE}/crosskit-aarch64-linux-libpython
668
- # Use Python 3.8.0
669
- export LIBPYTHON_KIT_ROOT=${WORKSPACE}/crosskit-aarch64-linux-libpython/python-3.8.0
670
- # Set Python configuration resolver for GDB
671
- cat <<EOF >> .config
672
- CT_GDB_CROSS_PYTHON_BINARY="${LIBPYTHON_KIT_ROOT}/bin/python"
673
- EOF
674
- elif [ "${{ matrix.host.name }}" == "macos-aarch64" ]; then
652
+ if [ "${{ matrix.host.name }}" == "macos-aarch64" ]; then
675
653
# Clone crosskit-aarch64-darwin-libpython cross compilation kit
676
654
git clone \
677
655
https://github.com/stephanosio/crosskit-aarch64-darwin-libpython.git \
@@ -720,10 +698,7 @@ jobs:
720
698
popd
721
699
722
700
# Resolve output directory path
723
- if [ "${{ matrix.host.name }}" == "linux-aarch64" ]; then
724
- OUTPUT_BASE="${WORKSPACE}/output"
725
- OUTPUT_DIR="HOST-aarch64-linux-gnu"
726
- elif [ "${{ matrix.host.name }}" == "macos-aarch64" ]; then
701
+ if [ "${{ matrix.host.name }}" == "macos-aarch64" ]; then
727
702
OUTPUT_BASE="${WORKSPACE}/output"
728
703
OUTPUT_DIR="HOST-aarch64-apple-darwin"
729
704
elif [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then
@@ -903,12 +878,6 @@ jobs:
903
878
# Patch Poky sanity configuration to allow building as root
904
879
sed -i '/^INHERIT/ s/./#&/' poky/meta/conf/sanity.conf
905
880
906
- # Resolve host machine type
907
- if [ "${{ matrix.host.name }}" == "linux-aarch64" ]; then
908
- # Cross compiling for AArch64 host on x86-64
909
- export MACHINE="aarch64"
910
- fi
911
-
912
881
# Build meta-zephyr-sdk
913
882
${POKY_BASE}/scripts/meta-zephyr-sdk-build.sh tools
914
883
0 commit comments