Merge lp:~newell-jensen/maas/fix-1600285 into lp:~maas-committers/maas/trunk

Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 5182
Proposed branch: lp:~newell-jensen/maas/fix-1600285
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 15 lines (+0/-5)
1 file modified
src/provisioningserver/boot/uefi_arm64.py (+0/-5)
To merge this branch: bzr merge lp:~newell-jensen/maas/fix-1600285
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+299885@code.launchpad.net

Commit message

Delete arm64/efi grub module workaround. These issues have been fixed and SRU'd back into trusty.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

We need to verify that the images in the 'releases' stream contain the fix before this can land.

review: Needs Information
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Also, is there a corresponding unit test that needs updating?

Revision history for this message
Newell Jensen (newell-jensen) wrote :

Understood on holding off until this is verified. I will try and get some
hardware to test this on once I get some time.

No unit test needs updating that I could see. I ran `make test` and all is
well.

On Tue, Jul 12, 2016 at 7:17 PM, Mike Pontillo <email address hidden>
wrote:

> Also, is there a corresponding unit test that needs updating?
> --
> https://code.launchpad.net/~newell-jensen/maas/fix-1600285/+merge/299885
> You are the owner of lp:~newell-jensen/maas/fix-1600285.
>

Revision history for this message
Newell Jensen (newell-jensen) wrote :

Dann Frazier has confirmed that this patch works on arm64/EFI hardware.

Revision history for this message
Mike Pontillo (mpontillo) wrote :

Sounds good. Let's land it then; thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/boot/uefi_arm64.py'
2--- src/provisioningserver/boot/uefi_arm64.py 2015-12-01 18:12:59 +0000
3+++ src/provisioningserver/boot/uefi_arm64.py 2016-07-13 00:10:55 +0000
4@@ -93,11 +93,6 @@
5 for module_path in glob.glob(os.path.join(module_dir, '*.mod')):
6 module_filename = os.path.basename(module_path)
7 module_name, _ = os.path.splitext(module_filename)
8- # XXX newell 2015-04-28 bug=1459871,1459872: The module
9- # skipping logic below can be removed once the listed bugs have
10- # been fixed and released. See listed bugs for details.
11- if module_name in ('setjmp', 'setjmp_test', 'progress'):
12- continue
13 modules.append(module_name)
14
15 # Generate the grub bootloader