Replace POKYBASE with COREBASE

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index 8301df84527c1b69295d1799254c6374e1fa462c..e71403ece33f89fc0037a09b9108858105f254a1 100644 (file)
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -67,7 +67,7 @@ def qemuimagetest_main(d):
         os.environ["QEMUARCH"] = machine
         os.environ["QEMUTARGET"] = pname
         os.environ["DISPLAY"] = bb.data.getVar("DISPLAY", d, True)
-        os.environ["POKYBASE"] = bb.data.getVar("POKYBASE", d, True)
+        os.environ["COREBASE"] = bb.data.getVar("COREBASE", d, True)
         os.environ["TOPDIR"] = bb.data.getVar("TOPDIR", d, True)
         os.environ["TEST_STATUS"] = bb.data.getVar("TEST_STATUS", d, True)
         os.environ["TARGET_IPSAVE"] = bb.data.getVar("TARGET_IPSAVE", d, True)

diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index a261a6a8b84562a621f5488e8d547b792357ab5b..54cf57f0dbf9869d0982c053e8f0be3764450216 100644 (file)
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -2,8 +2,8 @@
 #
 # Copyright (C) 2007 OpenedHand LTD
 
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 # IMAGE_FEATURES control content of images built with Poky.
 # 

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 04ccabd5f43aae0e1901cbdd675cf6d5808712cd..aa1b3395502ce23feb6643da20bfc8f424e51d1f 100644 (file)
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -16,7 +16,7 @@ do_rootfs[depends] += "opkg-native:do_populate_sysroot"
 
 do_rootfs[recrdeptask] += "do_package_write_rpm"
 
-AWKPOSTINSTSCRIPT = "${POKYBASE}/scripts/rootfs_rpm-extract-postinst.awk"
+AWKPOSTINSTSCRIPT = "${COREBASE}/scripts/rootfs_rpm-extract-postinst.awk"
 
 RPM_PREPROCESS_COMMANDS = "package_update_index_rpm; package_generate_rpm_conf; "
 RPM_POSTPROCESS_COMMANDS = ""

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index b5170a55c7fc2b2f09d77a1f610a78e000f5bc45..2f3357bf74adc184f1f386a36bee1147cc8d0457 100644 (file)
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -332,11 +332,11 @@ def check_sanity(e):
         f.write(current_abi)
     f.close()
 
-    oeroot = data.getVar('POKYBASE', e.data)
+    oeroot = data.getVar('COREBASE', e.data)
     if oeroot.find ('+') != -1:
-        messages = messages + "Error, you have an invalid character (+) in your POKYBASE directory path. Please move Poky to a directory which doesn't include a +."
+        messages = messages + "Error, you have an invalid character (+) in your COREBASE directory path. Please move Poky to a directory which doesn't include a +."
     elif oeroot.find (' ') != -1:
-        messages = messages + "Error, you have a space in your POKYBASE directory path. Please move Poky to a directory which doesn't include a space."
+        messages = messages + "Error, you have a space in your COREBASE directory path. Please move Poky to a directory which doesn't include a space."
 
     # Check that we don't have duplicate entries in PACKAGE_ARCHS
     pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True)

diff --git a/meta/conf/bblayers.conf.sample b/meta/conf/bblayers.conf.sample
index b2f37c0c8100f0d356042b51862cf8b0899a80cd..339a42139c95f503a2dc62d75fcb33d57ddd491b 100644 (file)
--- 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 8390d10cf1302dfbd57f693fef200021ead94b3c..8f8e21bccc9e246a4a082632d7ddf7c23d079557 100644 (file)
--- 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 748e0ab46252bf86aa6c30e69f02232095a752b9..100d0e354a3ee3842c63b84a03b8bbec1780c1fc 100644 (file)
--- 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 7e0beba9546ce8db685929b69a9d6d69a7c677d1..37e5d99c1b41f32539bd5dac7eee6e3c8b922f5c 100644 (file)
--- 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 33cb5d351fceac1fe84447b7380cf238c94502f7..d040275548a62d74cccf64b8cdda4a9133110769 100644 (file)
--- 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 42042042f7820a10fb1df727a5bfb35fd5f62c1e..469a1660f5598fbd9a1d913e2571321c2564cadd 100644 (file)
--- 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

