diff options
author | Richard Purdie <richard@openedhand.com> | 2007-08-21 09:37:30 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-08-21 09:37:30 +0000 |
commit | 48fd37f5f9f2907d2c6f5d547e8471b232eadc90 (patch) | |
tree | 44b13b0d5d4381cce7cab8edd62fdd817d97ac6d /meta/classes/package.bbclass | |
parent | 005bf0112ced82ef5e98de4854c0fa749e52d4d6 (diff) | |
download | poky-48fd37f5f9f2907d2c6f5d547e8471b232eadc90.tar.gz |
packaging: Split deb and ipk creation into separate tasks so changing the packaging type means the new type of packages are automatically generated.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2526 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 6c25b0d7de..e1a7d91a9e 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -126,11 +126,6 @@ python () { | |||
126 | deps += " %s:do_populate_staging" % dep | 126 | deps += " %s:do_populate_staging" % dep |
127 | bb.data.setVarFlag('do_package', 'depends', deps, d) | 127 | bb.data.setVarFlag('do_package', 'depends', deps, d) |
128 | 128 | ||
129 | deps = bb.data.getVarFlag('do_package_write', 'depends', d) or "" | ||
130 | for dep in (bb.data.getVar('PACKAGE_EXTRA_DEPENDS', d, True) or "").split(): | ||
131 | deps += " %s:do_populate_staging" % dep | ||
132 | bb.data.setVarFlag('do_package_write', 'depends', deps, d) | ||
133 | |||
134 | # shlibs requires any DEPENDS to have already packaged for the *.list files | 129 | # shlibs requires any DEPENDS to have already packaged for the *.list files |
135 | bb.data.setVarFlag('do_package', 'deptask', 'do_package', d) | 130 | bb.data.setVarFlag('do_package', 'deptask', 'do_package', d) |
136 | } | 131 | } |
@@ -902,19 +897,7 @@ do_package[dirs] = "${D}" | |||
902 | addtask package before do_build after do_install | 897 | addtask package before do_build after do_install |
903 | 898 | ||
904 | 899 | ||
905 | 900 | EXPORT_FUNCTIONS do_package | |
906 | PACKAGE_WRITE_FUNCS ?= "read_subpackage_metadata" | ||
907 | |||
908 | python package_do_package_write () { | ||
909 | for f in (bb.data.getVar('PACKAGE_WRITE_FUNCS', d, 1) or '').split(): | ||
910 | bb.build.exec_func(f, d) | ||
911 | } | ||
912 | do_package_write[dirs] = "${D}" | ||
913 | addtask package_write before do_build after do_package | ||
914 | |||
915 | |||
916 | EXPORT_FUNCTIONS do_package do_package_write | ||
917 | |||
918 | 901 | ||
919 | # | 902 | # |
920 | # Helper functions for the package writing classes | 903 | # Helper functions for the package writing classes |