mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-06-09 09:02:11 +00:00
Merge branch 'canary-as-default' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master
This commit is contained in:
commit
e38264ca7a
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
|||||||
|
livecd-rootfs (23.10.32) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* Make the hybrid canary images the default for Ubuntu.
|
||||||
|
|
||||||
|
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 06 Sep 2023 18:21:34 +0200
|
||||||
|
|
||||||
livecd-rootfs (23.10.31) mantic; urgency=medium
|
livecd-rootfs (23.10.31) mantic; urgency=medium
|
||||||
|
|
||||||
* blkid is unreliable in mount_image(), but this blkid call is only here
|
* blkid is unreliable in mount_image(), but this blkid call is only here
|
||||||
|
@ -721,7 +721,7 @@ case $PROJECT in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
canary)
|
*)
|
||||||
touch config/universe-enabled
|
touch config/universe-enabled
|
||||||
PASSES_TO_LAYERS="true"
|
PASSES_TO_LAYERS="true"
|
||||||
KERNEL_FLAVOURS='generic-hwe-22.04'
|
KERNEL_FLAVOURS='generic-hwe-22.04'
|
||||||
@ -765,32 +765,6 @@ case $PROJECT in
|
|||||||
/usr/share/livecd-rootfs/checkout-translations-branch \
|
/usr/share/livecd-rootfs/checkout-translations-branch \
|
||||||
https://git.launchpad.net/subiquity po config/catalog-translations
|
https://git.launchpad.net/subiquity po config/catalog-translations
|
||||||
;;
|
;;
|
||||||
*)
|
|
||||||
touch config/universe-enabled
|
|
||||||
PASSES_TO_LAYERS="true"
|
|
||||||
KERNEL_FLAVOURS='generic-hwe-22.04'
|
|
||||||
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
|
|
||||||
add_task standard.live ubuntu-live
|
|
||||||
add_package standard cloud-init
|
|
||||||
remove_package standard.live ubiquity-frontend-gtk
|
|
||||||
add_snap standard.live ubuntu-desktop-installer/classic
|
|
||||||
|
|
||||||
seeded_langs="$(get_seeded_languages desktop)"
|
|
||||||
echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
|
|
||||||
derive_language_layers standard desktop desktop-default-languages "$seeded_langs"
|
|
||||||
cat <<-EOF > config/standard.catalog-in.yaml
|
|
||||||
name: "Ubuntu Desktop"
|
|
||||||
description: >-
|
|
||||||
Ubuntu Desktop.
|
|
||||||
id: ubuntu-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
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -1552,7 +1526,7 @@ EOF
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
||||||
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:canary|ubuntu-oem:*)
|
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*)
|
||||||
# Ensure that most things e.g. includes.chroot are copied as is
|
# Ensure that most things e.g. includes.chroot are copied as is
|
||||||
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
||||||
case $entry in
|
case $entry in
|
||||||
|
@ -10,8 +10,8 @@ case $ARCH in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
case ${PROJECT:-}:${SUBPROJECT:-} in
|
case ${PROJECT:-}:${SUBPROJECT:-} in
|
||||||
*:canary)
|
ubuntu:)
|
||||||
echo "We don't create EFI images for canary."
|
echo "We don't create EFI images for Ubuntu Desktop."
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
ubuntu)
|
ubuntu)
|
||||||
|
@ -10,14 +10,10 @@ case ${PASS:-} in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case ${SUBPROJECT:-} in
|
if [ -n "${SUBPROJECT:-}" ]; then
|
||||||
canary)
|
echo "We don't run Ubuntu Desktop hooks for this project."
|
||||||
;;
|
exit 0
|
||||||
*)
|
fi
|
||||||
echo "We don't run canary hooks for this project."
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
. config/binary
|
. config/binary
|
||||||
. config/functions
|
. config/functions
|
@ -3,7 +3,7 @@
|
|||||||
echo "Creating Hyper-V image with Desktop..."
|
echo "Creating Hyper-V image with Desktop..."
|
||||||
|
|
||||||
case ${SUBPROJECT:-} in
|
case ${SUBPROJECT:-} in
|
||||||
minimized|canary)
|
minimized|"")
|
||||||
echo "We don't create minimized images for $0."
|
echo "We don't create minimized images for $0."
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user