diff --git a/meta/recipes-bsp/formfactor/formfactor_0.0.bb b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
index 683a4ef8c0d93748dcbf6be5443772265947de4b..28624a6c2c619c532010ce61843fff4a6a354a9e 100644 (file)
--- a/meta/recipes-bsp/formfactor/formfactor_0.0.bb
+++ b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Device formfactor information"
 SECTION = "base"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r19"
 
 SRC_URI = "file://config file://machconfig"

diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index f57597d80c8a8e19c27e8da49cf18410138e3bf1..5cdba2ba110d16fb87fee3de7b6f32ffc37f9b2b 100644 (file)
--- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
@@ -4,8 +4,8 @@ DEPENDS = "ppp"
 RDEPENDS_${PN} = "ppp"
 PR = "r6"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SRC_URI = "file://host-peer \
            file://ppp-dialin"

diff --git a/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb b/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
index 2d0e0a87ec9c372ea92afe6df6fa36194c725d3a..9b005d0e61bcc5eb95f6f11111e8213c16ddd82b 100644 (file)
--- a/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
+++ b/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Poky example feed configuration"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

diff --git a/meta/recipes-core/images/poky-image-live.inc b/meta/recipes-core/images/poky-image-live.inc
index 4743d92916f88a1ebe21984cd6f35008defc50a6..a1b0e1a3dcd5aadb5af7f9269ab8dc8ed3c53ec6 100644 (file)
--- a/meta/recipes-core/images/poky-image-live.inc
+++ b/meta/recipes-core/images/poky-image-live.inc
@@ -5,8 +5,8 @@ TIMEOUT = "10"
 
 EXCLUDE_FROM_WORLD = "1"
 
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs"
 

diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
index 8be0193c6691312cc1df0da55eca874787a30169..b372fddbbaf6a2f5e822cdb13a552f71cfcaafd4 100644 (file)
--- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "A live image init script"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://init-boot.sh"
 
 PR = "r0"

diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index 83e3be947ddd1bd4f877aaf382b6e44097dfb227..f6a6a8a4cbc50852709f21efdca14a6319941b17 100644 (file)
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "A live image init script"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://init-live.sh"
 
 PR = "r2"

diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 82a1e44405bcb5e9b7db6fc5cf5518436f68138a..c599be5c58eab86f3d9f32741a60898d989806eb 100644 (file)
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "A live image init script"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://init-install.sh"
 
 PR = "r3"

diff --git a/meta/recipes-core/meta/external-python-tarball.bb b/meta/recipes-core/meta/external-python-tarball.bb
index 52f15f640aed640cd964c636f61eedd0c00b9257..6bc837b8ce399871c1b924af506e18a0c2ebbfde 100644 (file)
--- a/meta/recipes-core/meta/external-python-tarball.bb
+++ b/meta/recipes-core/meta/external-python-tarball.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta package for building a standalone python tarball"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 DEPENDS = "opkg-native opkg-utils-native virtual/fakeroot-native sed-native"
 

diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index b20068fc51d4e1c197dfc7dd2e7dc8f3c93dcfcc..351cbf0cfda59fcf622604a11f7b488361e36af5 100644 (file)
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Package of environment files for SDK"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 LICENSE = "MIT"
 PR = "r4"
 

diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb
index faec7fa6b2be1798c1b5fd264b7bc708c6c119b6..7a3c053a07cf9532b851aee08ab7c3c68a1f66d2 100644 (file)
--- a/meta/recipes-core/meta/meta-ide-support.bb
+++ b/meta/recipes-core/meta/meta-ide-support.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta package for ensuring the build directory contains all appropriate toolchain packages for using an IDE"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 DEPENDS = "virtual/libc gdb-cross qemu-helper-native unfs-server-native"
 PR = "r1"

diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 7a241da4d01bf6a66bfad959584c0bb08296042e..94c8a91a72ae6d825ff00017d2a28671c0746c10 100644 (file)
--- a/meta/recipes-core/meta/meta-toolchain.bb
+++ b/meta/recipes-core/meta/meta-toolchain.bb
@@ -3,8 +3,8 @@ LICENSE = "MIT"
 
 PR = "r4"
 
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit populate_sdk
 

diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 138e617c9242f7e8cd93e0cad74b75dca1dccd34..599fa4bd163544b5ab7ecb31f5d70e12d40b8f8d 100644 (file)
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r70"
 
 inherit task

diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/tasks/task-cross-canadian.bb
index 1bb2b57cb314db767658a3f3ca656f61dbb321b9..184030189272897c6516495d5468133c18bdc26b 100644 (file)
--- a/meta/recipes-core/tasks/task-cross-canadian.bb
+++ b/meta/recipes-core/tasks/task-cross-canadian.bb
@@ -4,8 +4,8 @@ PR = "r0"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 inherit cross-canadian
 
 PACKAGES = "${PN}"

diff --git a/meta/recipes-core/tasks/task-poky-boot.bb b/meta/recipes-core/tasks/task-poky-boot.bb
index e9c8e8a02e4db399ffd56d697e4dd2850b0784d0..7166761ce45a4e4b5a131949f5bd734b6df54880 100644 (file)
--- a/meta/recipes-core/tasks/task-poky-boot.bb
+++ b/meta/recipes-core/tasks/task-poky-boot.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY = "1"

diff --git a/meta/recipes-core/tasks/task-poky-nfs.bb b/meta/recipes-core/tasks/task-poky-nfs.bb
index 44ef97360eb642ff609602b7d7bf02c1f04b1ae2..a18d2e3ab83205c8a8d4b5eb993f8adfed2fa739 100644 (file)
--- a/meta/recipes-core/tasks/task-poky-nfs.bb
+++ b/meta/recipes-core/tasks/task-poky-nfs.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "NFS tasks for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r0"
 
 PACKAGES = "\

diff --git a/meta/recipes-core/tasks/task-poky-sdk.bb b/meta/recipes-core/tasks/task-poky-sdk.bb
index 8d5455a3c9dc582c56577d8c69b3f5f7cf28824c..b1e52c96ca20e49fb60845688f16e082b20c8de7 100644 (file)
--- a/meta/recipes-core/tasks/task-poky-sdk.bb
+++ b/meta/recipes-core/tasks/task-poky-sdk.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "task-poky"
 PR = "r7"
 

diff --git a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb b/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb
index 870d2d9853fcd23b9624829bf24917edc39687c1..4f2ab4425dcdd4f27176d6565cf099c2c4b80159 100644 (file)
--- a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb
+++ b/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Dropbear SSH task for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r0"
 
 PACKAGES = "\

diff --git a/meta/recipes-core/tasks/task-poky-ssh-openssh.bb b/meta/recipes-core/tasks/task-poky-ssh-openssh.bb
index 8df5d9bf9c11c1d5e03f23ea13631db16adb9f8b..5f828b55b95e07a219a25cc1fc1f510a61011d5c 100644 (file)
--- a/meta/recipes-core/tasks/task-poky-ssh-openssh.bb
+++ b/meta/recipes-core/tasks/task-poky-ssh-openssh.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenSSH SSH task for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r0"
 
 PACKAGES = "\

diff --git a/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb
index 4dde5b4beca6a0fd75f0658d486c80175ae4fb7e..3835ac7d6ae6d53533172f56edf583d206e7d135 100644 (file)
--- a/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb
+++ b/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Target packages for the standalone SDK"
 PR = "r6"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN} ${PN}-dbg"

diff --git a/meta/recipes-core/tasks/task-poky-tools.bb b/meta/recipes-core/tasks/task-poky-tools.bb
index f009a75ec963f21363d70f91668f7dac5fbb4681..29f5d4afa1211dfed8e7219a0201c2819d9d8e97 100644 (file)
--- a/meta/recipes-core/tasks/task-poky-tools.bb
+++ b/meta/recipes-core/tasks/task-poky-tools.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Tools tasks for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r8"
 
 PACKAGES = "\

