Turn WSL into an independent image

separate from CPC's so it can be managed independently and turned into
the new format, as done with Jammy and later.
This commit is contained in:
Carlos Nihelton 2025-06-27 17:30:09 -03:00 committed by Carlos Nihelton
parent beb2bf1565
commit 4ec56b975b
No known key found for this signature in database
GPG Key ID: B5A3E4BCA4EE69AB
2 changed files with 17 additions and 5 deletions

View File

@ -154,7 +154,7 @@ Expire-Date: 0
lb bootstrap "$@" lb bootstrap "$@"
case $PROJECT:${SUBPROJECT:-} in case $PROJECT:${SUBPROJECT:-} in
ubuntu-server:*|ubuntu-cpc:*|ubuntu:desktop-preinstalled) ubuntu-server:*|ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
# Set locale to C.UTF-8 by default. We should # Set locale to C.UTF-8 by default. We should
# probably do this for all images early in the # probably do this for all images early in the
# 18.10 cycle but for now just do it for # 18.10 cycle but for now just do it for

View File

@ -278,7 +278,7 @@ _get_live_passes ()
if [ -z "${IMAGEFORMAT:-}" ]; then if [ -z "${IMAGEFORMAT:-}" ]; then
case $PROJECT:${SUBPROJECT:-} in case $PROJECT:${SUBPROJECT:-} in
ubuntu-cpc:*|ubuntu:desktop-preinstalled) ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
case $SUBARCH in case $SUBARCH in
raspi|imx6|intel-iot) raspi|imx6|intel-iot)
IMAGEFORMAT=ubuntu-image IMAGEFORMAT=ubuntu-image
@ -472,6 +472,8 @@ case $IMAGEFORMAT in
case $PROJECT in case $PROJECT in
ubuntu-server) ubuntu-server)
;; ;;
ubuntu-wsl)
;;
ubuntu) ubuntu)
if [ "$SUBPROJECT" != "canary" ]; then if [ "$SUBPROJECT" != "canary" ]; then
add_package live lupin-casper add_package live lupin-casper
@ -508,7 +510,7 @@ if [ "$PREINSTALLED" = "true" ]; then
ubuntu-server) ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf add_package live oem-config-debconf ubiquity-frontend-debconf
;; ;;
ubuntu-core|ubuntu-base|ubuntu-oci|base|ubuntu-cpc) ubuntu-core|ubuntu-base|ubuntu-oci|base|ubuntu-cpc|ubuntu-wsl)
;; ;;
ubuntu) ubuntu)
add_package live oem-config-gtk ubiquity-frontend-gtk add_package live oem-config-gtk ubiquity-frontend-gtk
@ -815,6 +817,13 @@ case $PROJECT in
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;; ;;
ubuntu-wsl)
add_task install minimal standard ubuntu-wsl
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false
;;
ubuntu-cpc) ubuntu-cpc)
KERNEL_FLAVOURS=virtual KERNEL_FLAVOURS=virtual
@ -904,6 +913,9 @@ case $PROJECT:${SUBPROJECT:-} in
ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*)
BASE_SEED='desktop' BASE_SEED='desktop'
;; ;;
ubuntu-wsl:*)
BASE_SEED='wsl'
;;
ubuntu-cpc:*) ubuntu-cpc:*)
BASE_SEED='server' BASE_SEED='server'
;; ;;
@ -1064,7 +1076,7 @@ echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary
case $PROJECT in case $PROJECT in
ubuntu-cpc|ubuntu-core|ubuntu-base|ubuntu-oci|base) ubuntu-cpc|ubuntu-core|ubuntu-base|ubuntu-oci|base|ubuntu-wsl)
# ubuntu-cpc gets this added in 025-create-groups.chroot, and we do # ubuntu-cpc gets this added in 025-create-groups.chroot, and we do
# not want this group in projects that are effectively just chroots # not want this group in projects that are effectively just chroots
;; ;;
@ -1243,7 +1255,7 @@ EOF
fi fi
;; ;;
ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled) ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
# 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