Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-08-14 18:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.771

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2022-07-28 16:38:13 +00:00
parent 3723595eb9
commit 5e412fc1c1
5 changed files with 61 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
debian/changelog vendored
View File

@ -1,3 +1,24 @@
livecd-rootfs (2.771) kinetic; urgency=medium
[ Steve Langasek ]
* Drop support for building i386 images aside from the launchpad builder
images.
* Remove fwupd from the cloud images. LP: #1981109.
[ Michael Hudson-Doyle ]
* Fix some issues with the netboot tarballs:
- Include the signed shim (oops).
- Make the kernel path on disk and in the bootloader config match (more
oops).
- Make paths more architecture dependent as the code in grubnetXXX.efi to
probe a platform dependent path first doesn't work.
[ Alexandre Ghiti ]
* Install wpasupplicant by default as for now, most of the RISC-V boards
embed a Wifi chipset (LP: #1983008)
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 25 Jul 2022 12:49:28 -0700
livecd-rootfs (2.770) kinetic; urgency=medium
[ Alexandre Ghiti ]

20
live-build/auto/build
View File

@ -641,26 +641,6 @@ case $SUBARCH in
;;
esac
# LTSP chroot building (only in 32bit and for Edubuntu (DVD))
case $PROJECT in
edubuntu-dvd)
if [ "$ARCH" = i386 ]; then
echo "Building LTSP chroot"
ltsp-build-client --base $(pwd) --mirror $LB_PARENT_MIRROR_BOOTSTRAP --arch $ARCH --dist $LB_PARENT_DISTRIBUTION --chroot ltsp-live --late-packages ldm-edubuntu-theme,plymouth-theme-edubuntu --purge-chroot --skipimage
mkdir -p images
mksquashfs ltsp-live images/ltsp-live.img -e cdrom
rm -Rf ltsp-live
if [ -f images/ltsp-live.img ]; then
mv images/ltsp-live.img livecd.$PROJECT-ltsp.squashfs
chmod 0644 livecd.$PROJECT-ltsp.squashfs
rmdir --ignore-fail-on-non-empty images
else
echo "LTSP: Unable to build the chroot, see above for details."
fi
fi
;;
esac
if [ -f "config/magic-proxy.pid" ]; then
kill -TERM $(cat config/magic-proxy.pid)
rm -f config/magic-proxy.pid

16
live-build/auto/config
View File

@ -391,8 +391,6 @@ case $IMAGEFORMAT in
MODEL=intel-iot ;;
amd64+*)
MODEL=pc-amd64 ;;
i386+*)
MODEL=pc-i386 ;;
arm64+snapdragon)
MODEL=dragonboard ;;
armhf+raspi)
@ -425,7 +423,7 @@ case $IMAGEFORMAT in
CHANNEL="${CHANNEL:-edge}"
case $MODEL in
pc-amd64|pc-i386)
pc-amd64)
if [ -z "${SUBARCH:-}" ]; then
# This is to make sure there's enough writable space
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
@ -776,7 +774,7 @@ case $PROJECT in
LIVE_TASK='xubuntu-live'
COMPONENTS='main restricted universe multiverse'
case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;;
amd64) KERNEL_FLAVOURS=generic ;;
esac
;;
@ -796,7 +794,7 @@ case $PROJECT in
LIVE_TASK='lubuntu-live'
COMPONENTS='main restricted universe multiverse'
case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;;
amd64) KERNEL_FLAVOURS=generic ;;
esac
;;
@ -822,7 +820,7 @@ case $PROJECT in
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 ;;
amd64) KERNEL_FLAVOURS=lowlatency ;;
esac
;;
@ -1086,7 +1084,7 @@ case $PROJECT in
;;
esac
case "$ARCH+${SUBARCH:-}" in
case "$ARCH${SUBARCH:++$SUBARCH}" in
arm*+raspi)
# Common configuration for all Raspberry Pi image variants (server,
# desktop etc.)
@ -1097,6 +1095,10 @@ case "$ARCH+${SUBARCH:-}" in
add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi u-boot-tools
BINARY_REMOVE_LINUX=false
;;
riscv*+*)
# We'll add wpasupplicant to the seeds when we work on RISC-V seeds.
add_package install wpasupplicant
;;
esac
case $PROJECT:${SUBPROJECT:-} in

5
live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
View File

@ -91,6 +91,11 @@ if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; the
rm "${rootd}/boot/initrd.img"
fi
# Recommends of ubuntu-server that should not be included in cloud images by
# default
_xchroot "$rootd" env DEBIAN_FRONTEND=noninteractive \
apt-get -y autoremove --purge fwupd
if [ "${SUBPROJECT:-}" = minimized ]; then
# Remove various packages that we don't want in the minimized images.
# Some of these are tools that don't make sense by default

