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>
This commit is contained in:
parent
8aa3e16e1f
commit
1d4f93e8f6
|
@ -55,7 +55,7 @@ require conf/distro/include/poky-${POKYLIBC}.inc
|
|||
SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
|
||||
SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
|
||||
|
||||
CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
|
||||
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))]}"
|
||||
|
||||
#
|
||||
# Preferred providers:
|
||||
|
|
|
@ -232,7 +232,7 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
|
|||
##################################################################
|
||||
|
||||
TMPDIR ?= "${TOPDIR}/tmp"
|
||||
CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
|
||||
CACHE = "${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))]}"
|
||||
# The persistent cache should be shared by all builds
|
||||
PERSISTENT_DIR = "${TMPDIR}/cache"
|
||||
CO_DIR = "${DL_DIR}"
|
||||
|
@ -604,6 +604,7 @@ include conf/local.conf
|
|||
include conf/build/${BUILD_SYS}.conf
|
||||
include conf/target/${TARGET_SYS}.conf
|
||||
include conf/machine/${MACHINE}.conf
|
||||
include conf/machine-sdk/${SDKMACHINE}.conf
|
||||
include conf/distro/${DISTRO}.conf
|
||||
include conf/documentation.conf
|
||||
require conf/sanity.conf
|
||||
|
|
|
@ -61,7 +61,7 @@ require conf/distro/include/poky-${POKYLIBC}.inc
|
|||
SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
|
||||
SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
|
||||
|
||||
CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
|
||||
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))]}"
|
||||
|
||||
#
|
||||
# Preferred providers:
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
SDK_ARCH = "i586"
|
||||
SDK_CC_ARCH = "-march=i586"
|
|
@ -0,0 +1 @@
|
|||
SDK_ARCH = "x86_64"
|
|
@ -119,4 +119,4 @@ echo
|
|||
echo "### Shell environment set up for Poky builds. ###"
|
||||
echo
|
||||
|
||||
export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC OEROOT http_proxy ftp_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY"
|
||||
export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC OEROOT http_proxy ftp_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE"
|
||||
|
|
Loading…
Reference in New Issue