From 24ee4b8c4d3fc83fd1798c01c62a882dd975eff1 Mon Sep 17 00:00:00 2001 From: John Chittum Date: Fri, 16 Oct 2020 13:43:26 -0500 Subject: [PATCH 01/19] vmtools version in vmdk header (LP: #1893898) LP: #1893898 describes missing vmtools version from the vmdk headers. The version should be added as ddb.toolsVersion = "2147483647" however the sed was no longer replacing a ddb.comment field with the tools version. Rather than subbing ddb.comment with toolsVersion, this commit deletes ddb.comment (which the comment mentions could cause errors), and adds the correct value. There was no visibility into the descriptor during hook creation, so debug statements were added. This allows us to quickly verify in the logs that bad statements are removed (the possibly offending commetns), as well as ensuring that the toolsVersion is added --- debian/changelog | 4 ++++ live-build/functions | 44 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93e2b1a2..bc319f9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ livecd-rootfs (2.693) groovy; urgency=medium livecd-rootfs (2.692) groovy; urgency=medium + [ John Chittum ] + * Ensure vmtools version entered into vmdk header (LP: #1893898) + + [ Łukasz 'sil2100' Zemczak ] * Create a 1GB swapfile for the raspi desktop images. -- Łukasz 'sil2100' Zemczak Thu, 15 Oct 2020 11:23:47 +0200 diff --git a/live-build/functions b/live-build/functions index e4b90425..830a0549 100644 --- a/live-build/functions +++ b/live-build/functions @@ -237,6 +237,12 @@ modify_vmdk_header() { # Extract the vmdk header for manipulation dd if="${vmdk_name}" of="${descriptor}" bs=1 skip=512 count=1024 + # cat header so we are aware of the original descriptor for debugging + cat $descriptor + + # trim null bytes to treat as standard text file + tr -d '\000' < $descriptor > $newdescriptor + # The sed lines below is where the magic is. Specifically: # ddb.toolsVersion: sets the open-vm-tools so that VMware shows # the tooling as current @@ -248,15 +254,37 @@ modify_vmdk_header() { # remove the comments from vmdk-stream-converter which causes # VirtualBox and others to fail VMDK validation - sed -e 's|# Description file.*|# Disk DescriptorFile|' \ - -e '/# Believe this is random*/d' \ - -e '/# Indicates no parent/d' \ - -e '/# The Disk Data Base/d' \ - -e 's|ddb.comment.*|ddb.toolsVersion = "2147483647"|' \ - "${descriptor}" > "${newdescriptor}" + sed -i -e 's|# Description file.*|# Disk DescriptorFile|' \ + -e '/# Believe this is random*/d' \ + -e '/# Indicates no parent/d' \ + -e '/# The Disk Data Base/d' \ + -e '/ddb.comment*/d' \ + $newdescriptor + + # grep for removal of the ddb.comment line to ensure removal + if grep -q "ddb.comment" $newdescriptor; then + echo "ddb.comment exists and will cause Virtualbox failures"; exit 1 + fi + + # add newline to newdescriptor + echo "" >> $newdescriptor + + # add tools version + echo -n 'ddb.toolsVersion = "2147483647"' >> $newdescriptor + + # check ddb.toolsVersion in descriptor, otherwise image will fail + grep -q 'ddb.toolsVersion' $newdescriptor || { + echo 'failed to write version. Descriptor invalid'; exit 1; + } + + # diff original descriptor and new descriptor for debugging + diff --text $descriptor $newdescriptor | cat + + # reset newdescriptor to be 1024 + truncate --no-create --size=1K $newdescriptor - # The header is cannot be bigger than 1024 - expr $(stat --format=%s ${newdescriptor}) \< 1024 > /dev/null 2>&1 || { + # The header must be 1024 or less + expr $(stat --format=%s ${newdescriptor}) \< 1025 > /dev/null 2>&1 || { echo "descriptor is too large, VMDK will be invalid!"; exit 1; } # Overwrite the vmdk header with our new, modified one From 4f5eacbfae3aa850a8bfc519ac70990395fdd5b8 Mon Sep 17 00:00:00 2001 From: John Chittum Date: Mon, 19 Oct 2020 10:54:59 -0500 Subject: [PATCH 02/19] Fixup Debian Changlog Rebase, fixedup changelog, opened new release --- debian/changelog | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bc319f9a..8fda6888 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.694) UNRELEASED; urgency=medium + + * Ensure vmtools version entered into vmdk header (LP: #1893898) + + -- John Chittum Mon, 19 Oct 2020 10:52:54 -0500 + livecd-rootfs (2.693) groovy; urgency=medium * Build classic raspi server images by default from the 'classic' branch now. @@ -6,10 +12,6 @@ livecd-rootfs (2.693) groovy; urgency=medium livecd-rootfs (2.692) groovy; urgency=medium - [ John Chittum ] - * Ensure vmtools version entered into vmdk header (LP: #1893898) - - [ Łukasz 'sil2100' Zemczak ] * Create a 1GB swapfile for the raspi desktop images. -- Łukasz 'sil2100' Zemczak Thu, 15 Oct 2020 11:23:47 +0200 From 201addb317cdf15e1d0757b809ea2cd614da11c8 Mon Sep 17 00:00:00 2001 From: John Chittum Date: Mon, 19 Oct 2020 13:22:32 -0500 Subject: [PATCH 03/19] Remove sed and move size check There was a question on if the comment removals in the `sed` were required. The comments (`#`) are created by vmdk-stream-converter and seem to cause no issues. `ddb.comment` is no longer being written by the tool anymore. Moved the check earlier to ensure the new header isn't too large before running truncate (otherwise it may be too long, and we remove bits we want) --- live-build/functions | 45 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/live-build/functions b/live-build/functions index 830a0549..f53b59e3 100644 --- a/live-build/functions +++ b/live-build/functions @@ -243,50 +243,33 @@ modify_vmdk_header() { # trim null bytes to treat as standard text file tr -d '\000' < $descriptor > $newdescriptor - # The sed lines below is where the magic is. Specifically: - # ddb.toolsVersion: sets the open-vm-tools so that VMware shows - # the tooling as current - # ddb.virtualHWVersion: set the version to 7, which covers most - # current versions of VMware - # createType: make sure its set to stream Optimized - # remove the vmdk-stream-converter comment and replace with - # # Disk DescriptorFile. This is needed for Virtualbox - # remove the comments from vmdk-stream-converter which causes - # VirtualBox and others to fail VMDK validation - - sed -i -e 's|# Description file.*|# Disk DescriptorFile|' \ - -e '/# Believe this is random*/d' \ - -e '/# Indicates no parent/d' \ - -e '/# The Disk Data Base/d' \ - -e '/ddb.comment*/d' \ - $newdescriptor - - # grep for removal of the ddb.comment line to ensure removal - if grep -q "ddb.comment" $newdescriptor; then - echo "ddb.comment exists and will cause Virtualbox failures"; exit 1 - fi - # add newline to newdescriptor echo "" >> $newdescriptor - # add tools version + # add required tools version echo -n 'ddb.toolsVersion = "2147483647"' >> $newdescriptor # check ddb.toolsVersion in descriptor, otherwise image will fail - grep -q 'ddb.toolsVersion' $newdescriptor || { - echo 'failed to write version. Descriptor invalid'; exit 1; - } + if ! grep -q 'ddb.toolsVersion' $newdescriptor; then + echo 'failed to write version. Descriptor invalid'; \ + exit 1 + fi # diff original descriptor and new descriptor for debugging + # diff exits 1 if difference. pipefail not set so piping diff + # to cat prints diff and swallows exit 1 diff --text $descriptor $newdescriptor | cat + + # The header must be 1024 or less before padding + if ! expr $(stat --format=%s ${newdescriptor}) \< 1025 > /dev/null 2>&1; then + echo "descriptor is too large, VMDK will be invalid!"; + exit 1 + fi + # reset newdescriptor to be 1024 truncate --no-create --size=1K $newdescriptor - # The header must be 1024 or less - expr $(stat --format=%s ${newdescriptor}) \< 1025 > /dev/null 2>&1 || { - echo "descriptor is too large, VMDK will be invalid!"; exit 1; } - # Overwrite the vmdk header with our new, modified one dd conv=notrunc,nocreat \ if="${newdescriptor}" of="${vmdk_name}" \ From 4f1df739f68a47e4f215c8ca11d1d7a5a1046da9 Mon Sep 17 00:00:00 2001 From: John Chittum Date: Mon, 26 Oct 2020 09:22:32 -0500 Subject: [PATCH 04/19] Debug logging information Added context lines for debugging lines. --- live-build/functions | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/live-build/functions b/live-build/functions index f53b59e3..7197a152 100644 --- a/live-build/functions +++ b/live-build/functions @@ -236,7 +236,7 @@ modify_vmdk_header() { # Extract the vmdk header for manipulation dd if="${vmdk_name}" of="${descriptor}" bs=1 skip=512 count=1024 - + echo "Cat'ing original descriptor to console for debugging." # cat header so we are aware of the original descriptor for debugging cat $descriptor @@ -249,15 +249,10 @@ modify_vmdk_header() { # add required tools version echo -n 'ddb.toolsVersion = "2147483647"' >> $newdescriptor - # check ddb.toolsVersion in descriptor, otherwise image will fail - if ! grep -q 'ddb.toolsVersion' $newdescriptor; then - echo 'failed to write version. Descriptor invalid'; \ - exit 1 - fi - # diff original descriptor and new descriptor for debugging # diff exits 1 if difference. pipefail not set so piping diff # to cat prints diff and swallows exit 1 + echo "Printing diff of original and new descriptors." diff --text $descriptor $newdescriptor | cat From b0c8b628b26aca86c7c934dfb2174377c6087b44 Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Mon, 26 Oct 2020 11:48:24 -0700 Subject: [PATCH 05/19] ubuntu-cpc: only install shim-signed, run autoremove The CPC build hooks for amd64 incorrectly attempt to install shim-signed in addition to grub-efi-amd64 and grub-pc. These latter two packages conflict with each other. Instead shim-signed should install whatever packages are required. Additionally, this will ensure that autoremove is run after installing anything in the CPC build hooks. This is done to avoid shipping images that include packages that are autoremovable. This will clean-up as packages are installed and detect any breakage at build time. --- live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary | 1 + live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 4 +++- live-build/ubuntu-cpc/hooks.d/base/disk-image.binary | 1 + live-build/ubuntu-cpc/hooks.d/base/wsl.binary | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary index 77f24e7e..dc87a361 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary @@ -33,6 +33,7 @@ install_grub() { chroot mountpoint apt-get -qqy update chroot mountpoint apt-get -qqy install grub-ieee1275 chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2 + chroot mountpoint apt-get autoremove --purge --assume-yes # set the kernel commandline to use hvc0 mkdir -p mountpoint/etc/default/grub.d diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 910f67a9..674d795a 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -89,11 +89,13 @@ install_grub() { efi_target=arm-efi ;; amd64) - chroot mountpoint apt-get install -qqy grub-efi-amd64-signed shim-signed + chroot mountpoint apt-get install -qqy shim-signed efi_target=x86_64-efi ;; esac + chroot mountpoint apt-get autoremove --purge --assume-yes + chroot mountpoint grub-install "${loop_device}" \ --boot-directory=/boot \ --efi-directory=/boot/efi \ diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary index 8998df68..96bf83a5 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary @@ -136,6 +136,7 @@ fi if [ "$ARCH" = "s390x" ]; then # Do ZIPL install bits chroot mountpoint apt-get -qqy install s390-tools sysconfig-hardware + chroot mountpoint apt-get autoremove --purge --assume-yes # Write out cloudy zipl.conf for future kernel updates cat << EOF > mountpoint/etc/zipl.conf diff --git a/live-build/ubuntu-cpc/hooks.d/base/wsl.binary b/live-build/ubuntu-cpc/hooks.d/base/wsl.binary index 05f51e30..8ce28140 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/wsl.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/wsl.binary @@ -35,6 +35,7 @@ cp -a rootfs.dir $rootfs_dir setup_mountpoint $rootfs_dir env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl +env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get autoremove --purge --assume-yes create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest teardown_mountpoint $rootfs_dir From b96d6a52635576492b12df6080489b7ee493ac1d Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Mon, 26 Oct 2020 12:01:31 -0700 Subject: [PATCH 06/19] Update changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index fe1f9dd4..a445f708 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.694ubuntu1) hirsute; urgency=medium + + * Install only shim-signed to prevent shipping conflicting, autoremovable + packages + * Ensure autoremove is run after any package install + + -- Joshua Powers Mon, 26 Oct 2020 11:58:57 -0700 + livecd-rootfs (2.694) groovy; urgency=medium * Add the pi desktop oem user to the adm and sudo groups, as that is needed From a0b58df7aeeaa9f3759712589b0d69dd4e2398c6 Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Mon, 26 Oct 2020 12:03:35 -0700 Subject: [PATCH 07/19] fix changelog version --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a445f708..e82fe45e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.694ubuntu1) hirsute; urgency=medium +livecd-rootfs (2.695) hirsute; urgency=medium * Install only shim-signed to prevent shipping conflicting, autoremovable packages From 5d9af7f3c59ec6e47bfac1483064f25ffbd80e63 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 27 Oct 2020 20:26:50 +0000 Subject: [PATCH 08/19] auto/config: seed ubuntu-desktop when building hyperv image Regression introduced in 38157b37487d244b27af33f7863e6b15253c8f94 when desktop-preinstalled code branch was added, it dropped addint ubuntu-desktop task. Instead it added ubuntu-desktop-raspi task, only for the raspi subarch, which depends on ubuntu-desktop. But the hyperv case, now ended up without ubuntu-desktop task. It looks like introduction of "desktop-preinstalled" assumed, that it is for raspi only, when in fact that code path now started to be used for hyperv gallery image too. --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 22278d55..76c04563 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -601,7 +601,7 @@ case $PROJECT in ;; desktop-preinstalled) - add_task install minimal standard + add_task install minimal standard ubuntu-desktop if [ "$SUBARCH" = "raspi" ]; then add_task install ubuntu-desktop-raspi fi From 1c7d688319490a8a15a5aab47fb086482b3efe92 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 27 Oct 2020 20:42:08 +0000 Subject: [PATCH 09/19] auto/config: scope ubuntu:desktop-preinstalled:raspi image options When desktop-preinstalled image options were added in 38157b37487d244b27af33f7863e6b15253c8f94, for the raspi subarch, the options listed there were not scoped for raspi subarch. This results in those options getting also applied for the HYPERV ubuntu:desktop-preinstalled image. Thus scope the newly added options under raspi subarch case only. --- live-build/auto/config | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 76c04563..444f0abd 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -604,14 +604,16 @@ case $PROJECT in add_task install minimal standard ubuntu-desktop if [ "$SUBARCH" = "raspi" ]; then add_task install ubuntu-desktop-raspi + # XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project + # for existing raspi preinstalled images + # XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary + OPTS="${OPTS:+$OPTS }--initramfs=none" + OPTS="${OPTS:+$OPTS }--system=normal" + OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" + OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" + OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" fi - # XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project - # for existing raspi preinstalled images - OPTS="${OPTS:+$OPTS }--initramfs=none" - OPTS="${OPTS:+$OPTS }--system=normal" - OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" - OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" - OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" + ## Otherwise HYPERV image options.... *crickets* see the hyperv hook ;; *) From 55ce3027ba11360b460cdc008aee7278d652da64 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 28 Oct 2020 10:37:13 +0000 Subject: [PATCH 10/19] releasing package livecd-rootfs version 2.696 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index e82fe45e..982e3e97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.696) hirsute; urgency=medium + + * auto/config: seed ubuntu-desktop when building hyperv image LP: #392910 + * auto/config: scope ubuntu:desktop-preinstalled:raspi image options LP: #392910 + + -- Dimitri John Ledkov Wed, 28 Oct 2020 10:36:29 +0000 + livecd-rootfs (2.695) hirsute; urgency=medium * Install only shim-signed to prevent shipping conflicting, autoremovable From 75c196cb0e0b275f561cf8566f2619ff08b78fad Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 28 Oct 2020 10:43:51 +0000 Subject: [PATCH 11/19] Correct bug number --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 982e3e97..76ca83c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ livecd-rootfs (2.696) hirsute; urgency=medium - * auto/config: seed ubuntu-desktop when building hyperv image LP: #392910 - * auto/config: scope ubuntu:desktop-preinstalled:raspi image options LP: #392910 + * auto/config: seed ubuntu-desktop when building hyperv image LP: #1901846 + * auto/config: scope ubuntu:desktop-preinstalled:raspi image options LP: #1901846 -- Dimitri John Ledkov Wed, 28 Oct 2020 10:36:29 +0000 From 7033e0fae9181ee9337d991a78a231a768a7ed2d Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Wed, 28 Oct 2020 12:02:39 -0500 Subject: [PATCH 12/19] releasing package livecd-rootfs version 2.697 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8b2a95c..7e9669bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -livecd-rootfs (2.697) UNRELEASED; urgency=medium +livecd-rootfs (2.697) hirsute; urgency=medium + [ John Chittum ] * Ensure vmtools version entered into vmdk header (LP: #1893898) - -- John Chittum Mon, 19 Oct 2020 10:52:54 -0500 + -- Robert C Jennings Wed, 28 Oct 2020 12:02:04 -0500 livecd-rootfs (2.696) hirsute; urgency=medium From e2fd168f504d9debc495663ce2698166880c94c6 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 28 Oct 2020 22:27:05 +0000 Subject: [PATCH 13/19] amd64: always install grub-pc with shim-signed shim-signed depends on grub-efi-amd64-signed, which in turn has alternative depends on either `grub-efi-amd64 | grub-pc`. However to support booting with either via shim&signed-grub and BIOS, the choice must be made to install grub-pc, not grub-efi-amd64. This makes images consistent with Ubuntu Deskop, Live Server, buildd bootable images; all of which already do install grub-pc and shim-signed. LP: #1901906 --- live-build/auto/config | 3 +-- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 444f0abd..e95d5a88 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -778,8 +778,7 @@ case $PROJECT in add_package install grub-pc ;; amd64) - add_package install grub-pc-bin - add_package install grub-efi-amd64-signed + add_package install grub-pc add_package install shim-signed ;; esac diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 674d795a..f997bb4e 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -89,7 +89,7 @@ install_grub() { efi_target=arm-efi ;; amd64) - chroot mountpoint apt-get install -qqy shim-signed + chroot mountpoint apt-get install -qqy grub-pc shim-signed efi_target=x86_64-efi ;; esac From 0f7c511892f54d22b3e5de21b5ea4165f5cc3825 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 28 Oct 2020 22:30:42 +0000 Subject: [PATCH 14/19] amd64: always install grub-pc with shim-signed (LP: #1901906) --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7e9669bb..c18e1f99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.698) UNRELEASED; urgency=medium + + * amd64: always install grub-pc with shim-signed (LP: #1901906) + + -- Dimitri John Ledkov Wed, 28 Oct 2020 22:30:24 +0000 + livecd-rootfs (2.697) hirsute; urgency=medium [ John Chittum ] From 18a530953107b44c5220bf5489f49756cff6d854 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 29 Oct 2020 22:21:39 +0000 Subject: [PATCH 15/19] control: install qemu-utils & snapd on riscv64. These are now available. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index dbcc6375..45dcf710 100644 --- a/debian/control +++ b/debian/control @@ -32,9 +32,9 @@ Depends: ${misc:Depends}, python3-apt, python3-launchpadlib, python3-yaml, - qemu-utils [!i386 !riscv64], + qemu-utils [!i386], rsync, - snapd (>= 2.39) [!i386 !riscv64], + snapd (>= 2.39) [!i386], squashfs-tools (>= 1:3.3-1), sudo, u-boot-tools [armhf arm64], From a92b0a4fb6dca8752dead8d3e9c6d0d4d0603d7c Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 29 Oct 2020 22:22:35 +0000 Subject: [PATCH 16/19] releasing package livecd-rootfs version 2.698 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c18e1f99..de1fa686 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -livecd-rootfs (2.698) UNRELEASED; urgency=medium +livecd-rootfs (2.698) hirsute; urgency=medium * amd64: always install grub-pc with shim-signed (LP: #1901906) + * control: install qemu-utils & snapd on riscv64. - -- Dimitri John Ledkov Wed, 28 Oct 2020 22:30:24 +0000 + -- Dimitri John Ledkov Thu, 29 Oct 2020 22:22:30 +0000 livecd-rootfs (2.697) hirsute; urgency=medium From 72e47a9f8bfe084a98672872dbb9fb718abe938b Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Tue, 3 Nov 2020 16:19:01 +0800 Subject: [PATCH 17/19] Hyper-V hook fix --- live-build/ubuntu/hooks/040-hyperv-desktop-images.binary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary index d8d0c993..04446025 100644 --- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary +++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary @@ -103,7 +103,7 @@ ResultInactive=no ResultActive=yes EOF -cat >/etc/polkit-1/localauthority/50-local.d/46-allow-update-repo.pkla <${scratch_d}/etc/polkit-1/localauthority/50-local.d/46-allow-update-repo.pkla < Date: Tue, 3 Nov 2020 10:11:06 +0000 Subject: [PATCH 18/19] Update changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index de1fa686..9b197b5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.699) UNRELEASED; urgency=medium + + * hyper-v hook: Fix writing of pkla file out to correct scratch directory + for image build. + + -- Jinming Wu, Patrick Tue, 03 Nov 2020 10:10:03 +0000 + livecd-rootfs (2.698) hirsute; urgency=medium * amd64: always install grub-pc with shim-signed (LP: #1901906) From 62986bd84b20377b1e51029af85da5cd44f28b14 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 3 Nov 2020 10:13:56 +0000 Subject: [PATCH 19/19] Finalise changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b197b5e..9074eb15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.699) UNRELEASED; urgency=medium +livecd-rootfs (2.699) hirsute; urgency=medium * hyper-v hook: Fix writing of pkla file out to correct scratch directory for image build. - -- Jinming Wu, Patrick Tue, 03 Nov 2020 10:10:03 +0000 + -- Jinming Wu, Patrick Tue, 03 Nov 2020 10:13:53 +0000 livecd-rootfs (2.698) hirsute; urgency=medium