summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-02-21 13:32:31 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 10:43:06 +0000
commit5397a7acd8137103faef197983c4bdcba5d0d467 (patch)
tree885021c29b93ecc37ed13d1a36dee17173c8d604 /meta/classes
parent2d74ea28010712547f81d200c2957e05779ef3bd (diff)
downloadpoky-5397a7acd8137103faef197983c4bdcba5d0d467.tar.gz
populate_sdk_ext.bbclass: Fix the derivate sdk build error from an published eSDK
When you install the eSDK in publish mode and then try to build a derivative sdk using devtool build-sdk, the following error happens | NOTE: Generating sstate task list... | NOTE: Generating sstate-cache... | NOTE: Generating sstate-cache... | DEBUG: Python function copy_buildsystem finished | NOTE: Executing install_tools ... | DEBUG: Executing shell function install_tools | install: cannot stat /core/meta/files/ext-sdk-prepare.py': No such file or directory This patch will fix the error by installing ext-sdk-prepare.py in publish mode, so that derivative sdk can be generated. (From OE-Core rev: aab4089a57a655ca5a7792f05eb5d8dcdb934ae1) Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 40b0375e0b..800e1175d7 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -589,11 +589,8 @@ sdk_ext_preinst() {
589 exit 1 589 exit 1
590 fi 590 fi
591 SDK_EXTENSIBLE="1" 591 SDK_EXTENSIBLE="1"
592 if [ "$publish" = "1" ] ; then 592 if [ "$publish" = "1" ] && [ "${SDK_EXT_TYPE}" = "minimal" ] ; then
593 EXTRA_TAR_OPTIONS="$EXTRA_TAR_OPTIONS --exclude=ext-sdk-prepare.py" 593 EXTRA_TAR_OPTIONS="$EXTRA_TAR_OPTIONS --exclude=sstate-cache"
594 if [ "${SDK_EXT_TYPE}" = "minimal" ] ; then
595 EXTRA_TAR_OPTIONS="$EXTRA_TAR_OPTIONS --exclude=sstate-cache"
596 fi
597 fi 594 fi
598} 595}
599SDK_PRE_INSTALL_COMMAND_task-populate-sdk-ext = "${sdk_ext_preinst}" 596SDK_PRE_INSTALL_COMMAND_task-populate-sdk-ext = "${sdk_ext_preinst}"
@@ -635,6 +632,8 @@ sdk_ext_postinst() {
635 # sourcing a script. That is why this has to look so ugly. 632 # sourcing a script. That is why this has to look so ugly.
636 LOGFILE="$target_sdk_dir/preparing_build_system.log" 633 LOGFILE="$target_sdk_dir/preparing_build_system.log"
637 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 ; } 634 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 ; }
635 fi
636 if [ -e $target_sdk_dir/ext-sdk-prepare.py ]; then
638 rm $target_sdk_dir/ext-sdk-prepare.py 637 rm $target_sdk_dir/ext-sdk-prepare.py
639 fi 638 fi
640 echo done 639 echo done