From 1fd54c49ee2e911ca400dc35fed5438131ebc13b Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Thu, 9 Jun 2016 10:47:25 +0100 Subject: [PATCH] * Consolidate cloud images - Remove .tar.gz and .tar.xz (removed in favour of the squashfs). - Remove the MBR-only disk image in favour of the shared GPT/MBR UEFI image. --- debian/changelog | 9 ++++++ .../ubuntu-cpc/hooks/030-root-tarball.binary | 32 ------------------- .../ubuntu-cpc/hooks/031-root-xz.binary | 13 -------- .../ubuntu-cpc/hooks/032-disk-image.binary | 4 +++ .../ubuntu-cpc/hooks/032-root-squashfs.binary | 31 ++++++++++++++++-- .../ubuntu-cpc/hooks/040-qcow2-image.binary | 6 +--- 6 files changed, 43 insertions(+), 52 deletions(-) delete mode 100755 live-build/ubuntu-cpc/hooks/030-root-tarball.binary delete mode 100755 live-build/ubuntu-cpc/hooks/031-root-xz.binary diff --git a/debian/changelog b/debian/changelog index 05956f7e..1c8c0e95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.416) UNRELEASED; urgency=medium + + * Consolidate cloud images + - Remove .tar.gz and .tar.xz (removed in favour of the squashfs). + - Remove the MBR-only disk image in favour of the shared GPT/MBR UEFI + image. + + -- Daniel Watkins Thu, 09 Jun 2016 10:34:13 +0100 + livecd-rootfs (2.415) yakkety; urgency=medium [ Michael Vogt ] diff --git a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary deleted file mode 100755 index f3e1c9e5..00000000 --- a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -ex - -if [ -n "$SUBARCH" ]; then - echo "Skipping rootfs build for subarch flavor build" - exit 0 -fi - -. /build/config/functions - -mkdir binary/boot/filesystem.dir -cp -a chroot/* binary/boot/filesystem.dir - -setup_mountpoint binary/boot/filesystem.dir - -chroot binary/boot/filesystem.dir dpkg-divert --local --rename /usr/sbin/grub-probe -chroot binary/boot/filesystem.dir touch /usr/sbin/grub-probe -chroot binary/boot/filesystem.dir chmod +x /usr/sbin/grub-probe - -env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' -env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^grub-.*' -env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get autoremove --purge --assume-yes -chroot binary/boot/filesystem.dir mkdir /lib/modules - -chroot binary/boot/filesystem.dir rm /usr/sbin/grub-probe -chroot binary/boot/filesystem.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe - -mv resolv.conf.tmp "binary/boot/filesystem.dir/etc/resolv.conf" -umount "binary/boot/filesystem.dir/proc" -umount "binary/boot/filesystem.dir/sys" -umount "binary/boot/filesystem.dir/dev/pts" -umount "binary/boot/filesystem.dir/dev" -umount "binary/boot/filesystem.dir/tmp" diff --git a/live-build/ubuntu-cpc/hooks/031-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-root-xz.binary deleted file mode 100755 index 33489e92..00000000 --- a/live-build/ubuntu-cpc/hooks/031-root-xz.binary +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -ex -# vi: ts=4 noexpandtab -# -# Generate the rootfs.tar.gz and manifest - -if [ -n "$SUBARCH" ]; then - exit 0 -fi - -dpkg-query --admindir=binary/boot/filesystem.dir/var/lib/dpkg -W > livecd.ubuntu-cpc.rootfs.manifest - -(cd "binary/boot/filesystem.dir/" && tar -c *) | \ - xz > "livecd.ubuntu-cpc.rootfs.tar.xz" diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary index 386fbe3b..0ed08b04 100755 --- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary +++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary @@ -12,6 +12,10 @@ case $ARCH:$SUBARCH in echo "POWER disk images are handled separately" exit 0 ;; + amd64|arm64) + echo "We only create EFI images for $ARCH." + exit 0 + ;; armhf:raspi2) # matches the size of the snappy image IMAGE_SIZE=$((4*1000*1000*1000)) diff --git a/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary b/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary index 9e3bb61e..e338a05f 100755 --- a/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary +++ b/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary @@ -4,16 +4,43 @@ # Generate a squashfs root and manifest if [ -n "$SUBARCH" ]; then + echo "Skipping rootfs build for subarch flavor build" exit 0 fi +. /build/config/functions + +mkdir binary/boot/squashfs.dir +cp -a chroot/* binary/boot/squashfs.dir + +setup_mountpoint binary/boot/squashfs.dir + +chroot binary/boot/squashfs.dir dpkg-divert --local --rename /usr/sbin/grub-probe +chroot binary/boot/squashfs.dir touch /usr/sbin/grub-probe +chroot binary/boot/squashfs.dir chmod +x /usr/sbin/grub-probe + +env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' +env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^grub-.*' +env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get autoremove --purge --assume-yes +chroot binary/boot/squashfs.dir mkdir /lib/modules + +chroot binary/boot/squashfs.dir rm /usr/sbin/grub-probe +chroot binary/boot/squashfs.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe + +mv resolv.conf.tmp "binary/boot/squashfs.dir/etc/resolv.conf" +umount "binary/boot/squashfs.dir/proc" +umount "binary/boot/squashfs.dir/sys" +umount "binary/boot/squashfs.dir/dev/pts" +umount "binary/boot/squashfs.dir/dev" +umount "binary/boot/squashfs.dir/tmp" + apt-get -qqy install squashfs-tools squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs" squashfs_f_manifest="${squashfs_f}.manifest" -dpkg-query --admindir=binary/boot/filesystem.dir/var/lib/dpkg -W > ${squashfs_f_manifest} +dpkg-query --admindir=binary/boot/squashfs.dir/var/lib/dpkg -W > ${squashfs_f_manifest} -(cd "binary/boot/filesystem.dir/" && +(cd "binary/boot/squashfs.dir/" && mksquashfs . ${squashfs_f} \ -no-progress -xattrs -comp xz ) diff --git a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary index 602d871e..8281b365 100755 --- a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary +++ b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary @@ -14,10 +14,6 @@ apt-get install -qqy qemu-utils . /build/config/functions -if [ -f binary/boot/disk.ext4 ]; then - convert_to_qcow2 binary/boot/disk.ext4 livecd.ubuntu-cpc.disk1.img -fi - if [ -f binary/boot/disk-uefi.ext4 ]; then - convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.uefi1.img + convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.disk1.img fi