[Merge] lp:~ubuntu-mate-dev/livecd-rootfs/livecd-rootfs-ubuntu-mate into lp:livecd-rootfs

[Mathieu Trudel-Lapierre]

Review: Needs Fixing

I've included two comments below. Those are largely nitpicks, but it means there is some room to make it a bit simpler.

Could you please make and test the proposed changes, or let me know if it's something you've already done that doesn't work properly? Feel free to come to me on IRC (cyphermox) if you want to further discuss this. Thanks!

Diff comments:

> === modified file 'live-build/auto/config'
> --- live-build/auto/config	2014-12-04 13:09:23 +0000
> +++ live-build/auto/config	2014-12-11 14:48:17 +0000
> @@ -149,6 +149,10 @@
>  			add_package live oem-config-gtk ubiquity-frontend-gtk
>  			add_package live ubiquity-slideshow-xubuntu
>  			;;
> +                ubuntu-mate)
> +			add_package live oem-config-gtk ubiquity-frontend-gtk
> +			add_package live ubiquity-slideshow-ubuntu-mate
> +                        ;;
>  		ubuntu-server)
>  			add_package live oem-config-debconf ubiquity-frontend-debconf
>  			;;
> @@ -306,6 +310,20 @@
>  		COMPONENTS='main restricted universe'
>  		;;
>  
> +	ubuntu-mate)
> +		add_task install minimal standard
> +		add_package install ubuntu-mate-core ubuntu-mate-desktop

I think here you should be able to get away with just "add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop".

However, this leads me to wonder if there isn't a bug in the seed: on ubuntu, desktop depends on desktop-common in both the Task-Seeds: field in the desktop seed itself and in the STRUCTURE. However, for MATE it looks like the seed STRUCTURE has desktop depend on core, which then depends on desktop-common (which is fine); but the Task-Seeds: field in MATE's desktop seed still mentions desktop-common. We should verify the output of germinate closely, as if there is a problem there we could possibly further elimite ubuntu-mate-core from the list of tasks here.

> +		add_package live ubuntu-mate-live
> +		LIVE_TASK='ubuntu-mate-live'

I think you only need LIVE_TASK here. There's an if further down that will do 'add_task live "$LIVE_TASK"' for you; so you would not need to also add_package live ubuntu-mate-live.

> +		case $ARCH in
> +			amd64)	add_package live linux-signed-generic ;;
> +		esac
> +		COMPONENTS='main restricted universe multiverse'
> +		# The Ubuntu MATE STRUCTURE file has "feature
> +		# no-follow-recommends".  Mirror this.
> +		export APT_OPTIONS="--yes --no-install-recommends"
> +		;;
> +
>  	ubuntustudio-dvd)
>  		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
>  		COMPONENTS='main restricted universe multiverse'
> 


-- 
https://code.launchpad.net/~ubuntu-mate-dev/livecd-rootfs/livecd-rootfs-ubuntu-mate/+merge/244446
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~ubuntu-mate-dev/livecd-rootfs/livecd-rootfs-ubuntu-mate into lp:livecd-rootfs.