Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add arm64 image generation and allow for independent image generation #1349

Merged
merged 3 commits into from
Dec 6, 2023
+42 −4
Merged

Add arm64 image generation and allow for independent image generation #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
821e8be
allow independent generation arm64/multiarch images
nickshanks347 Nov 29, 2023
208847a
add arm64 image build
nickshanks347 Nov 29, 2023
1b16f72
add efi dependency
nickshanks347 Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions roles/netbootxyz/tasks/generate_disks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,4 @@
ansible.builtin.include_tasks: generate_disks_hybrid.yml
when:
- generate_disks_hybrid | default(false) | bool
- generate_disks_legacy | default(true) | bool
- generate_disks_efi | default(true) | bool
- generate_disks_arm | default(false) | bool
- bootloader_filename == "netboot.xyz"
- bootloader_filename == "netboot.xyz"

Check failure on line 36 in roles/netbootxyz/tasks/generate_disks.yml

View workflow job for this annotation

GitHub Actions / Test Pull Request

yaml[new-line-at-end-of-file] 

No new line character at the end of file
41 changes: 41 additions & 0 deletions roles/netbootxyz/tasks/generate_disks_hybrid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}.lkrn
args:
chdir: "{{ ipxe_source_dir }}/src"
when:

Check failure on line 11 in roles/netbootxyz/tasks/generate_disks_hybrid.yml

View workflow job for this annotation

GitHub Actions / Test Pull Request

yaml[trailing-spaces] 

Trailing spaces
- generate_disks_hybrid | default(false) | bool
- generate_disks_legacy | default(true) | bool
- generate_disks_efi | default(true) | bool


- name: Generate hybrid ISO multiarch image
ansible.builtin.shell: |
Expand All @@ -18,6 +23,22 @@
{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}-arm64.efi
args:
chdir: "{{ ipxe_source_dir }}/src"
when:
- generate_disks_hybrid | default(false) | bool
- generate_disks_legacy | default(true) | bool
- generate_disks_arm | default(false) | bool
- generate_disks_efi | default(true) | bool

- name: Generate hybrid ISO arm64 image
ansible.builtin.shell: |
./util/genfsimg -o {{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}-arm64.iso \
-s {{ bootloader_filename }} \
{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}-arm64.efi
args:
chdir: "{{ ipxe_source_dir }}/src"
when:
- generate_disks_hybrid | default(false) | bool
- generate_disks_arm | default(false) | bool

- name: Generate hybrid USB x86_64 image
ansible.builtin.shell: |
Expand All @@ -27,6 +48,10 @@
{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}.lkrn
args:
chdir: "{{ ipxe_source_dir }}/src"
when:
- generate_disks_hybrid | default(false) | bool
- generate_disks_legacy | default(true) | bool
- generate_disks_efi | default(true) | bool

- name: Generate hybrid USB multiarch image
ansible.builtin.shell: |
Expand All @@ -37,3 +62,19 @@
{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}-arm64.efi
args:
chdir: "{{ ipxe_source_dir }}/src"
when:
- generate_disks_hybrid | default(false) | bool
- generate_disks_legacy | default(true) | bool
- generate_disks_arm | default(false) | bool
- generate_disks_efi | default(true) | bool

- name: Generate hybrid USB arm64 image
ansible.builtin.shell: |
./util/genfsimg -o {{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}-arm64.img \
-s {{ bootloader_filename }} \
{{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}-arm64.efi
args:
chdir: "{{ ipxe_source_dir }}/src"
when:
- generate_disks_hybrid | default(false) | bool
- generate_disks_arm | default(false) | bool

Check failure on line 80 in roles/netbootxyz/tasks/generate_disks_hybrid.yml

View workflow job for this annotation

GitHub Actions / Test Pull Request

yaml[new-line-at-end-of-file] 

No new line character at the end of file
Loading