Compare commits

...

8 Commits

Author SHA1 Message Date
Robert C Jennings
4868b6c054
releasing package livecd-rootfs version 2.694.2 2021-02-05 15:06:48 -06:00
Cody Shepherd
c02b972a1f
Update changelog 2021-02-03 08:13:30 -08:00
Cody Shepherd
ffd4faca9a
Omit file type exensions in manifest names 2021-02-03 08:12:56 -08:00
Cody Shepherd
4ec61627a8
Create manifests for buildd tarballs 2021-02-03 08:12:46 -08:00
Dimitri John Ledkov
6c9120820a
releasing package livecd-rootfs version 2.694.1 2020-11-05 11:54:29 +00:00
Dimitri John Ledkov
b4fe728481
Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/groovy 2020-11-05 11:27:43 +00:00
Dimitri John Ledkov
4aedf53772
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.

(cherry picked from commit 1c7d688319490a8a15a5aab47fb086482b3efe92)

LP: #1901846
2020-10-28 10:44:22 +00:00
Dimitri John Ledkov
aeb9e39ec9
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.

(cherry picked from commit 5d9af7f3c59ec6e47bfac1483064f25ffbd80e63)

LP: #1901846
2020-10-28 10:44:03 +00:00
3 changed files with 28 additions and 25 deletions

45
debian/changelog vendored
View File

@ -1,38 +1,33 @@
livecd-rootfs (2.699) hirsute; urgency=medium livecd-rootfs (2.694.2) groovy; urgency=medium
* hyper-v hook: Fix writing of pkla file out to correct scratch directory [ Cody Shepherd ]
for image build. * Create manifests for buildd tarball images (LP: #1914445)
-- Jinming Wu, Patrick <me@patrickwu.space> Tue, 03 Nov 2020 10:13:53 +0000 -- Robert C Jennings <robert.jennings@canonical.com> Fri, 05 Feb 2021 14:41:05 -0600
livecd-rootfs (2.698) hirsute; urgency=medium livecd-rootfs (2.694.1) groovy; urgency=medium
* amd64: always install grub-pc with shim-signed (LP: #1901906) * livecd-rootfs SRU of change up to 2.699 from hirsute to groovy.
* control: install qemu-utils & snapd on riscv64.
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 29 Oct 2020 22:22:30 +0000
livecd-rootfs (2.697) hirsute; urgency=medium
[ John Chittum ]
* Ensure vmtools version entered into vmdk header (LP: #1893898)
-- Robert C Jennings <robert.jennings@canonical.com> Wed, 28 Oct 2020 12:02:04 -0500
livecd-rootfs (2.696) hirsute; urgency=medium
= hyperv gallery image =
[ Jinming Wu, Patrick ]
* hyper-v hook: Fix writing of pkla file out to correct scratch
directory for image build. LP: #1901846
[ Dimitri John Ledkov ]
* auto/config: seed ubuntu-desktop when building hyperv image LP: #1901846 * auto/config: seed ubuntu-desktop when building hyperv image LP: #1901846
* auto/config: scope ubuntu:desktop-preinstalled:raspi image options LP: #1901846 * auto/config: scope ubuntu:desktop-preinstalled:raspi image options LP: #1901846
-- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 28 Oct 2020 10:36:29 +0000 = CPC cloud images =
[ Dimitri John Ledkov & Joshua Powers ]
* amd64: always install grub-pc with shim-signed (LP: #1901906), and
ensure to autoremove packages
[ John Chittum ]
* Ensure vmtools version entered into vmdk header (LP: #1893898)
livecd-rootfs (2.695) hirsute; urgency=medium = RISC-V port =
* control: install qemu-utils & snapd on riscv64. (LP: #1903034)
* Install only shim-signed to prevent shipping conflicting, autoremovable -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 05 Nov 2020 11:54:14 +0000
packages
* Ensure autoremove is run after any package install
-- Joshua Powers <josh.powers@canonical.com> Mon, 26 Oct 2020 11:58:57 -0700
livecd-rootfs (2.694) groovy; urgency=medium livecd-rootfs (2.694) groovy; urgency=medium

View File

@ -4,6 +4,10 @@
# ourselves. # ourselves.
set -e set -e
. config/functions
create_manifest chroot "livecd.$PROJECT.rootfs.manifest"
# gzip was chosen for fastest decompression speed: it decompresses buildd # gzip was chosen for fastest decompression speed: it decompresses buildd
# chroots about twice as fast as xz and about five times as fast as bzip2. # chroots about twice as fast as xz and about five times as fast as bzip2.
tar --transform='s,^chroot,chroot-autobuild,' --sort=name --numeric-owner \ tar --transform='s,^chroot,chroot-autobuild,' --sort=name --numeric-owner \

View File

@ -3,12 +3,16 @@
set -e set -e
. config/bootstrap . config/bootstrap
. config/functions
TMPDIR="$(mktemp -d)" TMPDIR="$(mktemp -d)"
config/make-lxd-metadata "${LB_DISTRIBUTION%-*}" "$ARCH" \ config/make-lxd-metadata "${LB_DISTRIBUTION%-*}" "$ARCH" \
>"$TMPDIR/metadata.yaml" >"$TMPDIR/metadata.yaml"
tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml
rm -rf "$TMPDIR" rm -rf "$TMPDIR"
create_manifest chroot "livecd.$PROJECT.lxd.manifest"
# When using the combined metadata/rootfs form, the rootfs must be under # When using the combined metadata/rootfs form, the rootfs must be under
# rootfs/ rather than under chroot-autobuild/. # rootfs/ rather than under chroot-autobuild/.
tar --transform='s,^chroot,rootfs,' --sort=name --numeric-owner \ tar --transform='s,^chroot,rootfs,' --sort=name --numeric-owner \