summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-24 16:12:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-25 08:01:09 +0000
commit458496829bb3c9d63fde3aecde5a5e84762fb994 (patch)
tree3516454723dc1413c79546abceea1c7df6075c51 /meta/classes
parent9161a6f8213f7a29357696de618c9870e3afd83a (diff)
downloadpoky-458496829bb3c9d63fde3aecde5a5e84762fb994.tar.gz
package: Drop do_package_write task
The reasons this task was introduced are lost in the mists of time. It allowed for the a single "package_write" task instead of spelling out the explicit package backends, however in all but one case we do that anyway. As such as might as well give in and delete the task, converting that single reference into explicit dependencies. This gives bitbake a bit less work to to when processing the runqueue since there are less tasks (but more dependencies in some cases). (From OE-Core rev: cf70e15f063716f3227d467ab1f4bfc0018286f6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package.bbclass12
-rw-r--r--meta/classes/package_deb.bbclass2
-rw-r--r--meta/classes/package_ipk.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass2
4 files changed, 6 insertions, 12 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 297d962266..0018a62f3e 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -235,9 +235,6 @@ python () {
235 235
236 # shlibs requires any DEPENDS to have already packaged for the *.list files 236 # shlibs requires any DEPENDS to have already packaged for the *.list files
237 d.appendVarFlag('do_package', 'deptask', " do_packagedata") 237 d.appendVarFlag('do_package', 'deptask', " do_packagedata")
238
239 elif not bb.data.inherits_class('image', d):
240 d.setVar("PACKAGERDEPTASK", "")
241} 238}
242 239
243def splitdebuginfo(file, debugfile, debugsrcdir, sourcefile, d): 240def splitdebuginfo(file, debugfile, debugsrcdir, sourcefile, d):
@@ -2003,15 +2000,6 @@ python do_packagedata_setscene () {
2003} 2000}
2004addtask do_packagedata_setscene 2001addtask do_packagedata_setscene
2005 2002
2006# Dummy task to mark when all packaging is complete
2007do_package_write () {
2008 :
2009}
2010do_package_write[noexec] = "1"
2011PACKAGERDEPTASK = "do_package_write"
2012do_build[recrdeptask] += "${PACKAGERDEPTASK}"
2013addtask package_write before do_build after do_packagedata
2014
2015# 2003#
2016# Helper functions for the package writing classes 2004# Helper functions for the package writing classes
2017# 2005#
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index b9d797833a..a16d57e855 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -311,3 +311,5 @@ addtask package_write_deb before do_package_write after do_packagedata do_packag
311 311
312PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" 312PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot"
313PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" 313PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot"
314
315do_build[recrdeptask] += "do_package_write_deb"
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 7cf2c8af2d..aab31e5296 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -257,3 +257,5 @@ addtask package_write_ipk before do_package_write after do_packagedata do_packag
257 257
258PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" 258PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot"
259PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" 259PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot"
260
261do_build[recrdeptask] += "do_package_write_ipk"
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index f267b8a4cb..bce564808f 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -736,3 +736,5 @@ addtask package_write_rpm before do_package_write after do_packagedata do_packag
736 736
737PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" 737PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot"
738PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot" 738PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot"
739
740do_build[recrdeptask] += "do_package_write_rpm"