diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-03-04 13:45:03 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-05 12:28:07 +0000 |
| commit | 8de0616825ed1b238b3486077af6897834bcb62d (patch) | |
| tree | c7438382b98f3f72d4a080a662cfc492fea07581 /meta/classes | |
| parent | 9d590d714c67ffcf1cd3f3844f5b102f72c2d006 (diff) | |
| download | openembedded-core-8de0616825ed1b238b3486077af6897834bcb62d.tar.gz openembedded-core-8de0616825ed1b238b3486077af6897834bcb62d.tar.bz2 openembedded-core-8de0616825ed1b238b3486077af6897834bcb62d.zip | |
sstate.bbclass: consider postinstall dependencies too
When checking the dependencies in setscene_depvalid(), make sure we also
consider those dependencies needed when running the postinstalls on
host.
[YOCTO #3918]
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/sstate.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 118a28a54d..ef12d97583 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -640,6 +640,10 @@ def setscene_depvalid(task, taskdependees, notneeded, d): if x in ["quilt-native", "autoconf-native", "automake-native", "gnu-config-native", "libtool-native", "pkgconfig-native", "gcc-cross", "binutils-cross", "gcc-cross-initial"]: return True return False + def isPostInstDep(x): + if x in ["qemu-native", "gdk-pixbuf-native", "gtk+-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native"]: + return True + return False # We can skip these "safe" dependencies since the aren't runtime dependencies, just build time if isSafeDep(taskdependees[task][0]) and taskdependees[task][1] == "do_populate_sysroot": @@ -658,8 +662,10 @@ def setscene_depvalid(task, taskdependees, notneeded, d): # do_package_write_* and do_package doesn't need do_package if taskdependees[task][1] == "do_package" and taskdependees[dep][1] in ['do_package', 'do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata']: continue - # do_package_write_* and do_package doesn't need do_populate_sysroot + # do_package_write_* and do_package doesn't need do_populate_sysroot, unless is a postinstall dependency if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata']: + if isPostInstDep(taskdependees[task][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: + return False continue # Native/Cross packages don't exist and are noexec anyway if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata']: |