[OE-core] [PATCH 1/8] populate_sdk_ext.bbclass: install multilib targets as populate_sdk does

[Robert Yang]

On 12/13/2016 12:55 PM, Paul Eggleton wrote:
> Hi Robert,
>
> There are a bunch of changes in here that don't relate to the multilib fix -
> details below.

Thanks, I will split them into two commits.

>
> On Wed, 16 Nov 2016 22:19:30 Robert Yang wrote:
>> Fixed:
>> MACHINE = "qemux86-64"
>> require conf/multilib.conf
>> MULTILIBS = "multilib:lib32"
>> DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
>>
>> $ bitbake core-image-minimal -cpopulate_sdk_ext
>> [snip]
>> Testing
>> /buildarea/lyang1/test_po/tmp/work/qemux86_64-poky-linux/core-image-minimal
>> /1.0-r0/testsdkext//tc/environment-setup-x86-pokymllib32-linux test_cvs
>> (oeqa.sdk.buildcvs.BuildCvsTest) ... FAIL
>> [snip]
>>
>> It was failed because no lib32 toolchains.
>>
>> The fixes include:
>> * Set SDK_TARGETS correctly
>> * Return multilib depends in get_ext_sdk_depends()
>> * Write information to all environment-setup-* scripts.
>>
>> [YOCTO #10647]
>>
>> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
>> ---
>>  meta/classes/populate_sdk_ext.bbclass | 61
>> ++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 23
>> deletions(-)
>>
>> diff --git a/meta/classes/populate_sdk_ext.bbclass
>> b/meta/classes/populate_sdk_ext.bbclass index 26b5ca6..ce9c40a 100644
>> --- a/meta/classes/populate_sdk_ext.bbclass
>> +++ b/meta/classes/populate_sdk_ext.bbclass
>> @@ -39,7 +39,7 @@ SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \
>>  SDK_INHERIT_BLACKLIST ?= "buildhistory icecc"
>>  SDK_UPDATE_URL ?= ""
>>
>> -SDK_TARGETS ?= "${PN}"
>> +SDK_TARGETS ?= "${@multilib_pkg_extend(d, d.getVar('BPN', True))}"
>>
>>  def get_sdk_install_targets(d, images_only=False):
>>      sdk_install_targets = ''
>> @@ -562,38 +562,52 @@ SDK_PRE_INSTALL_COMMAND_task-populate-sdk-ext =
>> "${sdk_ext_preinst}" sdk_ext_postinst() {
>>  	printf "\nExtracting buildtools...\n"
>>  	cd $target_sdk_dir
>> -	env_setup_script="$target_sdk_dir/environment-
> setup-${REAL_MULTIMACH_TARGE
>> T_SYS}" -	printf "buildtools\ny" | ./${SDK_BUILDTOOLS_INSTALLER} >
>> buildtools.log || { printf 'ERROR: buildtools installation failed:\n' ; cat
>> buildtools.log ; echo "printf 'ERROR: this SDK was not fully installed and
>> needs reinstalling\n'" >> $env_setup_script ; exit 1 ; }
>> +	env_setup_scripts="`ls $target_sdk_dir/environment-setup-*`"
>> +	./${SDK_BUILDTOOLS_INSTALLER} -d buildtools -y > buildtools.log
>> +	if [ $? -ne 0 ]; then
>> +		echo 'ERROR: buildtools installation failed:'
>> +		cat buildtools.log
>> +		for e in $env_setup_scripts; do
>> +			echo "echo 'ERROR: this SDK was not fully installed and needs
>> reinstalling'" >> $e +		done
>> +		exit 1
>> +	fi
>>
>
> This change isn't entirely related to the multilib changes.
>
>>  	# Delete the buildtools tar file since it won't be used again
>>  	rm -f ./${SDK_BUILDTOOLS_INSTALLER}
>>  	# We don't need the log either since it succeeded
>>  	rm -f buildtools.log
>>
>> -	# Make sure when the user sets up the environment, they also get
>> -	# the buildtools-tarball tools in their path.
>> -	echo ". $target_sdk_dir/buildtools/environment-setup*" >>
>> $env_setup_script -
>> -	# Allow bitbake environment setup to be ran as part of this sdk.
>> -	echo "export OE_SKIP_SDK_CHECK=1" >> $env_setup_script
>> +	for e in $env_setup_scripts; do
>> +		# Make sure when the user sets up the environment, they also get
>> +		# the buildtools-tarball tools in their path.
>> +		echo ". $target_sdk_dir/buildtools/environment-setup*" >> $e
>>
>> -	# A bit of another hack, but we need this in the path only for devtool
>> -	# so put it at the end of $PATH.
>> -	echo "export
>> PATH=$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH" >>
>> $env_setup_script +		# Allow bitbake environment setup to be ran as part
> of
>> this sdk. +		echo "export OE_SKIP_SDK_CHECK=1" >> $e
>>
>> -	echo "printf 'SDK environment now set up; additionally you may now run
>> devtool to perform development tasks.\nRun devtool --help for further
>> details.\n'" >> $env_setup_script -
>> -	# Warn if trying to use external bitbake and the ext SDK together
>> -	echo "(which bitbake > /dev/null 2>&1 && echo 'WARNING: attempting to use
>> the extensible SDK in an environment set up to run bitbake - this may lead
>> to unexpected results. Please source this script in a new shell session
>> instead.') || true" >> $env_setup_script +		# A bit of another hack, but
> we
>> need this in the path only for devtool +		# so put it at the end of
> $PATH.
>> +		echo "export
>> PATH=$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH" >> $e
>> +		echo "printf 'SDK environment now set up; additionally you may now
> run
>> devtool to perform development tasks.\nRun devtool --help for further
>> details.\n'" >> $e +		# Warn if trying to use external bitbake and the
> ext
>> SDK together +		echo "(which bitbake > /dev/null 2>&1 && echo 'WARNING:
>> attempting to use the extensible SDK in an environment set up to run
>> bitbake - this may lead to unexpected results. Please source this script in
>> a new shell session instead.') || true" >> $e +	done
>>
>>  	if [ "$prepare_buildsystem" != "no" ]; then
>> -		printf "Preparing build system...\n"
>> +		echo "Preparing build system..."
>
> Why did you change this?

We don't need complex format here, so so echo is simpler ?

// Robert

>
>>  		# dash which is /bin/sh on Ubuntu will not preserve the
>>  		# current working directory when first ran, nor will it set $1 when
>>  		# sourcing a script. That is why this has to look so ugly.
>>  		LOGFILE="$target_sdk_dir/preparing_build_system.log"
>> -		sh -c ". buildtools/environment-setup* > $LOGFILE && cd
>> $target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir
>> && . $target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE
>> && python $target_sdk_dir/ext-sdk-prepare.py $LOGFILE
>> '${SDK_INSTALL_TARGETS}'" || { echo "printf 'ERROR: this SDK was not fully
>> installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; }
>> -		rm $target_sdk_dir/ext-sdk-prepare.py
>> +		sh -c ". buildtools/environment-setup* > $LOGFILE && cd
>> $target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir
>> && . $target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE
>> && python $target_sdk_dir/ext-sdk-prepare.py $LOGFILE
>> '${SDK_INSTALL_TARGETS}'" +		if [ $? -ne 0 ]; then
>> +			for e in $env_setup_scripts; do
>> +				echo "echo 'ERROR: this SDK was not fully installed and needs
>> reinstalling'" >> $e +			done
>> +			exit 1
>> +		fi
>> +		rm -f $target_sdk_dir/ext-sdk-prepare.py
>
> That last line is also unrelated.
>
> Cheers,
> Paul
>