diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9d8e59457c..492ed9678a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -43,6 +43,9 @@ includedir_native = "${prefix_native}/include" | |||
43 | libdir_native = "${prefix_native}/lib" | 43 | libdir_native = "${prefix_native}/lib" |
44 | datadir_native = "${prefix_native}/share" | 44 | datadir_native = "${prefix_native}/share" |
45 | bindir_cross = "/bin" | 45 | bindir_cross = "/bin" |
46 | prefix_nativesdk = "/usr" | ||
47 | bindir_nativesdk = "${prefix_nativesdk}/bin" | ||
48 | libdir_nativesdk = "${prefix_nativesdk}/lib" | ||
46 | 49 | ||
47 | # | 50 | # |
48 | # Cross recipes need to know about the target layout | 51 | # Cross recipes need to know about the target layout |
@@ -290,6 +293,7 @@ PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" | |||
290 | 293 | ||
291 | SDK_NAME = "${DISTRO}/${TARGET_ARCH}" | 294 | SDK_NAME = "${DISTRO}/${TARGET_ARCH}" |
292 | SDKPATH = "/usr/local/${SDK_NAME}" | 295 | SDKPATH = "/usr/local/${SDK_NAME}" |
296 | SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}" | ||
293 | 297 | ||
294 | ################################################################## | 298 | ################################################################## |
295 | # Kernel info. | 299 | # Kernel info. |
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 57231fd6ef..951e156c25 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -58,8 +58,8 @@ require conf/distro/include/poky-${POKYMODE}.inc | |||
58 | POKYLIBC ?= "glibc" | 58 | POKYLIBC ?= "glibc" |
59 | require conf/distro/include/poky-${POKYLIBC}.inc | 59 | require conf/distro/include/poky-${POKYLIBC}.inc |
60 | 60 | ||
61 | SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}" | 61 | SDK_NAME = "${DISTRO}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}" |
62 | SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}" | 62 | SDKPATH = "/opt/${DISTRO}" |
63 | 63 | ||
64 | CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}" | 64 | CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}" |
65 | 65 | ||