[Merge] ~medicalwei/livecd-rootfs:feat/oem-extra into livecd-rootfs:ubuntu/master

[Yao Wei]

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index 1e45816..8e7a072 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -1547,6 +1570,22 @@ EOF
>  			rm -f config/hooks/*.binary*
>  		fi
>  		;;
> +
> +	ubuntu:oem-*)
> +		# Ensure that most things e.g. includes.chroot are copied as is
> +		for entry in /usr/share/livecd-rootfs/live-build/ubuntu-oem/${SUBPROJECT}/*; do

The part that is similar between oem and cpc is that we probably need to make some of the image customizations private so that 1) we don't need to SRU in order to make changes, and 2) to include additional files like wallpapers, pdf, etc. supplied by our clients, which aren't public.

cpc includes sauces by using git recipe and that indeed inspires me to make changes like that, but I was not sure whether to include make-hooks.

I will attempt to reuse make-hooks, although I am not sure whether it is preferred to tell different OEMs by using IMAGE_TARGETS variable.

> +			case $entry in
> +				*hooks*)
> +					# But hooks are shared across the projects with symlinks
> +					# dereference them
> +					cp -afL $entry config/
> +					;;
> +				*)
> +					# Most places want to preserve symlinks as is
> +					cp -af $entry config/
> +					;;
> +			esac
> +		done
>  esac
>  
>  case $SUBPROJECT in


-- 
https://code.launchpad.net/~medicalwei/livecd-rootfs/+git/livecd-rootfs/+merge/444895
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~medicalwei/livecd-rootfs:feat/oem-extra into livecd-rootfs:ubuntu/master.