From 607a7657715f6fcba467a4e55ba64f41f4e13a15 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 20 Apr 2011 16:56:03 +0100
Subject: Replace POKYBASE with COREBASE

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/bblayers.conf.sample | 2 +-
 meta/conf/bitbake.conf         | 2 +-
 meta/conf/distro/poky.conf     | 2 +-
 meta/conf/layer.conf           | 6 +++---
 meta/conf/local.conf.sample    | 2 +-
 meta/conf/site.conf.sample     | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'meta/conf')

diff --git a/meta/conf/bblayers.conf.sample b/meta/conf/bblayers.conf.sample
index b2f37c0c81..339a42139c 100644
--- a/meta/conf/bblayers.conf.sample
+++ b/meta/conf/bblayers.conf.sample
@@ -4,5 +4,5 @@ LCONF_VERSION = "4"
 
 BBFILES ?= ""
 BBLAYERS = " \
-  ##POKYBASE##/meta \
+  ##COREBASE##/meta \
   "
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/distro/poky.conf b/meta/conf/distro/poky.conf
index 748e0ab462..100d0e354a 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -144,7 +144,7 @@ COMMERCIAL_VIDEO_PLUGINS ?= ""
 COMMERCIAL_QT ?= ""
 # COMMERCIAL_QT ?= "qmmp"
 # Set of common licenses used for license.bbclass
-COMMON_LICENSE_DIR ??= "${POKYBASE}/meta/files/common-licenses"
+COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
 
 BB_GENERATE_MIRROR_TARBALLS ??= "0"
 
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
 
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 33cb5d351f..d040275548 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -72,7 +72,7 @@ USER_CLASSES ?= "image-mklibs image-prelink"
 # Note that a full build of everything in OpenEmbedded will take GigaBytes of hard
 # disk space, so make sure to free enough space. The default TMPDIR is
 # <build directory>/tmp
-#TMPDIR = "${POKYBASE}/build/tmp"
+#TMPDIR = "${COREBASE}/build/tmp"
 
 # The following are used to control options related to debugging.
 #
diff --git a/meta/conf/site.conf.sample b/meta/conf/site.conf.sample
index 42042042f7..469a1660f5 100644
--- a/meta/conf/site.conf.sample
+++ b/meta/conf/site.conf.sample
@@ -20,7 +20,7 @@ SCONF_VERSION = "1"
 # although this only works for http
 #GIT_PROXY_HOST = "proxy.example.com"
 #GIT_PROXY_PORT = "81"
-#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-command"
+#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/poky-git-proxy-command"
 
 # GIT_PROXY_IGNORE_* lines define hosts which do not require a proxy to access
 #GIT_CORE_CONFIG = "Yes"
@@ -32,7 +32,7 @@ SCONF_VERSION = "1"
 # and then share that binary somewhere in PATH, then use the following settings
 #GIT_PROXY_HOST = "proxy.example.com"
 #GIT_PROXY_PORT = "81"
-#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-socks-command"
+#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/poky-git-proxy-socks-command"
 
 
 # Uncomment this to use a shared download directory
-- 
cgit v1.2.3