From caf077679022f37ce55d758101f130e4e93bd7b5 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 20 Nov 2006 17:40:20 +0000
Subject: [PATCH] bitbake.conf: Add MACHINE into the path for the CACHE (when
 set). Allow machines/distro to override IMAGE_ROOTFS_SIZE_ext2. Add
 DEPLOY_DIR_DEB. (from poky)

---
 conf/bitbake.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b2d7e2b875..2d739f3bcc 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -139,7 +139,7 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
 ##################################################################
 
 TMPDIR = "${TOPDIR}/tmp"
-CACHE = "${TMPDIR}/cache"
+CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
 DL_DIR = "${TMPDIR}/downloads"
 CVSDIR = "${DL_DIR}/cvs"
 SVNDIR = "${DL_DIR}/svn"
@@ -165,6 +165,7 @@ DEPLOY_DIR = "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
 DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
 DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
+DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
 
 ##################################################################
 # Kernel info.
@@ -197,8 +198,6 @@ EXTRA_IMAGECMD = ""
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 EXTRA_IMAGECMD_squashfs = "-le -b 16384"
 EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384"
-IMAGE_ROOTFS_SIZE_ext2 = "65536"
-IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
 
 IMAGE_DEPENDS = ""
 IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
@@ -419,7 +418,8 @@ require conf/sanity.conf
 IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 MACHINE_TASK_PROVIDER ?= "task-bootstrap"
-
+IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
+IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
 
 ##################################################################
 # Magic Cookie for SANITY CHECK
-- 
2.39.5