Imported 24.04.11 from noble-release pocket.

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-12-09 07:00:12 +00:00
parent c704051c30
commit 20cb3bceae
4 changed files with 77 additions and 18 deletions

36
debian/changelog vendored
View File

@ -1,3 +1,39 @@
livecd-rootfs (24.04.11) noble; urgency=medium
* Explicitly add_package linux-$KERNEL_FLAVOURS in Ubuntu Studio.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 08 Dec 2023 18:34:07 -0800
livecd-rootfs (24.04.10) noble; urgency=medium
* Set C.UTF-8 locale in /etc/default/locale for all images; originally
intended to be landed in the cosmic cycle..
* Project name for Ubuntu Studio needs to be 'ubuntustudio-dvd'
throughout, not 'ubuntustudio'.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 08 Dec 2023 15:07:41 -0800
livecd-rootfs (24.04.9) noble; urgency=medium
* When building locally using the auto/build script unmounting fails.
Instead of mounting /dev/pts per bind mount the devpts file system
directly.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 08 Dec 2023 15:43:04 +1300
livecd-rootfs (24.04.8) noble; urgency=medium
[ Erich Eickmeyer ]
* Switch Ubuntu Studio to the new installer.
[ Steve Langasek ]
* Remove *-dvd glob handling for live layers; Ubuntu Studio is the only
remaining "DVD" flavor, and with the move to the new installer this bit
is also now incorrect.
* live-build/auto/config: fail immediately on unknown arch/subarch.
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 07 Dec 2023 15:36:30 -0800
livecd-rootfs (24.04.7) noble; urgency=medium
[ Dave Jones ]

View File

@ -165,15 +165,8 @@ Expire-Date: 0
lb bootstrap "$@"
case $PROJECT:${SUBPROJECT:-} in
ubuntu-server:*|ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
# Set locale to C.UTF-8 by default. We should
# probably do this for all images early in the
# 18.10 cycle but for now just do it for
# server and cpc products.
echo "LANG=C.UTF-8" > chroot/etc/default/locale
;;
esac
# Set locale to C.UTF-8 by default. This may be overridden later.
echo "LANG=C.UTF-8" > chroot/etc/default/locale
if [ "${SUBPROJECT:-}" = minimized ] \
&& ! Chroot chroot dpkg -l tzdata 2>&1 |grep -q ^ii; then

View File

@ -1,6 +1,24 @@
#! /bin/sh
set -e
case $ARCH:$SUBARCH in
amd64:|amd64:generic|amd64:intel-iot|\
arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
arm64:tegra|arm64:tegra-igx|arm64:x13s|\
armhf:|armhf:raspi|\
i386:|\
ppc64el:|\
riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\
riscv64:nezha|riscv64:unmatched|riscv64:visionfive|riscv64:visionfive2|\
s390x:|\
*appliance*)
;;
*)
echo "Unknown architecture target $ARCH:$SUBARCH"
exit 1
;;
esac
if [ -e config/germinate-output ]; then
mv -T config/germinate-output germ-tmp
rm -rf config
@ -538,7 +556,7 @@ case $IMAGEFORMAT in
*)
case $PROJECT in
ubuntu-server|ubuntu-wsl|ubuntu-oem|ubuntu|\
ubuntu-budgie)
ubuntu-budgie|ubuntustudio-dvd)
;;
*)
add_package live casper
@ -846,8 +864,25 @@ case $PROJECT in
;;
ubuntustudio-dvd)
add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography
# By default Ubuntu Studio now ships the new installer.
touch config/universe-enabled
PASSES_TO_LAYERS="true"
KERNEL_FLAVOURS=lowlatency
add_task standard minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography
add_task standard.live ubuntustudio-dvd-live
add_package standard.live linux-$KERNEL_FLAVOURS
cat <<-EOF > config/standard.catalog-in.yaml
name: "Ubuntu Studio Desktop"
description: >-
A full featured Ubuntu Studio Desktop.
id: ubuntustudio-desktop
type: fsimage-layered
variant: desktop
locale_support: langpack
default: yes
EOF
/usr/share/livecd-rootfs/checkout-translations-branch \
https://git.launchpad.net/subiquity po config/catalog-translations
;;
ubuntu-server)
@ -1129,12 +1164,6 @@ if [ "$PREINSTALLED" != "true" ] && [ "$PASSES_TO_LAYERS" != "true" ] && [ "$LIV
add_task live "$LIVE_TASK"
fi
case $PROJECT in
*-dvd)
add_task live "$PROJECT-live"
;;
esac
case "$ARCH${SUBARCH:++$SUBARCH}" in
arm*+raspi)
# Common configuration for all Raspberry Pi image variants (server,

View File

@ -129,7 +129,8 @@ setup_mountpoint() {
chown root:kmem /dev/mem
fi
mount --rbind /dev "$mountpoint/dev"
mount dev-live -t devtmpfs "$mountpoint/dev"
mount devpts-live -t devpts -o nodev,nosuid "$mountpoint/dev/pts"
mount proc-live -t proc "$mountpoint/proc"
mount sysfs-live -t sysfs "$mountpoint/sys"
mount securityfs -t securityfs "$mountpoint/sys/kernel/security"