From 4d609d502161137620c4b1901cc225f9e871c3dc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Apr 2011 16:56:03 +0100 Subject: Replace POKYBASE with COREBASE (From OE-Core rev: 607a7657715f6fcba467a4e55ba64f41f4e13a15) Signed-off-by: Richard Purdie --- meta/classes/imagetest-qemu.bbclass | 2 +- meta/classes/poky-image.bbclass | 4 ++-- meta/classes/rootfs_rpm.bbclass | 2 +- meta/classes/sanity.bbclass | 6 ++--- meta/conf/bitbake.conf | 2 +- meta/conf/layer.conf | 6 ++--- meta/recipes-bsp/formfactor/formfactor_0.0.bb | 4 ++-- .../ppp-dialin/ppp-dialin_0.1.bb | 4 ++-- .../feed-config/poky-feed-config-opkg_1.0.bb | 2 +- meta/recipes-core/images/poky-image-live.inc | 4 ++-- .../initrdscripts/initramfs-boot_1.0.bb | 2 +- .../initrdscripts/initramfs-live-boot_1.0.bb | 2 +- .../initrdscripts/initramfs-live-install_1.0.bb | 2 +- meta/recipes-core/meta/external-python-tarball.bb | 4 ++-- meta/recipes-core/meta/meta-environment.bb | 4 ++-- meta/recipes-core/meta/meta-ide-support.bb | 4 ++-- meta/recipes-core/meta/meta-toolchain.bb | 4 ++-- meta/recipes-core/tasks/task-base.bb | 4 ++-- meta/recipes-core/tasks/task-cross-canadian.bb | 4 ++-- meta/recipes-core/tasks/task-poky-boot.bb | 4 ++-- meta/recipes-core/tasks/task-poky-nfs.bb | 4 ++-- meta/recipes-core/tasks/task-poky-sdk.bb | 4 ++-- meta/recipes-core/tasks/task-poky-ssh-dropbear.bb | 4 ++-- meta/recipes-core/tasks/task-poky-ssh-openssh.bb | 4 ++-- .../tasks/task-poky-standalone-sdk-target.bb | 4 ++-- meta/recipes-core/tasks/task-poky-tools.bb | 4 ++-- meta/recipes-core/tasks/task-sdk-host.bb | 4 ++-- meta/recipes-devtools/dpkg/run-postinsts_1.0.bb | 4 ++-- .../installer/adt-installer_1.0.bb | 4 ++-- meta/recipes-devtools/opkg/opkg-collateral.bb | 2 +- meta/recipes-devtools/opkg/opkg-config-base_1.0.bb | 2 +- .../qemu/qemu-helper-nativesdk_1.0.bb | 26 +++++++++++----------- meta/recipes-extended/tasks/task-poky-basic.bb | 4 ++-- meta/recipes-extended/tasks/task-poky-lsb.bb | 4 ++-- meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb | 4 ++-- .../tasks/task-poky-standalone-gmae-sdk-target.bb | 4 ++-- meta/recipes-graphics/tasks/task-poky-clutter.bb | 4 ++-- .../xorg-xserver/xserver-xf86-config_0.1.bb | 2 +- .../recipes-kernel/modutils/modutils-collateral.bb | 2 +- .../gstreamer/gst-meta-base_0.10.bb | 4 ++-- meta/recipes-qt/tasks/task-poky-qt.bb | 4 ++-- meta/recipes-qt/tasks/task-qte-toolchain-target.bb | 4 ++-- .../tasks/task-poky-apps-x11-pimlico.bb | 4 ++-- meta/recipes-sato/tasks/task-poky-x11-sato.bb | 4 ++-- meta/recipes-sato/tasks/task-poky.bb | 4 ++-- scripts/creat-lsb-image | 2 +- scripts/poky-setup-builddir | 2 +- scripts/qemuimage-testlib | 2 +- scripts/qemuimage-tests/sanity/boot | 2 +- scripts/qemuimage-tests/sanity/compiler | 2 +- scripts/qemuimage-tests/sanity/connman | 2 +- scripts/qemuimage-tests/sanity/dmesg | 2 +- scripts/qemuimage-tests/sanity/rpm_query | 2 +- scripts/qemuimage-tests/sanity/scp | 2 +- scripts/qemuimage-tests/sanity/shutdown | 2 +- scripts/qemuimage-tests/sanity/ssh | 2 +- scripts/qemuimage-tests/sanity/zypper_help | 2 +- scripts/qemuimage-tests/sanity/zypper_search | 2 +- 58 files changed, 105 insertions(+), 105 deletions(-) diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass index 8301df8452..e71403ece3 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 a261a6a8b8..54cf57f0db 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 04ccabd5f4..aa1b339550 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 b5170a55c7..2f3357bf74 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) 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/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/recipes-bsp/formfactor/formfactor_0.0.bb b/meta/recipes-bsp/formfactor/formfactor_0.0.bb index 683a4ef8c0..28624a6c2c 100644 --- 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 f57597d80c..5cdba2ba11 100644 --- 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 2d0e0a87ec..9b005d0e61 100644 --- 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 4743d92916..a1b0e1a3dc 100644 --- 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 8be0193c66..b372fddbba 100644 --- 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 83e3be947d..f6a6a8a4cb 100644 --- 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 82a1e44405..c599be5c58 100644 --- 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 52f15f640a..6bc837b8ce 100644 --- 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 b20068fc51..351cbf0cfd 100644 --- 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 faec7fa6b2..7a3c053a07 100644 --- 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 7a241da4d0..94c8a91a72 100644 --- 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 138e617c92..599fa4bd16 100644 --- 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 1bb2b57cb3..1840301892 100644 --- 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 e9c8e8a02e..7166761ce4 100644 --- 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 44ef97360e..a18d2e3ab8 100644 --- 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 8d5455a3c9..b1e52c96ca 100644 --- 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 870d2d9853..4f2ab4425d 100644 --- 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 8df5d9bf9c..5f828b55b9 100644 --- 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 4dde5b4bec..3835ac7d6a 100644 --- 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 f009a75ec9..29f5d4afa1 100644 --- 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 1837d9a0cf..5ec40b140c 100644 --- 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 72cb65ff84..f15243b60a 100644 --- 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 7e82c92677..b70fb9e8cf 100644 --- 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 01e912f8bc..e3e0b5f2ef 100644 --- 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 c2bf3473c2..3a559cb57d 100644 --- 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 effcabaf40..10d3e64ae8 100644 --- 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 80eac0f748..68c996dc88 100644 --- 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 71a683a164..b56c07beb2 100644 --- 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 d009e4ebe4..b5c2fda159 100644 --- 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 7dcad61943..ad6270adf4 100644 --- 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 5fe23b92f0..555a9ee0f0 100644 --- 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 4344736330..035a462619 100644 --- 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 01966244ab..919b86f95d 100644 --- 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 ada7f69219..5bb67cce4b 100644 --- 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 da960db5b0..762dff8e3e 100644 --- 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 98fe47794f..659df47fa1 100644 --- 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 8b75d218c4..7bb26fc04c 100644 --- 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 699c6f88e3..c10a32a45d 100644 --- 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 72d4d0d9cb..4f7bc3d31e 100644 --- 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 3802e2f344..1dc48dd54c 100755 --- 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 5890eb0da3..aabf358e13 100755 --- 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 c3cf7c1ec2..5318ca636c 100644 --- 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 d3414d33d3..cf8aafbc50 100755 --- 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 d224f33571..ef0700732d 100755 --- 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 d46ef0a890..0c62902f87 100755 --- 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 06a99485ca..aed29e05eb 100755 --- 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 d42c4c49be..dd652bd998 100755 --- 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 ce7279cdf8..b0b693d0c8 100755 --- 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 22662ab257..d55c859410 100755 --- 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 e4a20dc73d..181296b0b5 100755 --- 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 6dafe5e1fd..94f82c4340 100755 --- 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 b96cbdad66..e687eadfb7 100755 --- 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 -- cgit v1.2.3-54-g00ecf