Add zstd dep for mini-iso + minor fixes to get it building on livefs builders.

ui-by-default-wip
Łukasz 'sil2100' Zemczak 2 years ago
parent 41acfaa911
commit 279b9473d8

13
debian/changelog vendored

@ -1,3 +1,16 @@
livecd-rootfs (2.815) UNRELEASED; urgency=medium
[ Dan Bungert ]
* debian/control: depend on zstd to test unmkinitramfs failure.
[ Łukasz 'sil2100' Zemczak ]
* Change the mini-iso livefs artifact name from .mini-iso.iso to .iso to be
more compatible with existing cdimage machinery.
* Rename variables accessed in the mini-iso to the equivalents exported to
binary hooks.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 23 Mar 2023 10:43:29 +0100
livecd-rootfs (2.814) lunar; urgency=medium livecd-rootfs (2.814) lunar; urgency=medium
* Adjust journald settings for live-server for compatibility with Subiquity. * Adjust journald settings for live-server for compatibility with Subiquity.

3
debian/control vendored

@ -42,7 +42,8 @@ Depends: ${misc:Depends},
python3-vmdkstream [amd64 i386], python3-vmdkstream [amd64 i386],
xorriso [!i386], xorriso [!i386],
xz-utils, xz-utils,
zerofree zerofree,
zstd
Breaks: ubuntu-defaults-builder (<< 0.32) Breaks: ubuntu-defaults-builder (<< 0.32)
Description: construction script for the livecd rootfs Description: construction script for the livecd rootfs
livecd-rootfs provides the script used to create the root filesystem livecd-rootfs provides the script used to create the root filesystem

@ -10,6 +10,8 @@ case $ARCH in
;; ;;
esac esac
. config/binary
KERNEL=chroot/boot/vmlinuz KERNEL=chroot/boot/vmlinuz
INITRD=chroot/boot/initrd.img INITRD=chroot/boot/initrd.img
@ -60,14 +62,14 @@ cat > ubuntu-mini-iso/$ARCH/tree/.disk/cd_type <<EOF
full_cd/single full_cd/single
EOF EOF
version=$(distro-info --fullname --series=$SUITE \ version=$(distro-info --fullname --series=$LB_DISTRIBUTION \
| sed s'/^Ubuntu/ubuntu-mini-iso/') | sed s'/^Ubuntu/ubuntu-mini-iso/')
cat > ubuntu-mini-iso/$ARCH/tree/.disk/info <<EOF cat > ubuntu-mini-iso/$ARCH/tree/.disk/info <<EOF
$version - $ARCH ($NOW) $version - $ARCH ($BUILDSTAMP)
EOF EOF
dest="${PWD}/livecd.${PROJECT}.ubuntu-mini.iso" dest="${PWD}/livecd.${PROJECT}.iso"
xorriso="$(cat chroot/usr/share/cd-boot-images-amd64/xorriso-cmd.txt)" xorriso="$(cat chroot/usr/share/cd-boot-images-amd64/xorriso-cmd.txt)"
cd ubuntu-mini-iso/$ARCH cd ubuntu-mini-iso/$ARCH

Loading…
Cancel
Save