Merge lp://qastaging/~dannf/ubuntu/wily/grub2-signed/arm64-support into lp://qastaging/ubuntu/wily/grub2-signed

Proposed by dann frazier
Status: Merged
Merge reported by: Adam Conrad
Merged at revision: not available
Proposed branch: lp://qastaging/~dannf/ubuntu/wily/grub2-signed/arm64-support
Merge into: lp://qastaging/ubuntu/wily/grub2-signed
Diff against target: 160 lines (+66/-15)
5 files modified
Makefile (+20/-5)
debian/changelog (+7/-0)
debian/control (+19/-1)
debian/rules (+7/-3)
download-grub2 (+13/-6)
To merge this branch: bzr merge lp://qastaging/~dannf/ubuntu/wily/grub2-signed/arm64-support
Reviewer Review Type Date Requested Status
Adam Conrad (community) Approve
dann frazier Needs Resubmitting
Mathieu Trudel-Lapierre Approve
Review via email: mp+259667@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks appropriate; but will obviously explode unless grub2 already builds the new grub-efi-arm64 package, and so needs to wait to be merged/uploaded until after it.

It's up to you whether you want to fixup changelog now or wait until grub2 is ready as well; since it's a requirement to upload grub2-signed with grub2 anyway, we can do the changelog fixes just before merging.

review: Approve
Revision history for this message
dann frazier (dannf) wrote :

Sorry, can you elaborate on what you mean by "fixup changelog" - just going UNRELEASED->wily?

Also, I should note that this will also require a control file update to make the grub2 versioned build-deps match the version of grub2 that eventually gets uploaded w/ arm64 image support.

Revision history for this message
Adam Conrad (adconrad) wrote :

You should never use "dpkg --print-architecture" to determine the arch you're building FOR. What you're looking for (in both places) is dpkg-architecture -qDEB_HOST_ARCH

Other oddities:

1) Why do we need .install files when we didn't seem to before?
2) symlinking to arch-specific bits in clean doesn't seem clever, you'll get different source cruft depending on the arch you clean/upload on.

review: Needs Fixing
49. By dann frazier

Use 'dpkg-architecture -qDEB_HOST_ARCH' instead of dpkg --print-architecture

Correctly identifies the architecture of the host we are building for vs.
the host we happen to be building on.

50. By dann frazier

Stop doing postinst symlink generation during clean.

Just include all necessary symlinks to avoid different source package contents
when generated on different architectures.

51. By dann frazier

Override destdir during install instead of adding .install files

Revision history for this message
dann frazier (dannf) wrote :

> You should never use "dpkg --print-architecture" to determine the arch you're
> building FOR. What you're looking for (in both places) is dpkg-architecture
> -qDEB_HOST_ARCH

Fixed.

> Other oddities:
>
> 1) Why do we need .install files when we didn't seem to before?

It is just how I chose to handle the single-binary -> multi-binary conversion. But it does seem like a pain to have to add that file for every new architecture. I switched this to just overriding destdir during install.

> 2) symlinking to arch-specific bits in clean doesn't seem clever, you'll get
> different source cruft depending on the arch you clean/upload on.

Fixed.

review: Needs Resubmitting
52. By dann frazier

Use dpkg built-in make snippet instead of populating variables manually

53. By dann frazier

Merge lp:ubuntu/grub2-signed

54. By dann frazier

Merge lp:ubuntu/grub2-signed

55. By dann frazier

Rebuild against grub-efi-amd64 2.02~beta2-26ubuntu4.

Revision history for this message
Adam Conrad (adconrad) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: