diff options
| -rw-r--r-- | meta-moblin/conf/distro/moblin.conf | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine-sdk/i586.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine-sdk/x86_64.conf | 1 | ||||
| -rwxr-xr-x | scripts/poky-env-internal | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf index 5efba45b7f..fbc96a809c 100644 --- a/meta-moblin/conf/distro/moblin.conf +++ b/meta-moblin/conf/distro/moblin.conf @@ -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: diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4437fa7008..77b0a4f8e8 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -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 diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index ab74cfc44c..1365037219 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.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: diff --git a/meta/conf/machine-sdk/i586.conf b/meta/conf/machine-sdk/i586.conf new file mode 100644 index 0000000000..0b748a5026 --- /dev/null +++ b/meta/conf/machine-sdk/i586.conf @@ -0,0 +1,2 @@ +SDK_ARCH = "i586" +SDK_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 0000000000..a6adb2817d --- /dev/null +++ b/meta/conf/machine-sdk/x86_64.conf @@ -0,0 +1 @@ +SDK_ARCH = "x86_64"
\ No newline at end of file diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index 4c87e16f6c..edcc259c2c 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal @@ -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" |