emit_pkgdata was previously part of the PACKAGEFUNCS list.
Because other layers and recipes often append custom cleanup or processing
functions to PACKAGEFUNCS , those ended up running after
emit_pkgdata

To fix this, pull emit_pkgdata out of PACKAGEFUNCS and call it explicitly
at the very end of do_package() ensuring it always runs last.

(From OE-Core rev aa85baff9ebdd3f932811c3b43d1918c38373cb9)

Signed-off-by: AshishKumar Mishra <[email protected]>
---
 meta/classes-global/package.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes-global/package.bbclass 
b/meta/classes-global/package.bbclass
index aa1eb5e901..ffe3ed93ef 100644
--- a/meta/classes-global/package.bbclass
+++ b/meta/classes-global/package.bbclass
@@ -468,8 +468,7 @@ PACKAGEFUNCS += " \
                 package_do_shlibs \
                 package_do_pkgconfig \
                 read_shlibdeps \
-                package_depchains \
-                emit_pkgdata"
+                package_depchains"
 
 python do_package () {
     # Change the following version to cause sstate to invalidate the package
@@ -561,9 +560,13 @@ python do_package () {
             for file in files:
                 pkgfiles[pkg].append(walkroot + os.sep + file)
 
+
+    # We want emit_pkgdata to run last, after everything
     for f in (d.getVar('PACKAGEFUNCS') or '').split():
         bb.build.exec_func(f, d)
 
+    bb.build.exec_func("emit_pkgdata", d)
+
     oe.qa.exit_if_errors(d)
 }
 
-- 
2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#241662): 
https://lists.openembedded.org/g/openembedded-core/message/241662
Mute This Topic: https://lists.openembedded.org/mt/120392420/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to