Review: Needs Fixing
Diff comments:
> diff --git a/debian/changelog b/debian/changelog
> index ef3b50f..579a7e6 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +livecd-rootfs (24.04.36) noble; urgency=medium
> +
> + * live-build/buildd/hooks/00-mirror.binary: Patch all sources files
> +
> + -- Julian Andres Klode <juli...@ubuntu.com> Fri, 16 Feb 2024 22:04:07 +0100
> +
This doesn't look like it belongs to your change?
> livecd-rootfs (24.04.35) noble; urgency=medium
>
> [ Steve Langasek ]
> diff --git a/live-build/auto/config b/live-build/auto/config
> index 1f8e950..1ad9ffe 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -880,15 +880,53 @@ case $PROJECT in
> ;;
>
> xubuntu)
> + # Xubuntu now ships the new installer.
> + touch config/universe-enabled
> + PASSES_TO_LAYERS="true"
> + KERNEL_FLAVOURS=generic
> case ${SUBPROJECT:-} in
> minimal)
> - add_task install minimal standard
> xubuntu-minimal
> + add_task minimal minimal standard
> xubuntu-minimal
> + add_task minimal.standard xubuntu-minimal
This is creating two layers, one called minimal and one called
minimal.standard, both containing the xubuntu-minimal task. You shouldn't need
multiple layers on the minimal image (except the live layer on top of minimal).
That way around would also reduce code duplication overall between the two
images here. Both images could have a common "minimal" layer definition with a
common catalog (why call it "xubuntu minimal" in one but "xubuntu desktop
(minimized)" in the other?) And a small bit of code to set a variable saying
which layer live is built on top of.
> + cat <<-EOF >
> config/minimal.standard.catalog-in.yaml
> + name: "Xubuntu Minimal"
> + description: >-
> + A minimal installation of the Xubuntu
> Desktop.
> + id: xubuntu-minimal
> + type: fsimage-layered
> + variant: desktop
> + locale_support: langpack
> + default: yes
> + EOF
> ;;
> *)
> - add_task install minimal standard
> xubuntu-desktop
> + add_task minimal minimal standard
> xubuntu-desktop
> + add_task minimal.standard xubuntu-desktop
> + cat <<-EOF > config/minimal.catalog-in.yaml
> + name: "Xubuntu Desktop (minimized)"
> + description: >-
> + A minimal installation of the Xubuntu
> Desktop.
> + id: xubuntu-desktop-minimal
> + type: fsimage-layered
> + variant: desktop
> + locale_support: langpack
> + EOF
> + cat <<-EOF >
> config/minimal.standard.catalog-in.yaml
> + name: "Xubuntu Desktop"
> + description: >-
> + A full featured Xubuntu Desktop.
> + id: xubuntu-desktop
> + type: fsimage-layered
> + variant: desktop
> + locale_support: langpack
> + default: yes
> + EOF
> ;;
> esac
> - LIVE_TASK='xubuntu-live'
> + add_task minimal.standard.live xubuntu-live
> + add_package minimal.standard.live linux-$KERNEL_FLAVOURS
> + /usr/share/livecd-rootfs/checkout-translations-branch \
> + https://git.launchpad.net/subiquity po
> config/catalog-translations
> ;;
>
> ubuntu-budgie)
--
https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/+git/livecd-rootfs/+merge/460722
Your team Xubuntu Developers is subscribed to branch
~xubuntu-dev/livecd-rootfs:xubuntu-new-installer.
_______________________________________________
Mailing list: https://launchpad.net/~xubuntu-dev
Post to : xubuntu-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~xubuntu-dev
More help : https://help.launchpad.net/ListHelp
