Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-28 11:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.747

Browse Source 
No change rebuild
This commit is contained in:
CloudBuilder 2021-12-14 15:25:44 +00:00
parent 330246233d
commit 24daa1af63
5 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
debian/changelog vendored
View File

@ -1,3 +1,35 @@
livecd-rootfs (2.747) jammy; urgency=medium
* ubuntu-cpc/hooks.d/base/disk-image-uefi.binary: Bump UEFI disk image
size for armhf to 3.5 GB.
Current builds are failing because the disk size is not big enough.
-- Thomas Bechtold <thomas.bechtold@canonical.com> Tue, 23 Nov 2021 10:15:18 +0100
livecd-rootfs (2.746) jammy; urgency=medium
* Add the capability to build an ISO image for the Intel IoT project.
Additionally, stop using universe with the project given that the kernel
is now in main.
-- Brian Murray <brian@ubuntu.com> Tue, 16 Nov 2021 17:00:57 -0800
livecd-rootfs (2.745) jammy; urgency=medium
[ Erich Eickmeyer ]
* Remove fonts and publishing tasks from ubuntustudio DVD
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 08 Nov 2021 13:43:53 -0800
livecd-rootfs (2.744) jammy; urgency=medium
* Install desired already seeded snap in wsl.
As wsl is an image target of ubuntu-cpc, the base seed is hardcoded to
ubuntu-server instead of wsl one. For now, add it, as for the other
cpc images, in hooks.
-- Didier Roche <didrocks@ubuntu.com> Fri, 05 Nov 2021 10:23:24 +0100
livecd-rootfs (2.743) jammy; urgency=medium
* magic-proxy: fix exception handling for URLError. LP: #1946520

3
live-build/auto/build
View File

@ -576,6 +576,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
oem-*)
FLAVOUR="oem"
;;
image-intel)
FLAVOUR="intel"
;;
esac
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then

13
live-build/auto/config
View File

@ -707,7 +707,7 @@ case $PROJECT in
;;
intel-iot)
KERNEL_FLAVOURS='image-intel'
COMPONENTS='main restricted universe'
COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
@ -724,6 +724,10 @@ case $PROJECT in
add_task install minimal standard ubuntu-desktop
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
KERNEL_FLAVOURS='generic-hwe-20.04'
if [ "$SUBARCH" = "intel-iot" ]; then
KERNEL_FLAVOURS='image-intel'
COMPONENTS='main restricted'
fi
;;
esac
;;
@ -810,7 +814,7 @@ case $PROJECT in
;;
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-graphics ubuntustudio-video ubuntustudio-photography
COMPONENTS='main restricted universe multiverse'
case $ARCH in
amd64|i386) KERNEL_FLAVOURS=lowlatency ;;
@ -923,7 +927,7 @@ case $PROJECT in
KERNEL_FLAVOURS=generic
elif [ "${SUBARCH:-}" = "intel-iot" ]; then
KERNEL_FLAVOURS=image-intel
COMPONENTS='main restricted universe'
COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none"
fi
;;
@ -1082,8 +1086,9 @@ case $PROJECT in
KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
case $SUBARCH in
intel-iot)
COMPONENTS='main restricted universe'
COMPONENTS='main restricted'
KERNEL_FLAVOURS='image-intel'
;;
esac
;;
esac

4
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
View File

@ -21,6 +21,10 @@ case ${PROJECT:-} in
;;
esac
if [ "$ARCH" = "armhf" ]; then
IMAGE_SIZE=3758096384 # bump to 3.5G (3584*1024**2); Since Jammy armhf need more then the default 2.2G
fi
# Change image size for preinstalled generic images & all preinstalled riscv64 images
if [ -n "${SUBARCH:-}" ]; then
if [ "${SUBARCH:-}" = "generic" ] || [ "$ARCH" = "riscv64" ]; then

7
live-build/ubuntu-cpc/hooks.d/base/wsl.binary
View File

@ -37,6 +37,13 @@ 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
# Install snap manually for now as config on cpc always assume the same base seed for every flavors
env UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 chroot $rootfs_dir snap download --target-directory=/var/lib/snapd/snaps core20
env UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 chroot $rootfs_dir snap download --target-directory=/var/lib/snapd/snaps gtk-common-themes
env UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 chroot $rootfs_dir snap download --target-directory=/var/lib/snapd/snaps --channel=latest/edge ubuntu-desktop-installer
create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest
teardown_mountpoint $rootfs_dir