52
live-build/ubuntu-server/hooks/05-netboot-tarball.binary
View File

@ -20,49 +20,49 @@ mkdir -p tarball/$ARCH
case $ARCH in
s390x)
cp $INITRD tarball/$ARCH/initrd.ubuntu
cp $KERNEL tarball/$ARCH/kernel.ubuntu
cp $KERNEL tarball/$ARCH/linux.ubuntu
;;
*)
cp $INITRD tarball/$ARCH/initrd
cp $KERNEL tarball/$ARCH/kernel
cp $KERNEL tarball/$ARCH/linux
;;
esac
case $ARCH in
amd64)
mv chroot/usr/lib/PXELINUX/pxelinux.0 tarball/pxelinux.0
mv chroot/usr/lib/syslinux/modules/bios/ldlinux.c32 tarball/ldlinux.c32
mv chroot/usr/lib/shim/shimx64.efi tarball/bootx64.efi
mv chroot/usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed tarball/grubx64.efi
mv chroot/usr/lib/PXELINUX/pxelinux.0 tarball/amd64/pxelinux.0
mv chroot/usr/lib/syslinux/modules/bios/ldlinux.c32 tarball/amd64/ldlinux.c32
mv chroot/usr/lib/shim/shimx64.efi.signed tarball/amd64/bootx64.efi
mv chroot/usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed tarball/amd64/grubx64.efi
mkdir tarball/x86_64-efi tarball/pxelinux.cfg
cat > tarball/x86_64-efi/grub.cfg.in <<EOF
mkdir tarball/amd64/grub tarball/amd64/pxelinux.cfg
cat > tarball/amd64/grub/grub.cfg.in <<EOF
menuentry "Install Ubuntu Server" {
set gfxpayload=keep
linux amd64/linux iso-url=#ISOURL# ip=dhcp ---
initrd amd64/initrd
linux linux iso-url=#ISOURL# ip=dhcp ---
initrd initrd
}
EOF
cat > tarball/pxelinux.cfg/default.in <<EOF
cat > tarball/amd64/pxelinux.cfg/default.in <<EOF
DEFAULT install
LABEL install
KERNEL amd64/linux
INITRD amd64/initrd
KERNEL linux
INITRD initrd
APPEND root=/dev/ram0 ramdisk_size=1500000 ip=dhcp iso-url=#ISOURL# ---
EOF
;;
arm64)
mv chroot/usr/lib/shim/shimaa64.efi tarball/bootaa64.efi
mv chroot/usr/lib/grub/arm64-efi-signed/grubnetaa64.efi.signed tarball/grubaa64.efi
mv chroot/usr/lib/shim/shimaa64.efi.signed tarball/arm64/bootaa64.efi
mv chroot/usr/lib/grub/arm64-efi-signed/grubnetaa64.efi.signed tarball/arm64/grubaa64.efi
mkdir tarball/arm64-efi
cat > tarball/arm64-efi/grub.cfg.in <<EOF
mkdir tarball/arm64/grub
cat > tarball/arm64/grub/grub.cfg.in <<EOF
menuentry "Install Ubuntu Server" {
set gfxpayload=keep
linux arm64/linux iso-url=#ISOURL# ip=dhcp ---
initrd arm64/initrd
linux linux iso-url=#ISOURL# ip=dhcp ---
initrd initrd
}
EOF
;;
@ -83,7 +83,7 @@ EOF
EOF
cat > tarball/s390x/ubuntu.ins <<EOF
* Ubuntu for IBM Z (default kernel)
kernel.ubuntu 0x00000000
linux.ubuntu 0x00000000
initrd.off 0x0001040c
initrd.siz 0x00010414
parmfile.ubuntu 0x00010480
@ -94,20 +94,20 @@ iso-url=#ISOURL# ---
EOF
perl -e "print pack('N', 0x1000000)" > tarball/s390x/initrd.off
perl -e "print pack('N', -s 'tarball/s390x/initrd.ubuntu')" > tarball/s390x/initrd.siz
cat > tarball/s390x-kvm.cfg.in <<EOF
cat > tarball/s390x/kvm.cfg.in <<EOF
DEFAULT install
LABEL install
KERNEL amd64/linux.ubuntu
INITRD amd64/initrd.ubuntu
KERNEL linux.ubuntu
INITRD initrd.ubuntu
APPEND ip=dhcp iso-url=#ISOURL# ---
EOF
cat > tarball/dpm.cfg.in <<EOF
cat > tarball/s390x/dpm.cfg.in <<EOF
PROMPT 1
DEFAULT install
TIMEOUT 1
LABEL install
kernel=amd64/linux.ubuntu
initrd=amd64/initrd.ubuntu
kernel=linux.ubuntu
initrd=initrd.ubuntu
append=ip=dhcp iso-url=#ISOURL# ---
EOF
;;