Merge lp:~rcj/livecd-rootfs/yakkety-proposed/

Fix OVA generation and add grub label helper for ubuntu-cpc
[ Chris Glass ] * Fix the manifest generation in OVA files so that ovf files don't have double extensions. (LP: #1627931) * Fix the OVF's metadata to include Ubuntu specific identifiers and descriptions instead of the generic Linux ones. (LP: #1656293) [ Daniel Watkins ] * Add replace_grub_root_with_label function thereby consolidating multiple uses of the same calls to sed.
2025-08-21 13:44:08 +00:00 · 2017-03-21 08:08:07 -07:00 · 2017-03-17 13:47:25 -05:00 · 2017-03-17 13:46:27 -05:00 · 2017-03-17 13:45:42 -05:00 · 2017-03-17 13:44:41 -05:00
8 changed files with 73 additions and 18 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,23 @@
+livecd-rootfs (2.435.2) yakkety; urgency=medium
+
+  [ Chris Glass ]
+  * Fix the manifest generation in OVA files so that ovf files don't have
+    double extensions.  (LP: #1627931)
+  * Fix the OVF's metadata to include Ubuntu specific identifiers and
+    descriptions instead of the generic Linux ones.  (LP: #1656293)
+  [ Daniel Watkins ]
+  * Add replace_grub_root_with_label function thereby consolidating multiple
+    uses of the same calls to sed.
+
+ -- Robert C Jennings <robert.jennings@ubuntu.com>  Fri, 17 Mar 2017 13:46:47 -0500
+
+livecd-rootfs (2.435.1) yakkety; urgency=medium
+
+  [ Robert C Jennings ]
+  * ubuntu-cpc: Remove redundant copy of grub files. (LP: #1637290)
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Thu, 17 Nov 2016 16:13:28 -0500
+
 livecd-rootfs (2.435) yakkety; urgency=medium

  * Update the ubuntu-touch hints to try installing ubuntu-system-settings
--- a/live-build/ubuntu-cpc/functions
+++ b/live-build/ubuntu-cpc/functions
@ -249,4 +249,11 @@ convert_to_qcow2() {
    qemu-img info "$destination"
 }

+replace_grub_root_with_label() {
+    # When update-grub is run, it will detect the disks in the build system.
+    # Instead, we want grub to use the cloudimg-rootfs labelled disk
+    CHROOT_ROOT="$1"

+    sed -i -e "s,root=[^ ]\+,root=LABEL=cloudimg-rootfs," \
+        "$CHROOT_ROOT/boot/grub/grub.cfg"
+}
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@ -70,9 +70,6 @@ install_grub() {
        amd64)
            chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed
            grub_modules="part_gpt fat ext2 normal chain boot configfile linux multiboot search_fs_uuid search_label terminal serial video video_fb video_bochs usb usb_keyboard efi_gop efi_uga"
-            chroot mountpoint cp /usr/lib/shim/shim.efi.signed "${efi_boot_dir}/shimx64.efi"
-            chroot mountpoint cp /usr/lib/shim/MokManager.efi.signed "${efi_boot_dir}/MokManager.efi"
-            chroot mountpoint cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed "${efi_boot_dir}/grubx64.efi"
            efi_target=x86_64-efi
            ;;
    esac
@ -108,7 +105,7 @@ EOF

    chroot mountpoint dpkg-divert --local --rename /etc/grub.d/30_os-prober
    chroot mountpoint update-grub
-    sed -i "s,root=.* ,root=LABEL=cloudimg-rootfs ,g" mountpoint/boot/grub/grub.cfg
+    replace_grub_root_with_label mountpoint
    chroot mountpoint dpkg-divert --remove --local --rename /etc/grub.d/30_os-prober

    chroot mountpoint apt-get -y clean
--- a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
+++ b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
@ -52,7 +52,7 @@ EOF

    chroot mountpoint dpkg-divert --local --rename /etc/grub.d/30_os-prober
    chroot mountpoint update-grub
-    sed -i "s,root=.* ,root=LABEL=cloudimg-rootfs ,g" mountpoint/boot/grub/grub.cfg
+    replace_grub_root_with_label mountpoint
    chroot mountpoint dpkg-divert --remove --local --rename /etc/grub.d/30_os-prober

    umount_partition mountpoint
--- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
+++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
@ -9,11 +9,24 @@
 #
 # For this step, we re-use the VMDK's made in 040-vmdk-image.binary

+
+# Switch on $ARCH to determine which ID and description to use in the produced
+# OVF. We have fancy Ubuntu-specific IDs in the OVF specification, we might as
+# well use them.
 case $ARCH in
-        amd64|i386) ;;
-                 *) echo "OVA images are not supported for $ARCH yet.";
+        amd64)
+            ovf_id=94
+            ovf_os_type="ubuntu64Guest"
+            ovf_desc_bits=64 ;;
+        i386)
+            ovf_id=93
+            ovf_os_type="ubuntu32Guest"
+            ovf_desc_bits=32 ;;
+        *)
+            echo "OVA images are not supported for $ARCH yet.";
            exit 0;;
 esac
+
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))

@ -57,7 +70,10 @@ sed -i "${ovf}" \
    -e "s/@@NUM_CPUS@@/2/g" \
    -e "s/@@VERSION@@/${version}/g" \
    -e "s/@@DATE@@/${serial_stamp}/g" \
-    -e "s/@@MEM_SIZE@@/1024/g"
+    -e "s/@@MEM_SIZE@@/1024/g" \
+    -e "s/@@OVF_ID@@/${ovf_id}/g" \
+    -e "s/@@OVF_OS_TYPE@@/${ovf_os_type}/g" \
+    -e "s/@@OVF_DESC_BITS@@/${ovf_desc_bits}/g"

 # Get the checksums
 vmdk_sha256=$(sha256sum ${vmdk_f} | cut -d' ' -f1)
@ -67,7 +83,7 @@ ovf_sha256=$(sha256sum ${ovf} | cut -d' ' -f1)
 manifest="${scratch_d}/${prefix}.mf"
 cat > "${manifest}" <<EOF
 SHA256(${vmdk_f##*/})= ${vmdk_sha256}
-SHA256(${ovf##*/}.ovf)= ${ovf_sha256}
+SHA256(${ovf##*/})= ${ovf_sha256}
 EOF

 # Now create the OVA
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
@ -18,11 +18,21 @@
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))

+# Switch on $ARCH to determine which ID and description to use in the produced
+# OVF. We have fancy Ubuntu-specific IDs in the OVF specification, we might as
+# well use them.
 case $ARCH in
-	amd64|i386) ;;
+        amd64)
+           ovf_id=94
+           ovf_os_type="ubuntu64Guest"
+           ovf_desc_bits=64 ;;
+        i386)
+           ovf_id=93
+           ovf_os_type="ubuntu32Guest"
+           ovf_desc_bits=32 ;;
        *)
-		echo "Vagrant images are not supported for $ARCH"
-		exit 0
+           echo "Vagrant images are not supported for $ARCH yet."
+           exit 0;;
 esac

 . /build/config/functions
@ -172,7 +182,10 @@ sed -i "${ovf}" \
    -e "s/@@NUM_CPUS@@/2/g" \
    -e "s/@@VERSION@@/${version}/g" \
    -e "s/@@DATE@@/${serial_stamp}/g" \
-    -e "s/@@MEM_SIZE@@/1024/g"
+    -e "s/@@MEM_SIZE@@/1024/g" \
+    -e "s/@@OVF_ID@@/${ovf_id}/g" \
+    -e "s/@@OVF_OS_TYPE@@/${ovf_os_type}/g" \
+    -e "s/@@OVF_DESC_BITS@@/${ovf_desc_bits}/g"

 ovf_sha256=$(sha256sum ${ovf} | cut -d' ' -f1)

@ -181,7 +194,7 @@ manifest="${box_d}/${prefix}.mf"
 cat > "${manifest}" <<EOF
 SHA256(${vmdk_f##*/})= ${vmdk_sha256}
 SHA256(${cdrom_vmdk_f##*/})= ${cdrom_sha256}
-SHA256(${ovf##*/}.ovf)= ${ovf_sha256}
+SHA256(${ovf##*/})= ${ovf_sha256}
 EOF

 # Now create the box
--- a/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl
+++ b/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl
@ -18,8 +18,9 @@
  <VirtualSystem ovf:id="@@NAME@@">
    <Info>A virtual machine</Info>
    <Name>@@NAME@@</Name>
-    <OperatingSystemSection ovf:id="100" vmw:osType="other3xLinux64Guest">
+    <OperatingSystemSection ovf:id="@@OVF_ID@@" vmw:osType="@@OVF_OS_TYPE@@">
      <Info>The kind of installed guest operating system</Info>
+      <Description>Ubuntu Linux (@@OVF_DESC_BITS@@-bit)</Description>
    </OperatingSystemSection>

    <ProductSection ovf:required="false">
--- a/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl
+++ b/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl
@ -16,8 +16,9 @@
  <VirtualSystem ovf:id="@@NAME@@">
    <Info>A virtual machine</Info>
    <Name>@@NAME@@</Name>
-    <OperatingSystemSection ovf:id="100" vmw:osType="other3xLinux64Guest">
+    <OperatingSystemSection ovf:id="@@OVF_ID@@" vmw:osType="@@OVF_OS_TYPE@@">
      <Info>The kind of installed guest operating system</Info>
+      <Description>Ubuntu Linux (@@OVF_DESC_BITS@@-bit)</Description>
    </OperatingSystemSection>

    <ProductSection ovf:required="false">
Author	SHA1	Message	Date
Steve Langasek	cc04805c04	Merge lp:~rcj/livecd-rootfs/yakkety-proposed/	2017-03-21 08:08:07 -07:00
Robert C Jennings	4d2e4846d3	Fix OVA generation and add grub label helper for ubuntu-cpc [ Chris Glass ] * Fix the manifest generation in OVA files so that ovf files don't have double extensions. (LP: #1627931) * Fix the OVF's metadata to include Ubuntu specific identifiers and descriptions instead of the generic Linux ones. (LP: #1656293) [ Daniel Watkins ] * Add replace_grub_root_with_label function thereby consolidating multiple uses of the same calls to sed.	2017-03-17 13:47:25 -05:00
Daniel Watkins	dbab0a7464	Add replace_grub_root_with_label function When update-grub is run, it will detect the disks in the build system. Currently, we sed the grub configuration in places where this happens; replace_grub_root_with_label moves that seddery in to a single callable location to avoid ending up with multiple versions of it. (It's worth noting that we also do this in 999-cpc-fixes.chroot, but as our functions file isn't available within the chroot we don't use it there.)	2017-03-17 13:46:27 -05:00
Christopher Glass	fa985b74ef	Fix the OVF's metadata to include Ubuntu specific identifiers and descriptions instead of the generic Linux ones. (LP: #1656293)	2017-03-17 13:45:42 -05:00
Christopher Glass	0f3066035d	This branch fixes the manifest generation in OVA files (LP:1627931) The .ova file extension was passed twice, resulting in file not found errors in both the general case and the vagrant-specific file creation.	2017-03-17 13:44:41 -05:00
Mathieu Trudel-Lapierre	d271e408ca	ubuntu-cpc: Remove redundant copy of grub files. (LP: #1637290 )	2017-03-17 11:18:47 -07:00