mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 03:11:12 +00:00
Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu-core-desktop-noble
This commit is contained in:
Łukasz 'sil2100' Zemczak
commit
daf856277e
33
debian/changelog
vendored
33
debian/changelog
vendored
@ -1,3 +1,36 @@
|
||||
livecd-rootfs (24.04.67) noble; urgency=medium
|
||||
|
||||
[ Julian Andres Klode ]
|
||||
* Update wording for universe sources
|
||||
|
||||
[ Łukasz 'sil2100' Zemczak ]
|
||||
* Update the classic model assertion for TPM FDE, dropping thunderbird as
|
||||
it is not part of the minimal install.
|
||||
|
||||
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Mon, 22 Apr 2024 13:00:36 +0100
|
||||
|
||||
livecd-rootfs (24.04.66) noble; urgency=medium
|
||||
|
||||
[ Heinrich Schuchardt ]
|
||||
* riscv: add pre-installed image for Milk-V Mars.
|
||||
|
||||
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Mon, 22 Apr 2024 09:11:59 +0100
|
||||
|
||||
livecd-rootfs (24.04.65) noble; urgency=medium
|
||||
|
||||
[ Aaron Rainbolt ]
|
||||
* Allows Multiverse packages to be pulled into Kubuntu. This is necessary so
|
||||
that fonts-ibm-plex can be installed on the ISO, which is going to be used
|
||||
by kubuntu-installer-prompt as part of Kubuntu's rebrand.
|
||||
|
||||
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 18 Apr 2024 19:35:49 +0200
|
||||
|
||||
livecd-rootfs (24.04.64) noble; urgency=medium
|
||||
|
||||
* Update the Ubuntu classic model assertion for TPM FDE to the 24.04 model.
|
||||
|
||||
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 18 Apr 2024 18:57:28 +0200
|
||||
|
||||
livecd-rootfs (24.04.63) noble; urgency=medium
|
||||
|
||||
[ Simon Poirier ]
|
||||
|
||||
@ -9,7 +9,8 @@ case $ARCH:$SUBARCH in
|
||||
i386:|\
|
||||
ppc64el:|\
|
||||
riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\
|
||||
riscv64:nezha|riscv64:unmatched|riscv64:visionfive|riscv64:visionfive2|\
|
||||
riscv64:milk-v-mars|riscv64:nezha|riscv64:unmatched|riscv64:visionfive|\
|
||||
riscv64:visionfive2|\
|
||||
s390x:|\
|
||||
*appliance*)
|
||||
;;
|
||||
@ -392,8 +393,9 @@ fi
|
||||
if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
|
||||
case $ARCH:$SUBARCH in
|
||||
riscv64:icicle | \
|
||||
riscv64:nezha | \
|
||||
riscv64:licheerv | \
|
||||
riscv64:milk-v-mars | \
|
||||
riscv64:nezha | \
|
||||
riscv64:unmatched | \
|
||||
riscv64:visionfive | \
|
||||
riscv64:visionfive2 | \
|
||||
@ -629,10 +631,10 @@ case $PROJECT in
|
||||
ubuntu-server|ubuntu-mini-iso)
|
||||
COMPONENTS='main'
|
||||
;;
|
||||
edubuntu|kubuntu|ubuntu-budgie|ubuntucinnamon|ubuntukylin)
|
||||
edubuntu|ubuntu-budgie|ubuntucinnamon|ubuntukylin)
|
||||
COMPONENTS='main restricted universe'
|
||||
;;
|
||||
lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|xubuntu)
|
||||
lubuntu|kubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|xubuntu)
|
||||
COMPONENTS='main restricted universe multiverse'
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -920,10 +920,9 @@ EOF
|
||||
## or updates from the Ubuntu security team.
|
||||
## Components: Aside from main, the following components can be added to the list
|
||||
## restricted - Software that may not be under a free license, or protected by patents.
|
||||
## universe - Community maintained packages.
|
||||
## Software from this repository is only maintained and supported by Canonical
|
||||
## for machines with Ubuntu Pro subscriptions. Without Ubuntu Pro, the Ubuntu
|
||||
## community provides best-effort security maintenance.
|
||||
## universe - Community maintained packages. Software in this repository receives maintenance
|
||||
## from volunteers in the Ubuntu community, or a 10 year security maintenance
|
||||
## commitment from Canonical when an Ubuntu Pro subscription is attached.
|
||||
## multiverse - Community maintained of restricted. Software from this repository is
|
||||
## ENTIRELY UNSUPPORTED by the Ubuntu team, and may not be under a free
|
||||
## licence. Please satisfy yourself as to your rights to use the software.
|
||||
|
||||
@ -132,8 +132,8 @@ create_partitions() {
|
||||
--change-name=3:uEnv \
|
||||
--new=1:: \
|
||||
--attributes=1:set:2
|
||||
elif [ "${SUBARCH:-}" = "visionfive2" ]; then
|
||||
# VisionFive 2
|
||||
elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milk-v-mars" ]; then
|
||||
# VisionFive 2, Milk-V Mars
|
||||
sgdisk "${disk_image}" \
|
||||
--set-alignment=4096 \
|
||||
--new=13:4096:8191 \
|
||||
@ -285,6 +285,21 @@ install_grub() {
|
||||
loader="${loop_device}p13"
|
||||
dd if=mountpoint/usr/lib/u-boot/microchip_icicle/u-boot.payload of=$loader
|
||||
;;
|
||||
"milk-v-mars")
|
||||
cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
|
||||
# flash-kernel is needed to install the dtb for update-grub: it uses the
|
||||
# /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
|
||||
# the model value is wrong and we need to use /etc/flash-kernel/machine instead.
|
||||
# This explains why we install flash-kernel here.
|
||||
chroot mountpoint bash -c "echo 'Milk-V Mars' > /etc/flash-kernel/machine"
|
||||
chroot mountpoint apt-get install -qqy u-boot-starfive
|
||||
# U-Boot SPL
|
||||
loader1="${loop_device}p13"
|
||||
# Main U-Boot
|
||||
loader2="${loop_device}p2"
|
||||
dd if=mountpoint/usr/lib/u-boot/starfive_visionfive2/u-boot-spl.bin.normal.out of=$loader1
|
||||
dd if=mountpoint/usr/lib/u-boot/starfive_visionfive2/u-boot.itb of=$loader2
|
||||
;;
|
||||
"nezha"|"licheerv")
|
||||
echo "Reducing initramfs size for ${SUBARCH} board"
|
||||
mkdir -p mountpoint/etc/initramfs-tools/conf.d/
|
||||
|
||||
@ -20,14 +20,14 @@ fi
|
||||
. config/binary
|
||||
. config/functions
|
||||
|
||||
# env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2310-amd64 > config/classic-model.model
|
||||
# env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2404-amd64 > config/classic-model.model
|
||||
cat <<EOF > config/classic-model.model
|
||||
type: model
|
||||
authority-id: canonical
|
||||
revision: 5
|
||||
revision: 2
|
||||
series: 16
|
||||
brand-id: canonical
|
||||
model: ubuntu-classic-2310-amd64
|
||||
model: ubuntu-classic-2404-amd64
|
||||
architecture: amd64
|
||||
base: core22
|
||||
classic: true
|
||||
@ -35,12 +35,12 @@ distribution: ubuntu
|
||||
grade: signed
|
||||
snaps:
|
||||
-
|
||||
default-channel: classic-23.10/stable
|
||||
default-channel: classic-24.04/stable
|
||||
id: UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH
|
||||
name: pc
|
||||
type: gadget
|
||||
-
|
||||
default-channel: 23.10/stable
|
||||
default-channel: 24/stable
|
||||
id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
|
||||
name: pc-kernel
|
||||
type: kernel
|
||||
@ -60,48 +60,48 @@ snaps:
|
||||
name: bare
|
||||
type: base
|
||||
-
|
||||
default-channel: latest/stable/ubuntu-23.10
|
||||
default-channel: latest/stable/ubuntu-24.04
|
||||
id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk
|
||||
name: firefox
|
||||
type: app
|
||||
-
|
||||
default-channel: latest/stable/ubuntu-23.10
|
||||
default-channel: latest/stable/ubuntu-24.04
|
||||
id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3
|
||||
name: gnome-42-2204
|
||||
type: app
|
||||
-
|
||||
default-channel: latest/stable/ubuntu-23.10
|
||||
default-channel: latest/stable/ubuntu-24.04
|
||||
id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit
|
||||
name: gtk-common-themes
|
||||
type: app
|
||||
-
|
||||
default-channel: latest/stable/ubuntu-23.10
|
||||
default-channel: latest/stable/ubuntu-24.04
|
||||
id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
|
||||
name: snap-store
|
||||
type: app
|
||||
-
|
||||
default-channel: latest/stable/ubuntu-23.10
|
||||
default-channel: latest/stable/ubuntu-24.04
|
||||
id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu
|
||||
name: snapd-desktop-integration
|
||||
type: app
|
||||
-
|
||||
default-channel: latest/stable/ubuntu-23.10
|
||||
default-channel: latest/stable/ubuntu-24.04
|
||||
id: EI0D1KHjP8XiwMZKqSjuh6W8zvcowUVP
|
||||
name: firmware-updater
|
||||
type: app
|
||||
timestamp: 2023-10-03T12:00:00.0Z
|
||||
timestamp: 2024-04-21T12:00:00.0Z
|
||||
sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
|
||||
|
||||
AcLBXAQAAQoABgUCZRxdbAAKCRDgT5vottzAEhE1D/9tkrF4Zsq3YI4TpnNrXIlRoA8xF8E1ldPQ
|
||||
R8J3HTs85/VudYEg4yhnfny9NwngSUHYPrUdMDPlG03QF+hsp5jMcTCnHnwWaHAFTmSp4YlkKww/
|
||||
cBn8NAEKni9JL9K1y8A7fMUxojZ3QV/XI3fQl/cuLrWb0MJNl/aaC740DINqY+ZGaRwjPD/RNiGg
|
||||
iD90xDn2it0YMOw1qe/tg8EKNe45PXDKUARc3tL8vYVmzSXLkUMwjJeZMRR3LcUWeFLFrctOXnc3
|
||||
EFFp8r2WDssdGbgI1qHp4lGykbHH/yE0f3g+eBWv7etogmmOVqwoCp9+rYn6LbyW6aNY8Gcv77ak
|
||||
DuSaJwiGkkxaCtb3CnCj6i+YVn55DVBLFEgfGBL7/yVtCSfcNYYAgjFa3cEz35pwtLQ47R5c+wwD
|
||||
VQ47fVL1VdWjQ2HHkbmhUq9OgkjdadLRuqrX2u64ZcO69sP2uQAjhYdd62rR4A8L6mF4dQ/99kTE
|
||||
3x9ivIhQkBXh6hzBIdDDx0OcWS/Ia7DsM2QXYRtgfE0tgRmflxWjSVGuCUUHE/ZL+7h/fCeylAxz
|
||||
QtDdGTG8gi/RhIyXdgfQXUGwOyKl7EgRYenhH0wQngc6PsZKE6vQNyV7CFESRbgReQJ4bmCEuiDW
|
||||
/mJmiy3rAhZHfq8Sz9+jj44zTzqf+2ZZ8tDze4gyZw==
|
||||
AcLBXAQAAQoABgUCZiZYsgAKCRDgT5vottzAEir/EACXgxl3zMAplZZDP33gyk7dENrDD3VaindS
|
||||
sL91VFtNzrDQiK0ovuPUTuxg4N0XqDcGxIxBQUDggHA36n4+B+EP68Uu4kTS8PzJAeVfK2NzpleL
|
||||
1tgXjGCvb2JmRZIZozJ8x3DVIMeBByPcEKv+nULhnAcOIpZfBvbv/fs/pF5QKqsWQIlMPk23X5aF
|
||||
ZmcaOAT8S+d73i/SWJxAEjcS9SeKf+iHxDQ6niuOhGgM20+hvCiWT0YLefG9fYsu5FjNaT0o9p0Y
|
||||
hbYKb0SaILWrXrip209yciweVgUfRBDqYMnGWVojjW+dpS/IqLYvFL0y0hm5gQI4QmALXY+9p3Qc
|
||||
97YCbPsj0rOSGcPDUkLKu+vkVdIkIsYg44QMtJEhGs9dBBj5nt7welli5sjuQBUzRECWOlH1dJgd
|
||||
7PJi9Hl/6X3/CNUruK5t342B70BJ1IWp49dIKf9zfSvoJzDiBlRx6pl6/F54XU4Xef4Nl7+2Cc7z
|
||||
45FpV16tft9KhufXKksvTIaHDEWY5E4fbAL4YjCEf5TD2JZDI16cc8lrrGKO1R+hWjA943JgK1Ac
|
||||
kio/LUlP0oYPq9hxzdRQq4vynRt+MYro+/0yNzaX3IBODQ+7uX3KIakbaI6y/d6nCz8Z94PoJC2/
|
||||
9OnsJlX1QIsavtl5ct0Buqzk8AdLFwCHGM8xlT81Jw==
|
||||
EOF
|
||||
|
||||
channel=""
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user