瀏覽代碼

Revert "Support building images on other architectures"

This reverts commit f02180f497b99aacb4de0aa760ec7e3991f192c1.

Testing reverting changes that may have impacted 2.0.70:
https://github.com/netbootxyz/netboot.xyz/issues/1273
Antony Messerli 1 年之前
父節點
當前提交
79577f556c

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

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

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

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

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

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

+ 0 - 3
roles/netbootxyz/vars/debian.yml

@@ -3,18 +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
-  - mtools
   - syslinux
   - syslinux-common
   - toilet

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

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

+ 0 - 3
roles/netbootxyz/vars/ubuntu.yml

@@ -3,18 +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
-  - mtools
   - syslinux
   - syslinux-common
   - toilet