diff options
author | David Reyna <David.Reyna@windriver.com> | 2019-10-01 16:17:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-02 14:42:13 +0100 |
commit | 97a5762be1c8da4092ba7e51dbd46a0c8b9764e8 (patch) | |
tree | 818385e05ed2f4919a434ab54f552a1513cdaa3e /bitbake/lib/bb/ui | |
parent | 1ca006c7b6036a6fbd40d8a2efaa6f41c0658479 (diff) | |
download | poky-97a5762be1c8da4092ba7e51dbd46a0c8b9764e8.tar.gz |
bitbake: toaster: improve warnings when adding dependency to packages
Some of the objects that bitbake reports to Toaster as dependencies to packages
are known objects that are not packages, for example library files and kernel
modules. In the Toaster logs, mark these as "Info" instead of "Warning".
[YOCTO #13386]
(Bitbake rev: 0d66f644d647900e8f5afa526a6d9cee687c41cc)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index f2151c2d47..5cbca97f3f 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -646,6 +646,9 @@ class ORMWrapper(object): | |||
646 | Target_Installed_Package.objects.create(target = target_obj, package = packagedict[p]['object']) | 646 | Target_Installed_Package.objects.create(target = target_obj, package = packagedict[p]['object']) |
647 | 647 | ||
648 | packagedeps_objs = [] | 648 | packagedeps_objs = [] |
649 | pattern_so = re.compile(r'.*\.so(\.\d*)?$') | ||
650 | pattern_lib = re.compile(r'.*\-suffix(\d*)?$') | ||
651 | pattern_ko = re.compile(r'^kernel-module-.*') | ||
649 | for p in packagedict: | 652 | for p in packagedict: |
650 | for (px,deptype) in packagedict[p]['depends']: | 653 | for (px,deptype) in packagedict[p]['depends']: |
651 | if deptype == 'depends': | 654 | if deptype == 'depends': |
@@ -654,6 +657,13 @@ class ORMWrapper(object): | |||
654 | tdeptype = Package_Dependency.TYPE_TRECOMMENDS | 657 | tdeptype = Package_Dependency.TYPE_TRECOMMENDS |
655 | 658 | ||
656 | try: | 659 | try: |
660 | # Skip known non-package objects like libraries and kernel modules | ||
661 | if pattern_so.match(px) or pattern_lib.match(px): | ||
662 | logger.info("Toaster does not add library file dependencies to packages (%s,%s)", p, px) | ||
663 | continue | ||
664 | if pattern_ko.match(px): | ||
665 | logger.info("Toaster does not add kernel module dependencies to packages (%s,%s)", p, px) | ||
666 | continue | ||
657 | packagedeps_objs.append(Package_Dependency( | 667 | packagedeps_objs.append(Package_Dependency( |
658 | package = packagedict[p]['object'], | 668 | package = packagedict[p]['object'], |
659 | depends_on = packagedict[px]['object'], | 669 | depends_on = packagedict[px]['object'], |