Drop use of 'laptop' for x13s as this is now migrated to generic.

This commit is contained in:
Steve Langasek 2024-04-08 21:35:43 -07:00
parent aed3f70b29
commit fa8046aab8
3 changed files with 6 additions and 6 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (24.04.60) UNRELEASED; urgency=medium
* Drop use of 'laptop' for x13s as this is now migrated to generic.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 08 Apr 2024 21:35:27 -0700
livecd-rootfs (24.04.59) noble; urgency=medium
[ Catherine Redfield ]

View File

@ -587,9 +587,6 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
oem-*)
FLAVOUR="oem"
;;
laptop-*)
FLAVOUR="laptop"
;;
image-intel)
FLAVOUR="intel"
;;

View File

@ -685,9 +685,6 @@ case $PROJECT in
*)
touch config/universe-enabled
KERNEL_FLAVOURS='generic-hwe-24.04'
if [ "$SUBARCH" = "x13s" ]; then
KERNEL_FLAVOURS='laptop-23.10'
fi
PASSES_TO_LAYERS="true"
# the minimal layer, for minimal installs
add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages