From 9a87b066cfbf9e787697cdc9e1e748af41f179fa Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Thu, 12 Nov 2015 17:33:47 -0700 Subject: [PATCH] Comment fixup --- debian/changelog | 12 ++++++++++++ live-build/ubuntu-cpc/functions | 8 +++++++- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary | 5 ----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a618b11..c055287c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +livecd-rootfs (2.354.0~utlemming31) xenial; urgency=medium + + * Test build + + -- Ben Howard Thu, 12 Nov 2015 17:22:18 -0700 + +livecd-rootfs (2.354.0~utlemming30) xenial; urgency=medium + + * Test build + + -- Ben Howard Thu, 12 Nov 2015 17:21:42 -0700 + livecd-rootfs (2.354) xenial; urgency=medium * ubuntu-cpc: extended hooks to build additional cloud image targets diff --git a/live-build/ubuntu-cpc/functions b/live-build/ubuntu-cpc/functions index 513cc9e8..474e854d 100644 --- a/live-build/ubuntu-cpc/functions +++ b/live-build/ubuntu-cpc/functions @@ -63,7 +63,8 @@ umount_partition() { modify_vmdk_header() { # Modify the VMDK headers so that both VirtualBox _and_ VMware can # read the vmdk and import them. The vodoo here is _not_ documented - # anywhere....so this will have to do. + # anywhere....so this will have to do. This is undocumented vodoo + # that has been learned by the Cloud Image team. vmdk_name="${1}" descriptor=$(mktemp) @@ -104,6 +105,11 @@ modify_vmdk_header() { } create_vmdk() { + # There is no real good way to create a _compressed_ VMDK using open source + # tooling that works across multiple VMDK-capable platforms. Thie functions + # uses vmdk-stream-converter and then call modify_vmdk_header to produce a + # compatiable VMDK. + src="$1" destination="$2" size="${3:-102400}" diff --git a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary index 2fc48065..11c0ed7f 100755 --- a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary +++ b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary @@ -2,11 +2,6 @@ # vi: ts=4 noexpandtab # # Generate VMDK files -# -# There is no real good way to create a _compressed_ VMDK using open source -# tooling that works across multiple VMDK-capable platforms. This hook uses -# vmdk-stream-converter and then modifies the header manually to produce a -# compatiable VMDK. architecture=$(chroot chroot dpkg --print-architecture)