Skip to contentSkip to conversation

package.bbclass: fix execution order bug in emit_pkgdata

PATCH New AshishKumar Mishra 1 participant 1 message Jul 24

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package.bbclass: fix execution order bug in emit_pkgdata

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)

---
 meta/classes-global/package.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
meta/classes-global/package.bbclass +5 -2
index 67148fc1ac..0d1be442c1 100644
@@ -472,8 +472,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
@@ -564,9 +563,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)
 }
 
Signature · 1 line
2.43.0