3 files changed, 5 insertions, 5 deletions

diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index e679aaa9c3..3920766a47 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
 # that breaks the format and have been previously discussed on the mailing list 
 # with general agreement from the core team.
 #
-OELAYOUT_ABI = "5"
+OELAYOUT_ABI = "6"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e2c160685c..c2a2119678 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -650,7 +650,7 @@ require conf/abi_version.conf
 ##################################################################
 
 DL_DIR ?= "${TOPDIR}/downloads"
-PSTAGE_DIR ?= "${TOPDIR}/pstage"
+SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
 IMAGE_FSTYPES ?= "tar.gz"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 DEFAULT_TASK_PROVIDER ?= "task-base"
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 8ccdd138cb..fa5e3f183f 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -5,8 +5,8 @@ CONF_VERSION = "1"
 # location, default it ${TOPDIR}/downloads
 #DL_DIR ?= "${TOPDIR}/downloads"
 # Uncomment and change to cache Poky's built staging output in an alternative
-# location, default ${TOPDIR}/pstage
-#PSTAGE_DIR ?= "${TOPDIR}/pstage"
+# location, default ${TOPDIR}/sstate-cache
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
 
 # Uncomment and set to allow bitbake to execute multiple tasks at once.
 # For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
@@ -142,7 +142,7 @@ ENABLE_BINARY_LOCALE_GENERATION = "1"
 
 # Poky can try and fetch packaged-staging packages from a http, https or ftp
 # mirror. Set this variable to the root of a pstage directory on a server.
-#PSTAGE_MIRROR ?= "http://someserver.tld/share/pstage"
+#SSTATE_MIRROR ?= "http://someserver.tld/share/pstage"
 
 # Set IMAGETEST to qemu if you want to build testcases and start 
 # testing in qemu after do_rootfs.