Enable build dir outside of the poky directory

You need to first set up the build directory by sourcing the poky build script,
after that builds can be run in that directory so long as bitbake is in $PATH
removing the need to source the init script for each build.

i.e:
$ . poky-init-build-env ~/my-build
$ bitbake some-image
<<later, in a different shell>>
$ cd ~/my-build
$ export PATH=/path/to/bitbake/bin:$PATH
$ bitbake an-image

This patch also removes use of OEROOT in recipes, etc.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

4 files changed, 14 insertions, 10 deletions

diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index 742b759208..feab868476 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -47,6 +47,7 @@ python do_qemuimagetest() {
         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)
 
         """run Test Case"""
         bb.note("Run %s test in scenario %s" % (case, scen))
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 94e96f8524..31b8dd2b07 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -194,11 +194,11 @@ def check_sanity(e):
                 f.write(current_abi)
         f.close()
 
-        oeroot = data.getVar('OEROOT', e.data)
+        oeroot = data.getVar('POKYBASE', e.data)
         if oeroot.find ('+') != -1:
-                messages = messages + "Error, you have an invalid character (+) in your OEROOT directory path. Please more Poky to a directory which doesn't include a +."
+                messages = messages + "Error, you have an invalid character (+) in your POKYBASE directory path. Please more Poky to a directory which doesn't include a +."
         elif oeroot.find (' ') != -1:
-                messages = messages + "Error, you have a space in your OEROOT directory path. Please move Poky to a directory which doesn't include a space."
+                messages = messages + "Error, you have a space in your POKYBASE directory path. Please move Poky to a directory which doesn't include a space."
 
         if messages != "":
                 raise_sanity_error(messages)
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index d0d74884ec..30068d6aec 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -12,9 +12,12 @@ BBFILE_PRIORITY_normal = "5"
 # Add scripts to PATH
 PATH := "${PATH}:${LAYERDIR}/scripts"
 
+# Set a variable to get to the top of the metadata location
+POKYBASE := ${@os.path.normpath("${LAYERDIR}/../")}
+
 # Set path to qemu image tests included in this layer
 
-QEMUIMAGETESTS := "${OEROOT}/scripts/qemuimage-tests"
+QEMUIMAGETESTS := "${POKYBASE}/scripts/qemuimage-tests"
 
 require conf/distro/include/poky-default-revisions.inc
 
diff --git a/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb b/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb
index 5d8e45f123..a4294ef5cf 100644
--- a/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb
+++ b/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb
@@ -5,11 +5,11 @@ PR = "r7"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-helper"
 
-SRC_URI = "file://${OEROOT}/scripts/poky-qemu \
-           file://${OEROOT}/scripts/poky-qemu-internal \
-           file://${OEROOT}/scripts/poky-addptable2image \
-           file://${OEROOT}/scripts/poky-qemu-ifup \
-           file://${OEROOT}/scripts/poky-qemu-ifdown \
+SRC_URI = "file://${POKYBASE}/scripts/poky-qemu \
+           file://${POKYBASE}/scripts/poky-qemu-internal \
+           file://${POKYBASE}/scripts/poky-addptable2image \
+           file://${POKYBASE}/scripts/poky-qemu-ifup \
+           file://${POKYBASE}/scripts/poky-qemu-ifdown \
            file://raw2flash.c"
 
 S = "${WORKDIR}"
@@ -23,7 +23,7 @@ do_compile() {
 
 do_install() {
         install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}${OEROOT}/scripts/poky-* ${D}${bindir}/
+        install -m 0755 ${WORKDIR}${POKYBASE}/scripts/poky-* ${D}${bindir}/
         install raw2flash.spitz ${D}${bindir}/
         install flash2raw.spitz ${D}${bindir}/
         ln -fs raw2flash.spitz ${D}${bindir}/raw2flash.akita