summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2021-01-08 09:02:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-21 23:25:53 +0000
commitacce3be5e93928fee6538152698cf1983b306dbc (patch)
tree209a3170848739b436494c7635f089197de0da9b
parentd59602c758db9eb2393719c27e25df9f135c1ecc (diff)
downloadpoky-acce3be5e93928fee6538152698cf1983b306dbc.tar.gz
Customize prompt string for SDKs
Introduce a new variable SDK_PS1 to customize prompt string for SDKs when source script environment-setup-script. The prompt string of SDKs is set by default with something looks like: SDK-poky-glibc-x86_64--cortexa57-qemuarm64$ (From OE-Core rev: b152e617bf7ad52530ddd64b7f4f7ffabd479b7f) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/toolchain-scripts.bbclass1
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/recipes-core/meta/buildtools-tarball.bb1
3 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index db1d3215ef..88df373d0b 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -45,6 +45,7 @@ toolchain_create_sdk_env_script () {
45 EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i" 45 EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i"
46 done 46 done
47 echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script 47 echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script
48 echo 'export PS1="${SDK_PS1}"' >>$script
48 echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script 49 echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script
49 echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig:$SDKTARGETSYSROOT'"$prefix"'/share/pkgconfig' >> $script 50 echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig:$SDKTARGETSYSROOT'"$prefix"'/share/pkgconfig' >> $script
50 echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script 51 echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 74976ac05c..af1b3b8c3e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -424,6 +424,7 @@ PKGDATA_DIR = "${TMPDIR}/pkgdata/${MACHINE}"
424 424
425SDK_NAME_PREFIX ?= "oecore" 425SDK_NAME_PREFIX ?= "oecore"
426SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TUNE_PKGARCH}" 426SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TUNE_PKGARCH}"
427SDK_PS1 ?= "SDK-${SDK_NAME}:\\\\$ "
427SDKPATH = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}" 428SDKPATH = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}"
428SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}" 429SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
429 430
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index 9da81d5523..59cfc64ce8 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -71,6 +71,7 @@ create_sdk_files_append () {
71 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 71 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
72 echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script 72 echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script
73 echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script 73 echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script
74 echo 'export PS1="${SDK_PS1}"' >>$script
74 75
75 toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} 76 toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS}
76 77