From eed008baf2a9ebdfe90d244208e85a7713e97700 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 31 Jan 2011 16:22:14 +0000 Subject: package.bbclass: Disable EXPORT_FUNCTIONS for do_package As discovered by Lianhao Lu and Kevin Tian: """ do_package checksum changes with switching the order In PACKAGE_CLASSES, e.g: From PACKAGE_CLASSES = "package_rpm package_ipk" To PACKAGE_CLASSES = "package_ipk package_rpm" This is undesired since the order only matters for final rootfs generation. The actual cause is related to how do_package is generated, which depends on when package.bbclass is first brought in. """ Since we never need the EXPORT_FUNCTIONS funcationality for do_package we just drop it which removes this problem and stablisised checksums. Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7e1f3f032..856858c43 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1065,7 +1065,7 @@ PACKAGEFUNCS ?= "perform_packagecopy \ package_depchains \ emit_pkgdata" -python package_do_package () { +python do_package () { packages = (bb.data.getVar('PACKAGES', d, True) or "").split() if len(packages) < 1: bb.debug(1, "No packages to build, skipping do_package") @@ -1110,8 +1110,6 @@ do_package_write[noexec] = "1" do_build[recrdeptask] += "do_package_write" addtask package_write before do_build after do_package -EXPORT_FUNCTIONS do_package do_package_write - # # Helper functions for the package writing classes # -- cgit v1.2.3