From 6aa852dccd37e436a92bb1028d8be0eb1ae364be Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 10 Feb 2020 15:56:50 +0100 Subject: [PATCH] sdk: remove image name from default SDK path Some configuration files inside of the SDK make use of the default SDK installation path, so some tools might break unless the SDK is installed in said default path. Recently, we modified the default installation path to include the platform and the image type, but the image type was added after the SDK was created, so even though the environment script's paths include the image type, the "original" default path in the config files inside of the SDK doesn't include the image type. A side effect of this is that Qt5 apps cannot be built, since the qmake and Qt configuration files are pointing to the "original" SDK path. Remove the image type from the path so that the paths in the SDK's config files match the real default installation path. This partially reverts commit be0fe088e39a97c7dbbba62851555b17d970df79. https://jira.digi.com/browse/DEL-6972 Signed-off-by: Gabriel Valcazar --- meta-digi-dey/classes/dey-image.bbclass | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/meta-digi-dey/classes/dey-image.bbclass b/meta-digi-dey/classes/dey-image.bbclass index 04690e451..a7679ca67 100644 --- a/meta-digi-dey/classes/dey-image.bbclass +++ b/meta-digi-dey/classes/dey-image.bbclass @@ -34,18 +34,15 @@ DEY_IMAGE_INSTALLER ?= "0" inherit ${@oe.utils.conditional("DEY_IMAGE_INSTALLER", "1", "dey-image-installer", "", d)} # -# Create a dey-version file when populating the toolchain/SDK and modify the -# default SDK installation path so it includes the proper 'IMAGE_BASENAME' -# value. +# Create a dey-version file when populating the toolchain/SDK # # 'SDK_POSTPROCESS_COMMAND' variable is originally defined in populate_sdk_base # class: poky/meta/classes/populate_sdk_base.bbclass -# It is redefined here to be able to tweak the resulting SDK before and after -# packaging, using the proper 'IMAGE_BASENAME' value. +# It is redefined here to be able to tweak the resulting SDK before packaging, +# using the proper 'IMAGE_BASENAME' value. # SDK_PREPACKAGING_COMMAND ?= "toolchain_create_sdk_dey_version" -SDK_POSTPACKAGING_COMMAND ?= "toolchain_modify_default_path" -SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; ${SDK_PREPACKAGING_COMMAND}; tar_sdk; ${SDK_PACKAGING_COMMAND} ${SDK_POSTPACKAGING_COMMAND}; " +SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots; ${SDK_PREPACKAGING_COMMAND}; tar_sdk; ${SDK_PACKAGING_COMMAND} " # This function creates a DEY version information file fakeroot toolchain_create_sdk_dey_version() { @@ -59,9 +56,3 @@ fakeroot toolchain_create_sdk_dey_version() { } toolchain_create_sdk_dey_version[vardepsexclude] = "DATETIME" -# This function appends IMAGE_BASENAME to the default installation path -fakeroot toolchain_modify_default_path() { - sed -i -e 's#^DEFAULT_INSTALL_DIR="${SDKPATH}"#DEFAULT_INSTALL_DIR="${SDKPATH}/${IMAGE_BASENAME}"#g' \ - ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh -} -