summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-18 09:01:33 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-18 09:01:33 (GMT)
commit1d4f93e8f63395220da652bae055acde11544577 (patch)
treeed0bd7716f87bd755b1bd6b1b73814970386f1e4 /meta
parent8aa3e16e1f88a2327fe1da6cdc4c3e0bd480a815 (diff)
downloadpoky-1d4f93e8f63395220da652bae055acde11544577.tar.gz
Add SDKMACHINE to simplify SDK control and add to CACHE paths to allow environmental variable control
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/conf/machine-sdk/i586.conf2
-rw-r--r--meta/conf/machine-sdk/x86_64.conf1
4 files changed, 6 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4437fa7..77b0a4f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -232,7 +232,7 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
232################################################################## 232##################################################################
233 233
234TMPDIR ?= "${TOPDIR}/tmp" 234TMPDIR ?= "${TOPDIR}/tmp"
235CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" 235CACHE = "${TMPDIR}/cache${@['', '/' + 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))]}"
236# The persistent cache should be shared by all builds 236# The persistent cache should be shared by all builds
237PERSISTENT_DIR = "${TMPDIR}/cache" 237PERSISTENT_DIR = "${TMPDIR}/cache"
238CO_DIR = "${DL_DIR}" 238CO_DIR = "${DL_DIR}"
@@ -604,6 +604,7 @@ include conf/local.conf
604include conf/build/${BUILD_SYS}.conf 604include conf/build/${BUILD_SYS}.conf
605include conf/target/${TARGET_SYS}.conf 605include conf/target/${TARGET_SYS}.conf
606include conf/machine/${MACHINE}.conf 606include conf/machine/${MACHINE}.conf
607include conf/machine-sdk/${SDKMACHINE}.conf
607include conf/distro/${DISTRO}.conf 608include conf/distro/${DISTRO}.conf
608include conf/documentation.conf 609include conf/documentation.conf
609require conf/sanity.conf 610require conf/sanity.conf
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ab74cfc..1365037 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -61,7 +61,7 @@ require conf/distro/include/poky-${POKYLIBC}.inc
61SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}" 61SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
62SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}" 62SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
63 63
64CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" 64CACHE = "${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
66# 66#
67# Preferred providers: 67# Preferred providers:
diff --git a/meta/conf/machine-sdk/i586.conf b/meta/conf/machine-sdk/i586.conf
new file mode 100644
index 0000000..0b748a5
--- /dev/null
+++ b/meta/conf/machine-sdk/i586.conf
@@ -0,0 +1,2 @@
1SDK_ARCH = "i586"
2SDK_CC_ARCH = "-march=i586"
diff --git a/meta/conf/machine-sdk/x86_64.conf b/meta/conf/machine-sdk/x86_64.conf
new file mode 100644
index 0000000..a6adb28
--- /dev/null
+++ b/meta/conf/machine-sdk/x86_64.conf
@@ -0,0 +1 @@
SDK_ARCH = "x86_64" \ No newline at end of file