summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-12-14 13:29:43 +0000
committerRichard Purdie <richard@openedhand.com>2006-12-14 13:29:43 +0000
commitec99f44114ab9694291acbe10eafb898c0f55fca (patch)
tree8688c0eea8ad0fcc984db111cd9be31b5a6bd72d
parentb21230d1777f3657a3a06ae756d8434809a556a4 (diff)
downloadpoky-ec99f44114ab9694291acbe10eafb898c0f55fca.tar.gz
bitbake.conf: Add STAGING_BINDIR_CROSS
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1036 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/conf/machine/spitz.conf2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d2be2cb1e4..53fb17cab0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -156,6 +156,7 @@ B = "${S}"
156 156
157STAGING_DIR = "${TMPDIR}/staging" 157STAGING_DIR = "${TMPDIR}/staging"
158STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}" 158STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
159STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
159STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin" 160STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
160STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" 161STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
161STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" 162STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
@@ -218,7 +219,7 @@ EXTRA_IMAGEDEPENDS = ""
218 219
219CROSS_DIR = "${TMPDIR}/cross" 220CROSS_DIR = "${TMPDIR}/cross"
220CROSS_DATADIR = "${CROSS_DIR}/share" 221CROSS_DATADIR = "${CROSS_DIR}/share"
221export PATH_prepend = "${STAGING_BINDIR}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:" 222export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:"
222 223
223################################################################## 224##################################################################
224# Build utility info. 225# Build utility info.
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index 2c4e10935e..b7a9e2ab01 100644
--- a/meta/conf/machine/spitz.conf
+++ b/meta/conf/machine/spitz.conf
@@ -8,7 +8,7 @@ include conf/machine/include/zaurus-2.6.conf
8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" 8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
9 9
10PACKAGE_EXTRA_ARCHS += "iwmmxt" 10PACKAGE_EXTRA_ARCHS += "iwmmxt"
11IMAGE_FSTYPES ?= "tar.gz" 11IMAGE_FSTYPES ?= "tar.gz ext2"
12 12
13ROOT_FLASH_SIZE = "100" 13ROOT_FLASH_SIZE = "100"
14# actually that should really read ROOTFS_SIZE = "100", because with modern kernels, 14# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,