From 97dec8410b071660937fa1f30827a2926c21cca2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 29 Sep 2010 11:19:22 +0100 Subject: sstate.bbclass: Update to use SSTATE variables everywhere and remove the now unneeded complicated paths from the sstate files Signed-off-by: Richard Purdie --- meta/conf/abi_version.conf | 2 +- meta/conf/bitbake.conf | 2 +- meta/conf/local.conf.sample | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index e679aaa9c..3920766a4 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 e2c160685..c2a211967 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 8ccdd138c..fa5e3f183 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. -- cgit v1.2.3