[Merge] lp:~rcj/livecd-rootfs/trusty-proposed_ubuntu-cpc into lp:~ubuntu-core-dev/livecd-rootfs/trusty-proposed

[Mathieu Trudel-Lapierre]

Review: Needs Fixing

For the most part, aside from sources.list updates this is straightforward addition of the ubuntu-cpc project and the related corner-cases. Please make sure to add an entry about the 'virtual' case for kernels.

Diff comments:

> 
> === modified file 'live-build/auto/build'
> --- live-build/auto/build	2015-02-02 13:21:03 +0000
> +++ live-build/auto/build	2017-05-26 15:14:52 +0000
> @@ -329,6 +275,10 @@
>  		continue
>  	fi
>  	FLAVOUR=${FLAVOUR%%-lts-*}
> +	if [ "$FLAVOUR" = "virtual" ]; then
> +		# The virtual kernel is named generic in /boot
> +		FLAVOUR="generic"
> +	fi

This doesn't appear to be listed in changelog... All changes should be.

>  	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
>  	if [ -z "$KVERS" ]; then
>  		if [ -e "binary/$INITFS/vmlinuz" ]; then


-- 
https://code.launchpad.net/~rcj/livecd-rootfs/trusty-proposed_ubuntu-cpc/+merge/324682
Your team Ubuntu Core Development Team is subscribed to branch lp:~ubuntu-core-dev/livecd-rootfs/trusty-proposed.