[Merge] livecd-rootfs:canary-build into livecd-rootfs:ubuntu/master

Dan Bungert mp+440431 at code.launchpad.net
Wed Apr 5 19:19:12 UTC 2023


Sending first wave of questions while I continue reading.

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index db1da0d..b582e3c 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -731,6 +738,59 @@ case $PROJECT in
>  						;;
>  				esac
>  				;;
> +			canary)

the desktop build is doing `touch config/universe-enabled`, is that desired?

> +				PASSES_TO_LAYERS="true"
> +				# the minimal layer, for minimal installs
> +				add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
> +				add_package minimal cloud-init
> +				# the standard layer, contains all base common packages for later layers (we're splitting out the snaps)
> +				add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages

```
add_task minimal.standard.live ubuntu-live                                                                    
add_snap minimal.standard.live ubuntu-desktop-installer/classic                                               
```
?

> +				# the classic layer, basically only contains snaps from the standard tasks
> +				add_pass minimal.standard.classic
> +				mv config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full \
> +					config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full
> +				# the live layer, contains all packages for the live session installer
> +				# TODO: we should probably add the kernel per KERNEL_FLAVOURS

I think so.  Start with `KERNEL_FLAVOURS='generic-hwe-22.04' like below?

> +				add_package minimal.standard.live linux-generic casper lvm2 mdadm
> +				remove_package minimal.standard.live ubiquity-frontend-gtk
> +				# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
> +				add_package minimal.standard.enhanced-secureboot cryptsetup
> +				# now let's create the neccessary catalog files
> +				cat <<-EOF > config/minimal.catalog-in.yaml
> +					name: "Ubuntu Desktop (minimized)"
> +					description: >-
> +					  A minimal but usable Ubuntu Desktop.
> +					id: ubuntu-desktop-minimal
> +					type: fsimage-layered
> +					variant: desktop
> +					locale_support: langpack
> +				EOF
> +				cat <<-EOF > config/minimal.standard.catalog-in.yaml
> +					name: "Ubuntu Desktop"
> +					description: >-
> +					  A full featured Ubuntu Desktop.
> +					id: ubuntu-desktop
> +					type: fsimage-layered
> +					variant: desktop
> +					locale_support: langpack
> +					default: yes
> +				EOF
> +				cat <<-EOF > config/minimal.standard.classic.catalog-in.yaml
> +					id: ubuntu-desktop
> +					variations:
> +					  classic:
> +					    path: minimal.standard.squashfs
> +				EOF
> +				cat <<-EOF > config/minimal.standard.enhanced-secureboot.catalog-in.yaml
> +					id: ubuntu-desktop
> +					variations:
> +					  enhanced-secureboot:
> +					    path: minimal.standard.enhanced-secureboot.squashfs
> +					    snapd_system_label: enhanced-secureboot-desktop
> +				EOF
> +				/usr/share/livecd-rootfs/checkout-translations-branch \
> +					https://git.launchpad.net/subiquity po config/catalog-translations
> +				;;
>  			*)
>  				touch config/universe-enabled
>  				PASSES_TO_LAYERS="true"


-- 
https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+merge/440431
Your team Ubuntu Core Development Team is requested to review the proposed merge of livecd-rootfs:canary-build into livecd-rootfs:ubuntu/master.




More information about the Ubuntu-reviews mailing list