diff options
| author | Tom Rini <trini@embeddedalley.com> | 2009-01-27 18:03:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-01-27 18:03:07 -0500 |
| commit | 2ae4d66192f2db96bbd79ddcc33e6aac7c1bd960 (patch) | |
| tree | 11a2c7c90703d8034d755297e156b420c075c8e7 /packages/meta/meta-toolchain.bb | |
| parent | ffee230ed0b6c49ef4a0b23bc850b843c429f19a (diff) | |
| parent | 04c9615b938eaabfbadc99c1707eb44657c95a61 (diff) | |
Merge trini/canadian-merge branch into org.openembedded.dev, fixup a
conflict on checksums.ini
Diffstat (limited to 'packages/meta/meta-toolchain.bb')
| -rw-r--r-- | packages/meta/meta-toolchain.bb | 4 |
1 files changed, 2 insertions, 2 deletions
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} |