Merge branch 'xnox/riscv64' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

This commit is contained in:
Dimitri John Ledkov 2020-05-01 19:58:17 +01:00
commit 3f4a3c6fa0
2 changed files with 4 additions and 2 deletions

4
debian/changelog vendored
View File

@ -4,8 +4,10 @@ livecd-rootfs (2.664ubuntu1) UNRELEASED; urgency=medium
(LP: #1875430)
* ubuntu-image: fix focal+ pi images for armhf to use pi-armhf model name.
(LP: #1876358)
* ubuntu-image: drop ubuntu-image dep on riscv64, as not installable yet.
(LP: #1876359)
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 01 May 2020 19:51:57 +0100
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 01 May 2020 19:56:14 +0100
livecd-rootfs (2.664) focal; urgency=medium

2
debian/control vendored
View File

@ -38,7 +38,7 @@ Depends: ${misc:Depends},
squashfs-tools (>= 1:3.3-1),
sudo,
u-boot-tools [armhf arm64],
ubuntu-image [!i386],
ubuntu-image [!i386 !riscv64],
python3-vmdkstream [amd64 i386],
xz-utils,
zerofree