diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-20 16:56:03 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-21 00:29:29 +0100 |
| commit | 4d609d502161137620c4b1901cc225f9e871c3dc (patch) | |
| tree | 3bbb3286b831645fd29cae868b18b738ec508126 /meta/classes | |
| parent | 8ceb769eab14066c9a5fc6a68284de9c1f5637fe (diff) | |
| download | ast2050-yocto-poky-4d609d502161137620c4b1901cc225f9e871c3dc.zip ast2050-yocto-poky-4d609d502161137620c4b1901cc225f9e871c3dc.tar.gz | |
Replace POKYBASE with COREBASE
(From OE-Core rev: 607a7657715f6fcba467a4e55ba64f41f4e13a15)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/imagetest-qemu.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/poky-image.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/sanity.bbclass | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass index 8301df8..e71403e 100644 --- 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 a261a6a..54cf57f 100644 --- 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 04ccabd..aa1b339 100644 --- 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 b5170a5..2f3357b 100644 --- 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) |
