summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-10 22:29:43 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-10 22:29:43 +0000
commit9a21f65eef1bec2e5308a65e5780271279f4f632 (patch)
tree13049c5340d4e0d5771e63897fb61fd4aad60a72 /meta
parent81824cd18da9f9927d06ff1ec3e68e93100ccf1e (diff)
downloadpoky-9a21f65eef1bec2e5308a65e5780271279f4f632.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass5
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
79 packages = [pkg] + packages 79 packages = [pkg] + packages
80 else: 80 else:
81 packages.append(pkg) 81 packages.append(pkg)
82 oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
83 if not oldfiles:
82 the_files = [os.path.join(root, o)] 84 the_files = [os.path.join(root, o)]
83 if aux_files_pattern: 85 if aux_files_pattern:
84 if type(aux_files_pattern) is list: 86 if type(aux_files_pattern) is list:
@@ -106,9 +108,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
106 if postrm: 108 if postrm:
107 bb.data.setVar('pkg_postrm_' + pkg, postrm, d) 109 bb.data.setVar('pkg_postrm_' + pkg, postrm, d)
108 else: 110 else:
109 oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
110 if not oldfiles:
111 bb.fatal("Package '%s' exists but has no files" % pkg)
112 bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d) 111 bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d)
113 if callable(hook): 112 if callable(hook):
114 hook(f, pkg, file_regex, output_pattern, m.group(1)) 113 hook(f, pkg, file_regex, output_pattern, m.group(1))