diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-09-10 22:29:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-09-10 22:29:43 +0000 |
| commit | 9a21f65eef1bec2e5308a65e5780271279f4f632 (patch) | |
| tree | 13049c5340d4e0d5771e63897fb61fd4aad60a72 | |
| parent | 81824cd18da9f9927d06ff1ec3e68e93100ccf1e (diff) | |
| download | openembedded-core-9a21f65eef1bec2e5308a65e5780271279f4f632.tar.gz openembedded-core-9a21f65eef1bec2e5308a65e5780271279f4f632.tar.bz2 openembedded-core-9a21f65eef1bec2e5308a65e5780271279f4f632.zip | |
package.bbclass: Adjust to handle split packages already being present in PACKAGES
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5177 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/classes/package.bbclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1732a114f4..a267403295 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -79,6 +79,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst packages = [pkg] + packages else: packages.append(pkg) + oldfiles = bb.data.getVar('FILES_' + pkg, d, 1) + if not oldfiles: the_files = [os.path.join(root, o)] if aux_files_pattern: if type(aux_files_pattern) is list: @@ -106,9 +108,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst if postrm: bb.data.setVar('pkg_postrm_' + pkg, postrm, d) else: - oldfiles = bb.data.getVar('FILES_' + pkg, d, 1) - if not oldfiles: - bb.fatal("Package '%s' exists but has no files" % pkg) bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d) if callable(hook): hook(f, pkg, file_regex, output_pattern, m.group(1)) |