Merge lp:~xnox/debian-cd/boot-arm64-with-images into lp:~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2087
Proposed branch: lp:~xnox/debian-cd/boot-arm64-with-images
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
tools/boot/groovy/boot-arm64 (+1/-1)
To merge this branch: bzr merge lp:~xnox/debian-cd/boot-arm64-with-images
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Michael Hudson-Doyle Pending
Ubuntu CD Image Team Pending
Review via email:

Commit message

Make use of images/ on arm64, and hopefully bring boot-arm64 in line with recent improvements to boot-amd64?

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

Approved, and accepted into the archive. Please push to git.

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

Er, approval was based on your statement that this corresponded to the upload in the unapproved queue. The diff here is something different?

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

oh right, this is the debian-cd half that /corresponds to/ the upload.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tools/boot/groovy/boot-arm64'
--- tools/boot/groovy/boot-arm64 2020-06-17 19:24:11 +0000
+++ tools/boot/groovy/boot-arm64 2020-10-05 10:58:11 +0000
@@ -29,7 +29,7 @@
29mkdir cd-boot-images29mkdir cd-boot-images
30$BASEDIR/tools/apt-selection download cd-boot-images-arm6430$BASEDIR/tools/apt-selection download cd-boot-images-arm64
31dpkg --fsys-tarfile cd-boot-images-arm64*_all.deb | tar xf - -C cd-boot-images31dpkg --fsys-tarfile cd-boot-images-arm64*_all.deb | tar xf - -C cd-boot-images
32echo -n " -J -joliet-long -l -c boot/ -partition_offset 16 -append_partition 2 0xef cd-boot-images/usr/share/cd-boot-images-arm64/tree/boot/grub/efi.img -e boot/grub/efi.img -no-emul-boot -partition_cyl_align all cd-boot-images/usr/share/cd-boot-images-arm64/tree" >> $N.mkisofs_opts32echo -n " -J -joliet-long -l -c boot/ -partition_offset 16 -append_partition 2 0xef cd-boot-images/usr/share/cd-boot-images-arm64/images/boot/grub/efi.img -e --interval:appended_partition_2:all:: -no-emul-boot -partition_cyl_align all cd-boot-images/usr/share/cd-boot-images-arm64/tree" >> $N.mkisofs_opts
34# generate grub.cfg34# generate grub.cfg
35mkdir -p $CDDIR/boot/grub/35mkdir -p $CDDIR/boot/grub/


People subscribed via source and target branches