[ Louis Zuckerman ]

* Merged the following changes from upstream [ Łukasz 'sil2100' Zemczak ] * Remove the ubuntu-pd project from the scripts * Add instead an ubuntu-touch-custom project for custom re-builds of ubuntu-touch [ Daniel Watkins ] * 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. - Remove '-disk1' from bootable image names. [ Phil Roche ] * Removed HWCLOCKACCESS=no from /etc/default/rcS (LP: #1581044)
2025-04-04 23:01:15 +00:00 · 2016-07-06 12:12:36 +00:00 · 2016-07-06 12:12:36 +00:00 · 2616af2baf
commit 2616af2baf
parent cad69acf05 b5cf4ca120
13 changed files with 74 additions and 79 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,25 @@
+livecd-rootfs (2.420) UNRELEASED; urgency=medium
+
+  * Remove the ubuntu-pd project from the scripts
+  * Add instead an ubuntu-touch-custom project for custom re-builds of
+    ubuntu-touch 
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 06 Jul 2016 12:57:44 +0200
+
+livecd-rootfs (2.419) yakkety; urgency=medium
+
+  [ Daniel Watkins ]
+  * 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.
+    - Remove '-disk1' from bootable image names.
+
+  [ Phil Roche ]
+  * Removed HWCLOCKACCESS=no from /etc/default/rcS (LP: #1581044)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 28 Jun 2016 16:21:08 -0700
+
 livecd-rootfs (2.418ubuntu1) UNRELEASED; urgency=medium

  [ Louis Zuckerman ]
--- a/live-build/auto/build
+++ b/live-build/auto/build
@ -178,7 +178,7 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
 			> chroot/etc/apt/sources.list
 		rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig
 	fi
-	if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
+	if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
 		if [ "$ARCH" = "armhf" ]; then
 			INFO_DESC="$(lsb_release -d -s)"
 			echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
@ -276,7 +276,7 @@ EOF
    fi
 fi

-if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
+if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
 	(cd "binary/$INITFS/custom.dir/" && tar -c *) | \
 		gzip -9 --rsyncable > "$PREFIX.custom.tar.gz"
 	chmod 644 "$PREFIX.custom.tar.gz"
@ -635,7 +635,7 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then

 fi

-if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
+if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
 	sourceslist="chroot/etc/apt/sources.list"

 	lb chroot_proc install "$@"
--- a/live-build/auto/config
+++ b/live-build/auto/config
@ -135,7 +135,7 @@ case $IMAGEFORMAT in

 	*)
 		case $PROJECT in
-			ubuntu-server|ubuntu-touch|ubuntu-pd)
+			ubuntu-server|ubuntu-touch|ubuntu-touch-custom)
 				;;
 			*)
 				add_package live lupin-casper
@ -168,7 +168,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
-		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next)
+		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next)
 			;;
 		*)
 			add_package live oem-config-gtk ubiquity-frontend-gtk
@ -404,19 +404,14 @@ case $PROJECT in
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;

-	ubuntu-touch|ubuntu-pd)
-		if [ "$PROJECT" = "ubuntu-touch" ]; then
-			meta_package=ubuntu-touch
-		else
-			meta_package=ubuntu-pocket-desktop
-		fi
+	ubuntu-touch|ubuntu-touch-custom)
 		HINTS="packagekit ubuntu-system-settings-online-accounts"
 		case $ARCH in
 		    amd64|i386)
 			HINTS="$HINTS qml-module-ubuntu-components-gles unity8"
 			;;
 		esac
-		add_package install ubuntu-minimal $meta_package $HINTS
+		add_package install ubuntu-minimal ubuntu-touch $HINTS

 		COMPONENTS='main restricted universe'
 		BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
@ -554,7 +549,7 @@ case $ARCH in
 esac

 case $PROJECT in
-	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-pd)
+	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-touch-custom)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
@ -734,7 +729,7 @@ EOF
 		fi
 		;;

-	ubuntu-touch:*|ubuntu-pd:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
+	ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
 		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/
 		;;
--- a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary
+++ b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary
@ -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"
--- a/live-build/ubuntu-cpc/hooks/031-root-xz.binary
+++ b/live-build/ubuntu-cpc/hooks/031-root-xz.binary
@ -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"
--- 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))
--- 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 )
--- a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
+++ b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
@ -26,6 +26,7 @@ install_grub() {
    mkdir mountpoint
    mount_partition "${rootfs_dev_mapper}" mountpoint

+    chroot mountpoint apt-get -qqy update
    chroot mountpoint apt-get -qqy install grub2
    chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2

--- a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
+++ b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
@ -14,10 +14,8 @@ 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.img
+elif [ -f binary/boot/disk.ext4 ]; then
+    convert_to_qcow2 binary/boot/disk.ext4 livecd.ubuntu-cpc.img
 fi
--- a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary
@ -3,8 +3,6 @@
 #
 # Generate VMDK files

-extension="disk1.vmdk"
-
 case $ARCH in
         i386|amd64) ;;
                  *) echo "VMDK images are not supported for $ARCH yet.";
@ -13,10 +11,8 @@ esac

 . /build/config/functions

-if [ -e binary/boot/disk.ext4 ]; then
-    create_vmdk binary/boot/disk.ext4 livecd.ubuntu-cpc.disk1.vmdk
-fi
-
 if [ -e binary/boot/disk-uefi.ext4 ]; then
-    create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.uefi.vmdk
+    create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.vmdk
+elif [ -f binary/boot/disk.ext4 ]; then
+    create_vmdk binary/boot/disk.ext4 livecd.ubuntu-cpc.vmdk
 fi
--- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
+++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
@ -17,14 +17,14 @@ esac
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))

-base_vmdk="livecd.ubuntu-cpc.disk1.vmdk"
+base_vmdk="livecd.ubuntu-cpc.vmdk"
 if [ "$ARCH" = "amd64" ]; then
-    base_vmdk="livecd.ubuntu-cpc.uefi.vmdk"
+    base_vmdk="livecd.ubuntu-cpc.vmdk"
 fi

 if [ ! -e ${base_vmdk} ]; then
    find . | grep vmdk
-    exit 0
+    exit 1
 fi

 # Lets be safe about this
--- a/live-build/ubuntu-cpc/hooks/051-hwclock.chroot
+++ b/live-build/ubuntu-cpc/hooks/051-hwclock.chroot
@ -1,3 +0,0 @@
-#!/bin/bash
-
-printf "HWCLOCKACCESS=no" >> /etc/default/rcS
--- a/live-build/ubuntu-touch-custom
+++ b/live-build/ubuntu-touch-custom