From 4d609d502161137620c4b1901cc225f9e871c3dc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Apr 2011 16:56:03 +0100 Subject: Replace POKYBASE with COREBASE (From OE-Core rev: 607a7657715f6fcba467a4e55ba64f41f4e13a15) Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- meta/conf/layer.conf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8390d10cf1..8f8e21bccc 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -716,5 +716,5 @@ TRANSLATED_TARGET_ARCH ??= ${TARGET_ARCH} # Setup our default hash policy BB_SIGNATURE_HANDLER ?= "basic" BB_HASHTASK_WHITELIST ?= "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)" -BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH USERNAME STAGING_DIR_HOST STAGING_DIR_TARGET POKYBASE" +BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH USERNAME STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE" diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 7e0beba954..37e5d99c1b 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -10,14 +10,14 @@ BBFILE_PATTERN_normal := "^${LAYERDIR}/" BBFILE_PRIORITY_normal = "5" # Set a variable to get to the top of the metadata location -POKYBASE := ${@os.path.normpath("${LAYERDIR}/../")} +COREBASE := ${@os.path.normpath("${LAYERDIR}/../")} # Add scripts to PATH -PATH := "${PATH}:${POKYBASE}/scripts" +PATH := "${PATH}:${COREBASE}/scripts" # Set path to qemu image tests included in this layer -QEMUIMAGETESTS := "${POKYBASE}/scripts/qemuimage-tests" +QEMUIMAGETESTS := "${COREBASE}/scripts/qemuimage-tests" require conf/distro/include/poky-default-revisions.inc -- cgit v1.2.3-54-g00ecf