From fe73ea8c510877fe4e3c117985e8f3d0b79ddf1b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Apr 2011 12:26:25 +0100 Subject: Further cleanup of various poky references Signed-off-by: Richard Purdie --- meta/classes/core-image.bbclass | 6 +++--- meta/classes/imagetest-qemu.bbclass | 2 +- meta/classes/license.bbclass | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 832319a5ae..c8c6a57426 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -1,11 +1,11 @@ -# Common for Poky images +# Common code for generating core reference images # -# Copyright (C) 2007 OpenedHand LTD +# Copyright (C) 2007-2011 Linux Foundation LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -# IMAGE_FEATURES control content of images built with Poky. +# IMAGE_FEATURES control content of the core reference images # # By default we install task-core-boot and task-base packages - this gives us # working (console only) rootfs. diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass index e71403ece3..daeb8d8c9c 100644 --- a/meta/classes/imagetest-qemu.bbclass +++ b/meta/classes/imagetest-qemu.bbclass @@ -29,7 +29,7 @@ def qemuimagetest_main(d): import os """ - Test Controller for Poky Testing. + Test Controller for automated testing. """ casestr = re.compile(r'(?P\w+\b):(?P\w+$)') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 5e9ebe5ef4..d0a14187ff 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -1,4 +1,4 @@ -# Populates LICENSE_DIRECTORY as set in poky.conf with the license files as set by +# Populates LICENSE_DIRECTORY as set in distro config with the license files as set by # LIC_FILES_CHKSUM. # TODO: # - We should also enable the ability to put the generated license directory onto the @@ -31,7 +31,7 @@ python do_populate_lic() { destdir = os.path.join(bb.data.getVar('LICSSTATEDIR', d, True), pn) # The license files are located in S/LIC_FILE_CHECKSUM. srcdir = bb.data.getVar('S', d, True) - # Directory we store the generic licenses as set in poky.conf + # Directory we store the generic licenses as set in the distro configuration generic_directory = bb.data.getVar('COMMON_LICENSE_DIR', d, True) if not generic_directory: raise bb.build.FuncFailed("COMMON_LICENSE_DIR is unset. Please set this in your distro config") -- cgit 1.2.3-korg