diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 14:35:08 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 14:35:08 +0100 |
| commit | 061df5abaf727741b11c05db2c47e2778f96d96e (patch) | |
| tree | a79062441b0bd9564320c951cc330a268b28994e /meta/conf | |
| parent | 4e0ee648b4c18b770aba11921370258f3e2aaeef (diff) | |
| download | openembedded-core-061df5abaf727741b11c05db2c47e2778f96d96e.tar.gz openembedded-core-061df5abaf727741b11c05db2c47e2778f96d96e.tar.bz2 openembedded-core-061df5abaf727741b11c05db2c47e2778f96d96e.tar.xz openembedded-core-061df5abaf727741b11c05db2c47e2778f96d96e.zip | |
meta-toolchain: Improve layout
* Switch from /usr/local/poky to /opt/poky
* Use a sysroots directory for both the "native" sdk binaries and the target
* Drop the meta-toolchain extras packages. These are replaced with packaged-staging.
* Change the nativesdk layout to match our usual filesystem layout
* Clean up various hardcoded prefix references
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
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 9d8e59457..492ed9678 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -43,6 +43,9 @@ includedir_native = "${prefix_native}/include" libdir_native = "${prefix_native}/lib" datadir_native = "${prefix_native}/share" bindir_cross = "/bin" +prefix_nativesdk = "/usr" +bindir_nativesdk = "${prefix_nativesdk}/bin" +libdir_nativesdk = "${prefix_nativesdk}/lib" # # Cross recipes need to know about the target layout @@ -290,6 +293,7 @@ PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" SDK_NAME = "${DISTRO}/${TARGET_ARCH}" SDKPATH = "/usr/local/${SDK_NAME}" +SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}" ################################################################## # Kernel info. diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 57231fd6e..951e156c2 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -58,8 +58,8 @@ require conf/distro/include/poky-${POKYMODE}.inc POKYLIBC ?= "glibc" require conf/distro/include/poky-${POKYLIBC}.inc -SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}" -SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}" +SDK_NAME = "${DISTRO}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}" +SDKPATH = "/opt/${DISTRO}" 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))]}" |