[Merge] ~itrue/livecd-rootfs:add-nemos-support-v2 into livecd-rootfs:ubuntu/master

[Łukasz Zemczak]

Review: Needs Fixing

I didn't have time to take a look at the whole changes yet, since I concentrated on why SUITE is not set. And... I see the problem. What is happening here is that basically, because of some missing changes, auto/config is called *twice* now.

Please check my inline comment to see the exact line, but basically this branch is missing a `mkdir -p .build; touch .build/config` at the end of the kiwi case in auto/config. We go `exit 0`, but we need to tell live-build: hey, we finished the configure state. For this we need to have a .build/config state file. See that this is done above in the ubuntu-image IMAGEFORMAT case.

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index db1da0d..9ce6e8d 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -548,6 +596,42 @@ case $IMAGEFORMAT in
>  		exit 0
>  		;;
>  
> +	kiwi)
> +		if [ -z "${KIWI_PLATFORM}" ]; then
> +			echo "KIWI_PLATFORM must be set when IMAGEFORMAT=kiwi"
> +			exit 1
> +		fi
> +
> +		if [ -z "${KIWI_PROJECT}" ]; then
> +			echo "KIWI_PROJECT must be set when IMAGEFORMAT=kiwi"
> +			exit 1
> +		fi
> +
> +		if [ -z "${SUITE}" ]; then

...this won't be needed after the changes outlined below.

> +			SUITE=$(lsb_release -c -s)
> +			echo "SUITE not set; defaulting to ${SUITE}"
> +		fi
> +
> +		if [ -z "${KIWI_ROOT}" ]; then
> +			KIWI_ROOT="/usr/share/kiwi/${PROJECT}"
> +		fi
> +
> +		echo "KIWI_PLATFORM=\"${KIWI_PLATFORM}\"" >> config/common
> +		echo "KIWI_PROFILE=\"${KIWI_PROFILE:-}\"" >> config/common
> +		echo "KIWI_PROJECT=\"${KIWI_PROJECT}-${SUITE}\"" >> config/common
> +		echo "KIWI_ROOT=\"${KIWI_ROOT}\"" >> config/common
> +		echo "IMAGEFORMAT=\"${IMAGEFORMAT}\"" >> config/common
> +
> +		echo "Kiwi configuration:"
> +		echo "  Platform:      ${KIWI_PLATFORM}"
> +		echo "  Project:       ${KIWI_PROJECT}"
> +		echo "  Project root:  ${KIWI_ROOT}"
> +		echo "  Build profile: ${KIWI_PROFILE:-none}"
> +
> +		# No further configuration needed
> +		exit 0
> +		;;

Please see the main comment, but this needs a:

mkdir -p .build
touch .build/config
exit 0
;;

Instead of what we have right now.

> +
>  	none)
>  		# Currently the IMAGEFORMAT none format is used only for ubuntu-image
>  		# targeted image builds which, currently, only target physical devices.


-- 
https://code.launchpad.net/~itrue/livecd-rootfs/+git/livecd-rootfs/+merge/440477
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.