mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-21 13:44:08 +00:00
Compare commits
12 Commits
ubuntu/mas
...
2.664.4
Author | SHA1 | Date | |
---|---|---|---|
|
e9f4e97155 | ||
|
896b5962db | ||
|
e39a40e2a5 | ||
|
8284a1c680 | ||
|
54508e6583 | ||
|
e611dfc1c4 | ||
|
cd098e7c41 | ||
|
225f2fe504 | ||
|
0a2fbb8b99 | ||
|
54b8e73a15 | ||
|
2d5f9581db | ||
|
dc456c240d |
39
debian/changelog
vendored
39
debian/changelog
vendored
@ -1,3 +1,42 @@
|
|||||||
|
livecd-rootfs (2.664.4) focal; urgency=medium
|
||||||
|
|
||||||
|
* snap_preseed: support channel specification with snap name (LP: #1882374)
|
||||||
|
|
||||||
|
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 23 Jul 2020 19:12:10 +0100
|
||||||
|
|
||||||
|
livecd-rootfs (2.664.3) focal; urgency=medium
|
||||||
|
|
||||||
|
[ Łukasz 'sil2100' Zemczak ]
|
||||||
|
* Enable overrides of UC20 grade dangerous channels - as this is possible.
|
||||||
|
(LP: #1879350)
|
||||||
|
|
||||||
|
[ Iain Lane ]
|
||||||
|
* Hack seeding of linux kernel in ubuntustudio/focal
|
||||||
|
ubuntustudio-default-settings in focal release has a Recommends to this
|
||||||
|
kernel, which makes it impossible to update the kernel later on, since we
|
||||||
|
would install the -updates and release kernel, which isn't allowed and
|
||||||
|
causes FTBFS. Hack out the focal-release kernel and let the rest of the
|
||||||
|
build process pull in the right one. (LP: #1884915)
|
||||||
|
|
||||||
|
-- Iain Lane <iain.lane@canonical.com> Tue, 21 Jul 2020 16:25:18 +0100
|
||||||
|
|
||||||
|
livecd-rootfs (2.664.2) focal; urgency=medium
|
||||||
|
|
||||||
|
* Revert of initramfs package removal in KVM image (LP: #1880170)
|
||||||
|
|
||||||
|
-- Phil Roche <phil.roche@canonical.com> Fri, 22 May 2020 13:03:20 +0100
|
||||||
|
|
||||||
|
livecd-rootfs (2.664.1) focal; urgency=medium
|
||||||
|
|
||||||
|
* Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible.
|
||||||
|
(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 20:08:23 +0100
|
||||||
|
|
||||||
livecd-rootfs (2.664) focal; urgency=medium
|
livecd-rootfs (2.664) focal; urgency=medium
|
||||||
|
|
||||||
[ Patrick Viafore ]
|
[ Patrick Viafore ]
|
||||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -38,7 +38,7 @@ Depends: ${misc:Depends},
|
|||||||
squashfs-tools (>= 1:3.3-1),
|
squashfs-tools (>= 1:3.3-1),
|
||||||
sudo,
|
sudo,
|
||||||
u-boot-tools [armhf arm64],
|
u-boot-tools [armhf arm64],
|
||||||
ubuntu-image [!i386],
|
ubuntu-image [!i386 !riscv64],
|
||||||
python3-vmdkstream [amd64 i386],
|
python3-vmdkstream [amd64 i386],
|
||||||
xz-utils,
|
xz-utils,
|
||||||
zerofree
|
zerofree
|
||||||
|
@ -359,8 +359,16 @@ case $IMAGEFORMAT in
|
|||||||
CHANNEL="${CHANNEL:-edge}"
|
CHANNEL="${CHANNEL:-edge}"
|
||||||
case $MODEL in
|
case $MODEL in
|
||||||
pc-amd64|pc-i386)
|
pc-amd64|pc-i386)
|
||||||
[ -z "${SUBARCH:-}" ] \
|
if [ -z "${SUBARCH:-}" ]; then
|
||||||
&& UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
|
case $SUITE in
|
||||||
|
xenial|bionic)
|
||||||
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
*) ;;
|
*) ;;
|
||||||
esac
|
esac
|
||||||
@ -375,7 +383,9 @@ case $IMAGEFORMAT in
|
|||||||
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
UBUNTU_IMAGE_ARGS="--image-size 10G"
|
if [ "${MODEL}" = "pi" ]; then
|
||||||
|
MODEL=pi-armhf
|
||||||
|
fi
|
||||||
# Ubuntu Core 20
|
# Ubuntu Core 20
|
||||||
# Currently uc20 assertions do not support global
|
# Currently uc20 assertions do not support global
|
||||||
# channel overrides, instead we have per-channel models
|
# channel overrides, instead we have per-channel models
|
||||||
@ -386,6 +396,15 @@ case $IMAGEFORMAT in
|
|||||||
candidate|beta|edge|dangerous)
|
candidate|beta|edge|dangerous)
|
||||||
MODEL="ubuntu-core-20-${MODEL#pc-}-${CHANNEL}"
|
MODEL="ubuntu-core-20-${MODEL#pc-}-${CHANNEL}"
|
||||||
;;
|
;;
|
||||||
|
dangerous-*)
|
||||||
|
# That being said, the dangerous grade *does*
|
||||||
|
# support channel overrides, so we can use the
|
||||||
|
# dangerous model assertion and override the channel
|
||||||
|
# freely.
|
||||||
|
MODEL="ubuntu-core-20-${MODEL#pc-}-dangerous"
|
||||||
|
CHANNEL=${CHANNEL#dangerous-}
|
||||||
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Unknown CHANNEL ${CHANNEL} specification for ${SUITE}"
|
echo "Unknown CHANNEL ${CHANNEL} specification for ${SUITE}"
|
||||||
exit 1
|
exit 1
|
||||||
@ -669,6 +688,23 @@ case $PROJECT in
|
|||||||
|
|
||||||
ubuntustudio-dvd)
|
ubuntustudio-dvd)
|
||||||
add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-fonts ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
|
add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-fonts ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
|
||||||
|
case $SUITE in
|
||||||
|
focal)
|
||||||
|
# ubuntustudio-default-settings in focal
|
||||||
|
# release has a Recommends to this kernel,
|
||||||
|
# which makes it impossible to update the
|
||||||
|
# kernel later on, since we would install the
|
||||||
|
# -updates and release kernel, which isn't
|
||||||
|
# allowed and causes the squashfs to fail to
|
||||||
|
# build. Hack out the focal-release kernel and
|
||||||
|
# let the rest of the build process pull in the
|
||||||
|
# right one. (See right below.)
|
||||||
|
for package in linux-lowlatency linux-image-lowlatency linux-headers-lowlatency linux-image-5.4.0-26-lowlatency linux-headers-5.4.0-26-lowlatency; do
|
||||||
|
sed -i "s/$/ -a --not -XFPackage ${package}/" \
|
||||||
|
"config/package-lists/livecd-rootfs.list.chroot_install"
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
esac
|
||||||
COMPONENTS='main restricted universe multiverse'
|
COMPONENTS='main restricted universe multiverse'
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
amd64|i386) KERNEL_FLAVOURS=lowlatency ;;
|
amd64|i386) KERNEL_FLAVOURS=lowlatency ;;
|
||||||
|
@ -626,11 +626,31 @@ snap_prepare() {
|
|||||||
snap_preseed() {
|
snap_preseed() {
|
||||||
# Preseed a snap in the image (snap_prepare must be called once prior)
|
# Preseed a snap in the image (snap_prepare must be called once prior)
|
||||||
local CHROOT_ROOT=$1
|
local CHROOT_ROOT=$1
|
||||||
|
# $2 can be in the form of snap_name/classic=track/risk/branch
|
||||||
local SNAP=$2
|
local SNAP=$2
|
||||||
|
# strip CHANNEL specification
|
||||||
|
SNAP=${SNAP%=*}
|
||||||
|
# strip /classic confinement
|
||||||
local SNAP_NAME=${SNAP%/*}
|
local SNAP_NAME=${SNAP%/*}
|
||||||
# Per Ubuntu policy, all seeded snaps (with the exception of the core
|
# Seed from the specified channel (e.g. core18 latest/stable)
|
||||||
# snap) must pull from stable/ubuntu-$(release_ver) as their channel.
|
# Or Channel endcoded in the snap name (e.g. lxd=4.0/stable/ubuntu-20.04)
|
||||||
local CHANNEL=${3:-"stable/ubuntu-$(release_ver)"}
|
# Or Ubuntu policy default channel latest/stable/ubuntu-$(release_ver)
|
||||||
|
local CHANNEL=${3:-}
|
||||||
|
if [ -z "$CHANNEL" ]; then
|
||||||
|
case $2 in
|
||||||
|
*=*)
|
||||||
|
CHANNEL=${2#*=}
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
CHANNEL="stable/ubuntu-$(release_ver)"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# At this point:
|
||||||
|
# SNAP_NAME is just the snap name
|
||||||
|
# SNAP is either $SNAP_NAME or $SNAP_NAME/classic for classic confined
|
||||||
|
# CHANNEL is the channel
|
||||||
|
|
||||||
if [ ! -e "$CHROOT_ROOT/var/lib/snapd/seed/assertions/model" ]; then
|
if [ ! -e "$CHROOT_ROOT/var/lib/snapd/seed/assertions/model" ]; then
|
||||||
echo "ERROR: Snap model assertion not present, snap_prepare must be called"
|
echo "ERROR: Snap model assertion not present, snap_prepare must be called"
|
||||||
|
@ -49,10 +49,6 @@ replace_kernel ${mount_d} "linux-kvm"
|
|||||||
chroot "${mount_d}" update-grub
|
chroot "${mount_d}" update-grub
|
||||||
undivert_grub "${mount_d}"
|
undivert_grub "${mount_d}"
|
||||||
|
|
||||||
# Remove initramfs for kvm image
|
|
||||||
env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" apt-get \
|
|
||||||
purge -y initramfs-tools busybox-initramfs
|
|
||||||
|
|
||||||
env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" rm \
|
env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" rm \
|
||||||
-rf /boot/initrd.img-* /boot/initrd.img
|
-rf /boot/initrd.img-* /boot/initrd.img
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user