diff options
-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): | |||
640 | if x in ["quilt-native", "autoconf-native", "automake-native", "gnu-config-native", "libtool-native", "pkgconfig-native", "gcc-cross", "binutils-cross", "gcc-cross-initial"]: | 640 | if x in ["quilt-native", "autoconf-native", "automake-native", "gnu-config-native", "libtool-native", "pkgconfig-native", "gcc-cross", "binutils-cross", "gcc-cross-initial"]: |
641 | return True | 641 | return True |
642 | return False | 642 | return False |
643 | def isPostInstDep(x): | ||
644 | if x in ["qemu-native", "gdk-pixbuf-native", "gtk+-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native"]: | ||
645 | return True | ||
646 | return False | ||
643 | 647 | ||
644 | # We can skip these "safe" dependencies since the aren't runtime dependencies, just build time | 648 | # We can skip these "safe" dependencies since the aren't runtime dependencies, just build time |
645 | if isSafeDep(taskdependees[task][0]) and taskdependees[task][1] == "do_populate_sysroot": | 649 | if isSafeDep(taskdependees[task][0]) and taskdependees[task][1] == "do_populate_sysroot": |
@@ -658,8 +662,10 @@ def setscene_depvalid(task, taskdependees, notneeded, d): | |||
658 | # do_package_write_* and do_package doesn't need do_package | 662 | # do_package_write_* and do_package doesn't need do_package |
659 | 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']: | 663 | 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']: |
660 | continue | 664 | continue |
661 | # do_package_write_* and do_package doesn't need do_populate_sysroot | 665 | # do_package_write_* and do_package doesn't need do_populate_sysroot, unless is a postinstall dependency |
662 | 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']: | 666 | 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']: |
667 | if isPostInstDep(taskdependees[task][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: | ||
668 | return False | ||
663 | continue | 669 | continue |
664 | # Native/Cross packages don't exist and are noexec anyway | 670 | # Native/Cross packages don't exist and are noexec anyway |
665 | if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata']: | 671 | if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata']: |