ソースを参照

Merge pull request #1252 from kaechele/arm-build

Support building images on other architectures
Antony Messerli 1 年間 前
コミット
51d3ba7a40

+ 6 - 2
roles/netbootxyz/tasks/generate_disks_efi.yml

@@ -27,7 +27,9 @@
 - name: Compile iPXE bootloader for EFI
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          TRUST={{ trust_files }} \
          bin-x86_64-efi/ipxe.efi \
          bin-x86_64-efi/snp.efi \
@@ -39,7 +41,9 @@
 - name: Compile iPXE bootloader for EFI with debug flags
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          DEBUG={{ ipxe_debug_options }} \
          TRUST={{ trust_files }} \
          bin-x86_64-efi/ipxe.efi \

+ 6 - 2
roles/netbootxyz/tasks/generate_disks_legacy.yml

@@ -23,7 +23,9 @@
 - name: Compile iPXE bootloader for Legacy BIOS
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          TRUST={{ trust_files }} \
          bin/ipxe.dsk \
          bin/ipxe.pdsk \
@@ -37,7 +39,9 @@
 - name: Compile iPXE bootloader for Legacy BIOS with debug flags
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          DEBUG={{ ipxe_debug_options }} \
          TRUST={{ trust_files }} \
          bin/ipxe.dsk \

+ 6 - 2
roles/netbootxyz/tasks/generate_disks_linux.yml

@@ -27,7 +27,9 @@
 - name: Compile iPXE Linux bootloader for Legacy BIOS
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          TRUST={{ trust_files }} \
          bin-x86_64-linux/slirp.linux
   args:
@@ -37,7 +39,9 @@
 - name: Compile iPXE Linux bootloader for Legacy BIOS with debug flags
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          DEBUG={{ ipxe_debug_options }} \
          TRUST={{ trust_files }} \
          bin-x86_64-linux/slirp.linux

+ 2 - 2
roles/netbootxyz/vars/debian.yml

@@ -3,15 +3,15 @@ netbootxyz_packages:
   - apache2
   - binutils-dev
   - binutils-aarch64-linux-gnu
+  - binutils-x86-64-linux-gnu
   - dosfstools
   - figlet
   - gcc-aarch64-linux-gnu
+  - gcc-x86-64-linux-gnu
   - build-essential
   - genisoimage
   - git
   - isolinux
   - liblzma-dev
   - libslirp-dev
-  - syslinux
-  - syslinux-common
   - toilet

+ 0 - 1
roles/netbootxyz/vars/redhat.yml

@@ -8,6 +8,5 @@ netbootxyz_packages:
   - httpd
   - libslirp-devel
   - minizip-devel
-  - syslinux
   - xz-devel
   - make

+ 2 - 2
roles/netbootxyz/vars/ubuntu.yml

@@ -3,17 +3,17 @@ netbootxyz_packages:
   - apache2
   - binutils-dev
   - binutils-aarch64-linux-gnu
+  - binutils-x86-64-linux-gnu
   - dosfstools
   - figlet
   - gcc-aarch64-linux-gnu
+  - gcc-x86-64-linux-gnu
   - build-essential
   - genisoimage
   - git
   - isolinux
   - liblzma-dev
   - libslirp-dev
-  - syslinux
-  - syslinux-common
   - toilet
 
 pipxe_packages: