diff options
| author | Tom Rini <trini@embeddedalley.com> | 2009-01-28 15:44:56 -0500 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-01-28 15:44:56 -0500 |
| commit | 6638d03ac6f88d30dfc904a1e20f9d3c5d73fa70 (patch) | |
| tree | dca1348f8431ddcfa53f5c7e5db859d99b6f3be7 /packages/meta | |
| parent | 95c914647d7fcbefee17b6c319af2d576b503f4e (diff) | |
| parent | b2b123a438f9a456dca068330c27ba554524b0e3 (diff) | |
Merge branch 'org.openembedded.dev' into trini/canadian-final-merge
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/external-toolchain.bb | 2 | ||||
| -rw-r--r-- | packages/meta/meta-toolchain.bb | 4 |
2 files changed, 3 insertions, 3 deletions
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} |