[oe-commits] org.oe.dev 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)

[rpurdie commit]

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)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 8fc2e2403d303c542634112edea05e5c642afc55
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8fc2e2403d303c542634112edea05e5c642afc55
Files:
1
conf/bitbake.conf
Diffs:

#
# mt diff -r209c715c22b645bc2ac08081edb720694c7eb1b2 -r8fc2e2403d303c542634112edea05e5c642afc55
#
# 
# 
# patch "conf/bitbake.conf"
#  from [412c9f3d491bbaf1bef0156269fcdefa994cd583]
#    to [e6d02d4c7531b9f3ba8b9aca6f4e5d77af928098]
# 
============================================================
--- conf/bitbake.conf	412c9f3d491bbaf1bef0156269fcdefa994cd583
+++ conf/bitbake.conf	e6d02d4c7531b9f3ba8b9aca6f4e5d77af928098
@@ -139,7 +139,7 @@ TMPDIR = "${TOPDIR}/tmp"
 ##################################################################
 
 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_RPM = "${DEPLOY_DIR}/rpm"
 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_squashfs-lzma = "-le -b 1
 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,8 +418,9 @@ MACHINE_TASK_PROVIDER ?= "task-bootstrap
 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
 ##################################################################