Merge ~jawn-smith/curtin:master into curtin:master

Proposed by William Wilson
Status: Merged
Approved by: Dan Bungert
Approved revision: 699d09ca45031cbc34c027319a07788f6a67696e
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~jawn-smith/curtin:master
Merge into: curtin:master
Diff against target: 14 lines (+3/-0)
1 file modified
curtin/commands/install_grub.py (+3/-0)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Dan Bungert Approve
Review via email: mp+416835@code.launchpad.net

Commit message

Add riscv64 to supported UEFI architectures

As we prepare a RISC-V installer image, we need to add 'riscv64' to the
supported UEFI architectures. This commit does so by setting values
for grub_name and grub_target.

To post a comment you must log in.
Revision history for this message
William Wilson (jawn-smith) wrote :

Dan, when you review this can you confirm the value for grub_target is correct? I was less sure about grub_target than grub_name.

Revision history for this message
Dan Bungert (dbungert) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

Commit message lints:
- Line #2 has 96 too many characters. Line starts with: "As we prepare a RISC-V"...

review: Needs Fixing
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/curtin/commands/install_grub.py b/curtin/commands/install_grub.py
2index ba46bd2..74ffdf1 100644
3--- a/curtin/commands/install_grub.py
4+++ b/curtin/commands/install_grub.py
5@@ -62,6 +62,9 @@ def get_grub_package_name(target_arch, uefi, rhel_ver=None):
6 elif target_arch == 'i386':
7 grub_name = 'grub-efi-ia32'
8 grub_target = 'i386-efi'
9+ elif target_arch == 'riscv64':
10+ grub_name = 'grub-efi-riscv64'
11+ grub_target = 'riscv64-efi'
12 else:
13 raise ValueError('Unsupported UEFI arch: %s' % target_arch)
14 else:

Subscribers

People subscribed via source and target branches