diff --git a/meta/recipes-core/tasks/task-sdk-host.bb b/meta/recipes-core/tasks/task-sdk-host.bb
index 1837d9a0cfe46b999f3352ebb2931a5ac1cc2c9e..5ec40b140c8a9c661685f892bdf2dad3d404fd01 100644 (file)
--- a/meta/recipes-core/tasks/task-sdk-host.bb
+++ b/meta/recipes-core/tasks/task-sdk-host.bb
@@ -7,8 +7,8 @@ PR = "r10"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit nativesdk
 

diff --git a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
index 72cb65ff849ef373a8d40c3fe72e0a2179d4fb20..f15243b60ac419280ba989e79cbd9c136262c766 100644 (file)
--- a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
+++ b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Run postinstall scripts on device using awk"
 SECTION = "devel"
 PR = "r6"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SRC_URI = "file://run-postinsts file://run-postinsts.awk"
 

diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 7e82c926770bb67058635061cdbfd71b6e6b5be7..b70fb9e8cfb3e45af0cb3279925889ef843e27ee 100644 (file)
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -22,8 +22,8 @@
 
 
 DESCRIPTION = "Meta package for creating sdk installer tarball"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 LICENSE = "MIT"
 
 ALLOW_EMPTY = "1"

diff --git a/meta/recipes-devtools/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb
index 01e912f8bc2413d1296be4732532c0e98222c1dd..e3e0b5f2ef39c4486b62e0056374a23fa82a91ad 100644 (file)
--- a/meta/recipes-devtools/opkg/opkg-collateral.bb
+++ b/meta/recipes-devtools/opkg/opkg-collateral.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "opkg configuration files"
 SECTION = "base"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://opkg.conf.comments \
           file://lists \
           file://dest \

diff --git a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
index c2bf3473c2e8a974ecf8268524a2829c83e9e705..3a559cb57d7a88761dfc39a9796cf26f659f6cdb 100644 (file)
--- a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
+++ b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Base configuration files for opkg"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_compile() {

diff --git a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
index effcabaf40525f7a2aa92dd476a04a06a0760add..10d3e64ae87118a328e512d5ad3bfd1a858075c4 100644 (file)
--- a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
@@ -6,18 +6,18 @@ PR = "r9"
 FILESPATH = "${FILE_DIRNAME}/qemu-helper"
 
 LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \
-                    file://${POKYBASE}/scripts/runqemu;endline=18;md5=ce52af3dd295e20ad1d849611b83690b"
-
-
-SRC_URI = "file://${POKYBASE}/scripts/runqemu \
-           file://${POKYBASE}/scripts/runqemu-internal \
-           file://${POKYBASE}/scripts/poky-addptable2image \
-           file://${POKYBASE}/scripts/poky-gen-tapdevs \
-           file://${POKYBASE}/scripts/runqemu-ifup \
-           file://${POKYBASE}/scripts/runqemu-ifdown \
-           file://${POKYBASE}/scripts/poky-find-native-sysroot \
-           file://${POKYBASE}/scripts/poky-extract-sdk \
-           file://${POKYBASE}/scripts/poky-export-rootfs \
+                    file://${COREBASE}/scripts/runqemu;endline=18;md5=ce52af3dd295e20ad1d849611b83690b"
+
+
+SRC_URI = "file://${COREBASE}/scripts/runqemu \
+           file://${COREBASE}/scripts/runqemu-internal \
+           file://${COREBASE}/scripts/poky-addptable2image \
+           file://${COREBASE}/scripts/poky-gen-tapdevs \
+           file://${COREBASE}/scripts/runqemu-ifup \
+           file://${COREBASE}/scripts/runqemu-ifdown \
+           file://${COREBASE}/scripts/poky-find-native-sysroot \
+           file://${COREBASE}/scripts/poky-extract-sdk \
+           file://${COREBASE}/scripts/poky-export-rootfs \
            file://tunctl.c \
            file://raw2flash.c \
           "
