Merge lp:~codyshepherd/livecd-rootfs/uefi-manifests-cosmic into lp:~ubuntu-core-dev/livecd-rootfs/cosmic-proposed

Proposed by Cody Shepherd
Status: Merged
Merged at revision: 1707
Proposed branch: lp:~codyshepherd/livecd-rootfs/uefi-manifests-cosmic
Merge into: lp:~ubuntu-core-dev/livecd-rootfs/cosmic-proposed
Diff against target: 16 lines (+6/-0)
1 file modified
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary (+6/-0)
To merge this branch: bzr merge lp:~codyshepherd/livecd-rootfs/uefi-manifests-cosmic
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+357833@code.launchpad.net

Commit message

Include grub efi packages and dependencies in uefi image manifests.

Note that this MP relies on the following MP for including snaps in manifests:
https://code.launchpad.net/~codyshepherd/livecd-rootfs/snaps-manifest/+merge/357652

Description of the change

Include grub efi packages and dependencies in uefi image manifests.

To post a comment you must log in.
1706. By Steve Langasek

Merge lp:~codyshepherd/livecd-rootfs/snaps-manifest

Revision history for this message
Steve Langasek (vorlon) wrote :

Since you mentioned https://code.launchpad.net/~codyshepherd/livecd-rootfs/snaps-manifest/+merge/357652 I went ahead and merged that to the cosmic branch (not just to trunk) and discovered that it doesn't actually depend on the other branch, but rather reimplements the same functionality. Could you please rebase this on the current cosmic-proposed branch? Thanks!

review: Needs Fixing
1707. By Cody Shepherd

Changes to include grub efi packages and dependencies in uefi image manifests.

Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
2--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2018-06-06 22:41:30 +0000
3+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2018-10-29 16:29:40 +0000
4@@ -93,6 +93,12 @@
5 ;;
6 esac
7
8+ # This call to generate the package manifest is added here to capture
9+ # grub-efi packages that otherwise would not make it into the base
10+ # manifest. filesystem.packages is moved into place via symlinking to
11+ # livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs
12+ create_manifest "mountpoint" "binary/boot/filesystem.packages"
13+
14 chroot mountpoint grub-install "${loop_device}" \
15 --boot-directory=/boot \
16 --efi-directory=/boot/efi \

Subscribers

People subscribed via source and target branches