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
This commit is contained in:
parent
81824cd18d
commit
9a21f65eef
|
@ -79,6 +79,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
|
||||||
packages = [pkg] + packages
|
packages = [pkg] + packages
|
||||||
else:
|
else:
|
||||||
packages.append(pkg)
|
packages.append(pkg)
|
||||||
|
oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
|
||||||
|
if not oldfiles:
|
||||||
the_files = [os.path.join(root, o)]
|
the_files = [os.path.join(root, o)]
|
||||||
if aux_files_pattern:
|
if aux_files_pattern:
|
||||||
if type(aux_files_pattern) is list:
|
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:
|
if postrm:
|
||||||
bb.data.setVar('pkg_postrm_' + pkg, postrm, d)
|
bb.data.setVar('pkg_postrm_' + pkg, postrm, d)
|
||||||
else:
|
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)
|
bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d)
|
||||||
if callable(hook):
|
if callable(hook):
|
||||||
hook(f, pkg, file_regex, output_pattern, m.group(1))
|
hook(f, pkg, file_regex, output_pattern, m.group(1))
|
||||||
|
|
Loading…
Reference in New Issue