@@ -34,7 +34,7 @@ do_compile() {
 
 do_install() {
        install -d ${D}${bindir}
-       install -m 0755 ${WORKDIR}${POKYBASE}/scripts/poky-* ${D}${bindir}/
+       install -m 0755 ${WORKDIR}${COREBASE}/scripts/poky-* ${D}${bindir}/
        install tunctl ${D}${bindir}/
        install raw2flash.spitz ${D}${bindir}/
        install flash2raw.spitz ${D}${bindir}/

diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-poky-basic.bb
index 80eac0f7481c328be413a20062d3d2376044aae0..68c996dc8878c5f61f583ea45d452840bcb993d9 100644 (file)
--- a/meta/recipes-extended/tasks/task-poky-basic.bb
+++ b/meta/recipes-extended/tasks/task-poky-basic.bb
@@ -5,8 +5,8 @@
 DESCRIPTION = "Create Basic Image Tasks"
 PR = "r3"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 PACKAGES = "\
     task-poky-basic \

diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-poky-lsb.bb
index 71a683a16450e4f7823b3af16632727c0eb1f3c1..b56c07beb2ffe58666badd991b32b94c3244e3b9 100644 (file)
--- a/meta/recipes-extended/tasks/task-poky-lsb.bb
+++ b/meta/recipes-extended/tasks/task-poky-lsb.bb
@@ -5,8 +5,8 @@
 DESCRIPTION = "Create Small Image Tasks"
 PR = "r3"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 PACKAGES = "\
     task-poky-lsb \

diff --git a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb
index d009e4ebe4501df9672235462d03bb9c6bdf8a4c..b5c2fda1598ee25d6984cd19e74588d546cc6dfa 100644 (file)
--- a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb
+++ b/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r10"
 
 ALLOW_EMPTY = "1"

diff --git a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb
index 7dcad61943681cb90e1d51179ad618ed96225c70..ad6270adf462ac25830473c92087fb2d4665d121 100644 (file)
--- a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r12"
 
 ALLOW_EMPTY = "1"

diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb
index 5fe23b92f0cb87f871911c4846871353a644baff..555a9ee0f0934fc92ef6742942895aa782f94e04 100644 (file)
--- a/meta/recipes-graphics/tasks/task-poky-clutter.bb
+++ b/meta/recipes-graphics/tasks/task-poky-clutter.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Clutter Tasks for OpenedHand Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 PR = "r4"
 

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index 43447363303e4aaeed451c6f271740b476cd5efb..035a4626196181bdb1cddb71aa25a08df7637531 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "X.Org X server configuration file"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r9"
 
 SRC_URI = "file://xorg.conf"

diff --git a/meta/recipes-kernel/modutils/modutils-collateral.bb b/meta/recipes-kernel/modutils/modutils-collateral.bb
index 01966244ab647a671a413b38c700b1fa3ad71552..919b86f95d6c0728e62814ec022422cebde687db 100644 (file)
--- a/meta/recipes-kernel/modutils/modutils-collateral.bb
+++ b/meta/recipes-kernel/modutils/modutils-collateral.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "modutils configuration files"
 PR = "r3"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://modules \
           file://modules.conf" 
 

diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
index ada7f692198740dedb9729f5d24f53929879fb0f..5bb67cce4bb2f60959aacf5e50a5b53884d0948d 100644 (file)
--- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Gstreamer package groups"
 LICENSE = "MIT"
 DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 
 PR = "r10"

diff --git a/meta/recipes-qt/tasks/task-poky-qt.bb b/meta/recipes-qt/tasks/task-poky-qt.bb
index da960db5b02455c465446307d3b54bb94c7ce0e2..762dff8e3ee0bdc95221847802dfebbdef394964 100644 (file)
--- a/meta/recipes-qt/tasks/task-poky-qt.bb
+++ b/meta/recipes-qt/tasks/task-poky-qt.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Qt Tasks for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r3"
 
 PACKAGES = "\

diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
index 98fe47794f0986b9c49a2111594fc5abd2bc13c8..659df47fa17c82db843fb82f345943a2435dadf9 100644 (file)
--- a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
+++ b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
@@ -4,8 +4,8 @@ ALLOW_EMPTY = "1"
 
 PR = "r5"
 
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 RDEPENDS_${PN} += " \
         task-poky-standalone-sdk-target \

diff --git a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb
index 8b75d218c4649546dee9bc4092beeb2eb4e676ba..7bb26fc04c09cf8271384eb37e631d3afb9a3edf 100644 (file)
--- a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb
+++ b/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "X11 Pimlico Appications List"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r27"
 
 PACKAGES = "\

diff --git a/meta/recipes-sato/tasks/task-poky-x11-sato.bb b/meta/recipes-sato/tasks/task-poky-x11-sato.bb
index 699c6f88e3b91b13193ecb34fe5d6bca795f3d02..c10a32a45d0f4982cb034cfe4f6754b2f051aee0 100644 (file)
--- a/meta/recipes-sato/tasks/task-poky-x11-sato.bb
+++ b/meta/recipes-sato/tasks/task-poky-x11-sato.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Sato Tasks for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r30"
 
 PACKAGES = "\

diff --git a/meta/recipes-sato/tasks/task-poky.bb b/meta/recipes-sato/tasks/task-poky.bb
index 72d4d0d9cbbc0b146057d6a6f5c28328b33fc118..4f7bc3d31ee1d34aae3c12c385ca14532253aea6 100644 (file)
--- a/meta/recipes-sato/tasks/task-poky.bb
+++ b/meta/recipes-sato/tasks/task-poky.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Tasks for OpenedHand Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r34"
 
 PACKAGES = "\

diff --git a/scripts/creat-lsb-image b/scripts/creat-lsb-image
index 3802e2f344a9ad29929f8293e1121286c73748a1..1dc48dd54cca7e6ea5e53cedd41d752d65044040 100755 (executable)
--- a/scripts/creat-lsb-image
+++ b/scripts/creat-lsb-image
@@ -21,7 +21,7 @@ green='\E[32;40m'
 USER=`whoami`
 ARCH=$1
 MACHINE_ARCH=` bitbake -e | grep ^MACHINE_ARCH | cut -d '=' -f2 | cut -d '"' -f2`
-IMAGE_PATH=` bitbake -e | grep ^POKYBASE | cut -d '=' -f2 | cut -d '"' -f2`/build/tmp/deploy/images/
+IMAGE_PATH=` bitbake -e | grep ^COREBASE | cut -d '=' -f2 | cut -d '"' -f2`/build/tmp/deploy/images/
 
 
 ECHO()

diff --git a/scripts/poky-setup-builddir b/scripts/poky-setup-builddir
index 563d8e940d9d2ebb8060348e2f23f393023a2dab..7c0cf596f091bc28cb69d151d7c1d43d77a804b5 100755 (executable)
--- a/scripts/poky-setup-builddir
+++ b/scripts/poky-setup-builddir
@@ -89,7 +89,7 @@ EOM
 
     # Put the abosolute path to the layers in bblayers.conf so we can run
     # bitbake without the init script after the first run
-    sed "s|##POKYBASE##|$OEROOT|g" $POKYLAYERCONF > $BUILDDIR/conf/bblayers.conf
+    sed "s|##COREBASE##|$OEROOT|g" $POKYLAYERCONF > $BUILDDIR/conf/bblayers.conf
 fi
 
 # Prevent disturbing a new GIT clone in same console

diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index c3cf7c1ec2a45eba1fddb2255258092816c0c010..5318ca636c5b38ac3bf108f9f818fb0156e82eaf 100644 (file)
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -17,7 +17,7 @@
 TYPE="ext3"
 
 # The folder to hold all scripts running on targets
-TOOLS="$POKYBASE/scripts/qemuimage-tests/tools"
+TOOLS="$COREBASE/scripts/qemuimage-tests/tools"
 
 # Test Directory on target for testing
 TARGET_TEST_DIR="/opt/test"

diff --git a/scripts/qemuimage-tests/sanity/boot b/scripts/qemuimage-tests/sanity/boot
index d3414d33d3cfff464f815b8633baa0d73d965707..cf8aafbc50bbbeb4b7577b94c7f60bf3095e117e 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/boot
+++ b/scripts/qemuimage-tests/sanity/boot
@@ -9,7 +9,7 @@
 # This file is licensed under the GNU General Public License,
 # Version 2.
 #
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=120
 

diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler
index d224f33571a030bb4dac813efff4d94c85a8aee9..ef0700732dcc471fb6cf9468d4cfad03aa9f2beb 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/compiler
+++ b/scripts/qemuimage-tests/sanity/compiler
@@ -9,7 +9,7 @@
 # Version 2.
 #
 
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=400
 RET=1

diff --git a/scripts/qemuimage-tests/sanity/connman b/scripts/qemuimage-tests/sanity/connman
index d46ef0a8900c9483ca598cf7070020454ecc52a4..0c62902f87c67fb17799afa945d111052d4dcb1a 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/connman
+++ b/scripts/qemuimage-tests/sanity/connman
@@ -9,7 +9,7 @@
 # Version 2.
 #
 
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=400
 RET=1

diff --git a/scripts/qemuimage-tests/sanity/dmesg b/scripts/qemuimage-tests/sanity/dmesg
index 06a99485ca2582f42389b2266812c220295c3ae1..aed29e05eba3725bb14a976d9a90b286cd2e84a2 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/dmesg
+++ b/scripts/qemuimage-tests/sanity/dmesg
@@ -9,7 +9,7 @@
 # Version 2.
 #
 
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=400
 RET=1

diff --git a/scripts/qemuimage-tests/sanity/rpm_query b/scripts/qemuimage-tests/sanity/rpm_query
index d42c4c49be3648350166a10542eb2be1b8e812cd..dd652bd99870fd97ba4662cb44c488c73610a5d5 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/rpm_query
+++ b/scripts/qemuimage-tests/sanity/rpm_query
@@ -9,7 +9,7 @@
 # Version 2.
 #
 
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=400
 RET=1

diff --git a/scripts/qemuimage-tests/sanity/scp b/scripts/qemuimage-tests/sanity/scp
index ce7279cdf87b46420626e66bfa4652131855f1df..b0b693d0c82871a2f5e1e7db31f9b95c64f1da18 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/scp
+++ b/scripts/qemuimage-tests/sanity/scp
@@ -9,7 +9,7 @@
 # Version 2.
 #
 
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=400
 RET=1

diff --git a/scripts/qemuimage-tests/sanity/shutdown b/scripts/qemuimage-tests/sanity/shutdown
index 22662ab2572052881d972eeb962cfac4e48ec263..d55c859410d6836c300a24b6ff1d222e9ee10858 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/shutdown
+++ b/scripts/qemuimage-tests/sanity/shutdown
@@ -11,7 +11,7 @@
 # Version 2.
 #
 
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=400
 

diff --git a/scripts/qemuimage-tests/sanity/ssh b/scripts/qemuimage-tests/sanity/ssh
index e4a20dc73d05d599ee9d11ea6d55f60cd9af6f80..181296b0b5089726ed9c5959b7d1ad2b02860ee5 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/ssh
+++ b/scripts/qemuimage-tests/sanity/ssh
@@ -9,7 +9,7 @@
 # Version 2.
 #
 
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=400
 RET=1

diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/zypper_help
index 6dafe5e1fdc0f9af0a73f39a37d17e03fbf3da5b..94f82c434037c7e6f86a894ce73fd697b31bd87e 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/zypper_help
+++ b/scripts/qemuimage-tests/sanity/zypper_help
@@ -9,7 +9,7 @@
 # Version 2.
 #
 
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=400
 RET=1

diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/zypper_search
index b96cbdad665cfbb86e7c302ffcec9388196dcfa8..e687eadfb77cdc29ccd4a496342f78e979996e4e 100755 (executable)
--- a/scripts/qemuimage-tests/sanity/zypper_search
+++ b/scripts/qemuimage-tests/sanity/zypper_search
@@ -9,7 +9,7 @@
 # Version 2.
 #
 
-. $POKYBASE/scripts/qemuimage-testlib
+. $COREBASE/scripts/qemuimage-testlib
 
 TIMEOUT=400
 RET=1