diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-31 16:22:14 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-31 16:22:14 +0000 |
commit | eed008baf2a9ebdfe90d244208e85a7713e97700 (patch) | |
tree | a4988d0adb3529c55f4e65c24fda154f73669879 | |
parent | eb879e2ef815a7931fa76db6b12681eff57d9d02 (diff) | |
download | poky-eed008baf2a9ebdfe90d244208e85a7713e97700.tar.gz |
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 <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/package.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7e1f3f0325..856858c436 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1065,7 +1065,7 @@ PACKAGEFUNCS ?= "perform_packagecopy \ | |||
1065 | package_depchains \ | 1065 | package_depchains \ |
1066 | emit_pkgdata" | 1066 | emit_pkgdata" |
1067 | 1067 | ||
1068 | python package_do_package () { | 1068 | python do_package () { |
1069 | packages = (bb.data.getVar('PACKAGES', d, True) or "").split() | 1069 | packages = (bb.data.getVar('PACKAGES', d, True) or "").split() |
1070 | if len(packages) < 1: | 1070 | if len(packages) < 1: |
1071 | bb.debug(1, "No packages to build, skipping do_package") | 1071 | bb.debug(1, "No packages to build, skipping do_package") |
@@ -1110,8 +1110,6 @@ do_package_write[noexec] = "1" | |||
1110 | do_build[recrdeptask] += "do_package_write" | 1110 | do_build[recrdeptask] += "do_package_write" |
1111 | addtask package_write before do_build after do_package | 1111 | addtask package_write before do_build after do_package |
1112 | 1112 | ||
1113 | EXPORT_FUNCTIONS do_package do_package_write | ||
1114 | |||
1115 | # | 1113 | # |
1116 | # Helper functions for the package writing classes | 1114 | # Helper functions for the package writing classes |
1117 | # | 1115 | # |