diff options
| -rw-r--r-- | classes/sdk.bbclass | 2 | ||||
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | packages/meta/external-toolchain.bb | 2 | ||||
| -rw-r--r-- | packages/meta/meta-toolchain.bb | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index da6cab9cd5..eb34bd04b5 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -28,7 +28,7 @@ CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" # Path prefixes -prefix = "${SDK_PREFIX}" +prefix = "${SDK_PATH}" exec_prefix = "${prefix}" base_prefix = "${prefix}" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 3646522d93..06fb8934dd 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -285,7 +285,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" SDK_NAME = "${DISTRO}/${TARGET_ARCH}" -SDK_PREFIX = "/usr/local/${SDK_NAME}" +SDK_PATH = "/usr/local/${SDK_NAME}" ################################################################## # Kernel info. diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index e1dae5a2fe..4c70054b0f 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -1,6 +1,6 @@ DESCRIPTION = "This package allows OE to work with an external toolchain generated \ by meta-toolchain instead of building its own. It expects that toolchain \ - to be located in SDK_PREFIX/prefix." + to be located in SDK_PATH/prefix." PROVIDES = "\ linux-libc-headers \ diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index b6517999b0..db432dbb70 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -24,7 +24,7 @@ SDK_OUTPUT2 = "${SDK_DIR}/image-extras" SDK_DEPLOY = "${TMPDIR}/deploy/sdk" IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" -IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS}" +IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDK_PATH}/${TARGET_SYS}" TOOLCHAIN_HOST_TASK ?= "task-sdk-host" TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare" @@ -67,7 +67,7 @@ do_populate_sdk() { ${IPKG_HOST} update ${IPKG_HOST} -force-depends install ${TOOLCHAIN_HOST_TASK} - mkdir -p ${SDK_OUTPUT}/${SDK_PREFIX}/${TARGET_SYS}/usr/lib/opkg + mkdir -p ${SDK_OUTPUT}/${SDK_PATH}/${TARGET_SYS}/usr/lib/opkg ${IPKG_TARGET} update ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} |