From 5563af5f6c4f046dae147502ff75f0ae2fb589fb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 9 Jan 2009 00:17:11 +0000 Subject: bitbake.conf: Add EXEEXT variables for BUILD/HOST/TARGET so we can start to handle other architectures --- conf/bitbake.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf/bitbake.conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 87081739fb..287a3d87f5 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -71,6 +71,7 @@ BUILD_VENDOR = "" BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}" BUILD_PREFIX = "" BUILD_CC_ARCH = "" +BUILD_EXEEXT = "" HOST_ARCH = "${TARGET_ARCH}" HOST_OS = "${TARGET_OS}" @@ -78,6 +79,7 @@ HOST_VENDOR = "${TARGET_VENDOR}" HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" HOST_PREFIX = "${TARGET_PREFIX}" HOST_CC_ARCH = "${TARGET_CC_ARCH}" +HOST_EXEEXT = "" TARGET_ARCH ?= "INVALID" TARGET_OS = "INVALID" @@ -85,6 +87,7 @@ TARGET_VENDOR = "${BUILD_VENDOR}" TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" +TARGET_EXEEXT = "" BASE_PACKAGE_ARCH = "${HOST_ARCH}" PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" -- cgit 1.2.3-korg From 56ff792ea6388133d661851768013e09a3545980 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 9 Jan 2009 00:18:41 +0000 Subject: Add a shortcut for the EXEEXT we'll use in packaging --- conf/bitbake.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf/bitbake.conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 287a3d87f5..3646522d93 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -89,6 +89,9 @@ TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" TARGET_EXEEXT = "" +# A shortcut for the commonly used value +EXEEXT = "${HOST_EXEEXT}" + BASE_PACKAGE_ARCH = "${HOST_ARCH}" PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" -- cgit 1.2.3-korg From 04c9615b938eaabfbadc99c1707eb44657c95a61 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 16 Jan 2009 23:26:23 -0500 Subject: SDK: Rename 'SDK_PREFIX' to 'SDK_PATH' so that it has a meaning analogous to BUILD/TARGET/HOST This isn't a big deal until we introduce the rest of the SDK variables for doing Canadian builds. --- classes/sdk.bbclass | 2 +- conf/bitbake.conf | 2 +- packages/meta/external-toolchain.bb | 2 +- packages/meta/meta-toolchain.bb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'conf/bitbake.conf') 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} -- cgit 1.2.3-korg