From 0d9809c4ecf8ef45214cd2a26223ba52031fde75 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Mon, 5 Dec 2011 14:56:27 -0600 Subject: [PATCH] populate_sdk.bbclass: remap packages when generating sdk tarball This fixes the issue below: | Generating solve db for /local/home/mattsm/git/poky/build_p4080ds_release/tmp/deploy/rpm/all... | total: 1 0.000000 MB 0.093784 secs | fingerprint: 9 0.000012 MB 0.000252 secs | install: 3 0.000000 MB 0.039092 secs | dbadd: 3 0.000000 MB 0.034837 secs | dbget: 12 0.000000 MB 0.000062 secs | dbput: 3 0.009532 MB 0.002731 secs | readhdr: 31 0.019160 MB 0.000084 secs | hdrload: 15 0.027924 MB 0.000116 secs | hdrget: 494 0.000000 MB 0.000691 secs | Processing task-core-standalone-sdk-target... | Processing glib-2.0... | Unable to find package glib-2.0 (glib-2.0)! | ERROR: Function 'do_populate_sdk' failed (see /local/home/mattsm/git/poky/build_p4080ds_release/tmp/work/ppce500mc-fsl-linux/fsl-toolchain-1.0-r6/temp/log.do_populate_sdk.16975 for further information) If you have: TOOLCHAIN_TARGET_TASK += "glib-2.0" The package name was not getting remapped correctly for the do_populate_sdk case. (From OE-Core rev: 0b803ac3627c238aa7d19a23b7621f55779f2557) (From OE-Core rev: e1a07a5fcba93b3ab127c7c6588cab5799a5df45) Signed-off-by: Matthew McClintock Signed-off-by: Richard Purdie --- meta/classes/populate_sdk.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass index 1ef72cfeb2..5aa8e92b87 100644 --- a/meta/classes/populate_sdk.bbclass +++ b/meta/classes/populate_sdk.bbclass @@ -18,6 +18,13 @@ PID = "${@os.getpid()}" EXCLUDE_FROM_WORLD = "1" +python () { + # If we don't do this we try and run the mapping hooks while parsing which is slow + # bitbake should really provide something to let us know this... + if bb.data.getVar('BB_WORKERCONTEXT', d, True) is not None: + runtime_mapping_rename("TOOLCHAIN_TARGET_TASK", d) +} + fakeroot do_populate_sdk() { rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT}