classes-global/package: Ensure -src package is handled in signatures

populate_packages() will automatically insert a -src package if
PACKAGE_DEBUG_SPLIT_STYLE is "debug-with-srcpkg", even if there is not
-src package in PACKAGES. However, when the -src package is not in
PACKAGES, it is not accounted for in the task signatures which results
in errors.

[YOCTO #16238]

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass
index bd32a6ede52cf127b36e142b2f1259f750feeb96..e50a2e586e7d0369074e50485e122d7bf6db4030 100644 (file)
--- a/meta/classes-global/package.bbclass
+++ b/meta/classes-global/package.bbclass
@@ -443,6 +443,12 @@ PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDE
 def gen_packagevar(d, pkgvars="PACKAGEVARS"):
     ret = []
     pkgs = (d.getVar("PACKAGES") or "").split()
+    # populate_packages will add a -src package if debug-with-srcpkg which must
+    # be replicated here
+    if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-with-srcpkg':
+        src_pkg = "%s-src" % d.getVar("PN")
+        if src_pkg not in pkgs:
+            pkgs.append(src_pkg)
     vars = (d.getVar(pkgvars) or "").split()
     for v in vars:
         ret.append(v)