summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/abi_version.conf2
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/local.conf.sample6
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 @@
4# that breaks the format and have been previously discussed on the mailing list 4# that breaks the format and have been previously discussed on the mailing list
5# with general agreement from the core team. 5# with general agreement from the core team.
6# 6#
7OELAYOUT_ABI = "5" 7OELAYOUT_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
650################################################################## 650##################################################################
651 651
652DL_DIR ?= "${TOPDIR}/downloads" 652DL_DIR ?= "${TOPDIR}/downloads"
653PSTAGE_DIR ?= "${TOPDIR}/pstage" 653SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
654IMAGE_FSTYPES ?= "tar.gz" 654IMAGE_FSTYPES ?= "tar.gz"
655PCMCIA_MANAGER ?= "pcmcia-cs" 655PCMCIA_MANAGER ?= "pcmcia-cs"
656DEFAULT_TASK_PROVIDER ?= "task-base" 656DEFAULT_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"
5# location, default it ${TOPDIR}/downloads 5# location, default it ${TOPDIR}/downloads
6#DL_DIR ?= "${TOPDIR}/downloads" 6#DL_DIR ?= "${TOPDIR}/downloads"
7# Uncomment and change to cache Poky's built staging output in an alternative 7# Uncomment and change to cache Poky's built staging output in an alternative
8# location, default ${TOPDIR}/pstage 8# location, default ${TOPDIR}/sstate-cache
9#PSTAGE_DIR ?= "${TOPDIR}/pstage" 9#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
10 10
11# Uncomment and set to allow bitbake to execute multiple tasks at once. 11# Uncomment and set to allow bitbake to execute multiple tasks at once.
12# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would 12# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
@@ -142,7 +142,7 @@ ENABLE_BINARY_LOCALE_GENERATION = "1"
142 142
143# Poky can try and fetch packaged-staging packages from a http, https or ftp 143# Poky can try and fetch packaged-staging packages from a http, https or ftp
144# mirror. Set this variable to the root of a pstage directory on a server. 144# mirror. Set this variable to the root of a pstage directory on a server.
145#PSTAGE_MIRROR ?= "http://someserver.tld/share/pstage" 145#SSTATE_MIRROR ?= "http://someserver.tld/share/pstage"
146 146
147# Set IMAGETEST to qemu if you want to build testcases and start 147# Set IMAGETEST to qemu if you want to build testcases and start
148# testing in qemu after do_rootfs. 148# testing in qemu after do_rootfs.