summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2014-11-24 15:26:53 +0100
committerPatrick Ohly <patrick.ohly@intel.com>2014-11-24 21:29:51 +0100
commitb900b104eb434ebdbfdfb5c0ea0a1838026814bc (patch)
tree18e5abdf4acc4608883ae926bc5b4ecfddf3621c
parent6c1088e8bc184a1fe0f2b8a513b5f68a1599d430 (diff)
downloadmeta-tizen-b900b104eb434ebdbfdfb5c0ea0a1838026814bc.tar.gz
meta-tizen-b900b104eb434ebdbfdfb5c0ea0a1838026814bc.tar.bz2
meta-tizen-b900b104eb434ebdbfdfb5c0ea0a1838026814bc.zip
manifests: simplify MANIFESTFILES support
With the enhanced copying from commit 022b671545, tizen_copy_manifest() can be called for all recipes, thus making the extra "inherit manifest" redundant. The class still exists, it just doesn't do anything anymore. "inherit manifest" can be removed again from spec2yocto and the class deleted after re-generating the auto-generated .bb files. Change-Id: I4ce9547dbee14c9c0872ec7ff837bb3652557ec2 Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-rw-r--r--meta-tizen-common-base/classes/manifest.bbclass4
-rw-r--r--meta-tizen-common-base/classes/metatizen.bbclass1
2 files changed, 2 insertions, 3 deletions
diff --git a/meta-tizen-common-base/classes/manifest.bbclass b/meta-tizen-common-base/classes/manifest.bbclass
index cee0d980..8bdbdc42 100644
--- a/meta-tizen-common-base/classes/manifest.bbclass
+++ b/meta-tizen-common-base/classes/manifest.bbclass
@@ -1,3 +1 @@
-do_package_prepend() {
- bb.build.exec_func('tizen_copy_manifest', d)
-}
+# Obsolete, remove once auto-generated code no longer has "inherit manifest".
diff --git a/meta-tizen-common-base/classes/metatizen.bbclass b/meta-tizen-common-base/classes/metatizen.bbclass
index ce6c5ea1..3977f47b 100644
--- a/meta-tizen-common-base/classes/metatizen.bbclass
+++ b/meta-tizen-common-base/classes/metatizen.bbclass
@@ -29,6 +29,7 @@ def package_rpm_extra_pkgdata(splitname, spec_file, d):
# Copies manifest files from source to packages-split. Necessary because
# source is not always available during packaging (for example, when
# using sstate), only $PKGDEST is.
+PACKAGESPLITFUNCS_append = " tizen_copy_manifest"
python tizen_copy_manifest () {
dest = d.getVar('S', True)
dvar = d.getVar('PKGDEST', True)