From 1b6f617f5f2776666001c43382eb3fb11d3bbdd8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 6 May 2010 08:58:20 +0100 Subject: [PATCH] classes/recipes: Catch populate_staging references that were missed in the first pass Signed-off-by: Richard Purdie --- classes/utils.bbclass | 2 +- recipes/linux/multi-kernel.inc | 2 +- recipes/zaurus-utils/zaurus-legacy-tar.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/utils.bbclass b/classes/utils.bbclass index d45adea33d..4e352e3b9c 100644 --- a/classes/utils.bbclass +++ b/classes/utils.bbclass @@ -85,7 +85,7 @@ def setup_checksum_deps(d): if d.getVar("PN", True) != "shasum-native": depends = d.getVarFlag("do_fetch", "depends") or "" d.setVarFlag("do_fetch", "depends", "%s %s" % - (depends, "shasum-native:do_populate_staging")) + (depends, "shasum-native:do_populate_sysroot")) def base_chk_file_checksum(localpath, src_uri, expected_md5sum, expected_sha256sum, data): strict_checking = bb.data.getVar("OE_STRICT_CHECKSUMS", data, True) diff --git a/recipes/linux/multi-kernel.inc b/recipes/linux/multi-kernel.inc index 94183d9fcd..3e11928155 100644 --- a/recipes/linux/multi-kernel.inc +++ b/recipes/linux/multi-kernel.inc @@ -87,6 +87,6 @@ do_deploy_append () { } -do_compileconfigs[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_staging virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}:do_populate_staging" +do_compileconfigs[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}:do_populate_sysroot" addtask compileconfigs after do_patch before do_configure diff --git a/recipes/zaurus-utils/zaurus-legacy-tar.bb b/recipes/zaurus-utils/zaurus-legacy-tar.bb index 0b9a31acaf..00d6cce2f0 100644 --- a/recipes/zaurus-utils/zaurus-legacy-tar.bb +++ b/recipes/zaurus-utils/zaurus-legacy-tar.bb @@ -20,4 +20,4 @@ do_deploy() { } # package_stagefile_shell needs to run before populate_staging for packaged-staging -addtask deploy before do_populate_staging after do_compile +addtask deploy before do_populate_sysroot after do_compile -- 2.47.2