From 75f3f9bb6d823faec884569400f9dcb6c28ef732 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 26 Sep 2008 08:55:15 +0000 Subject: Merged revisions 5177-5178,5181,5183,5185,5187 via svnmerge from https://svn.o-hand.com/repos/poky/trunk ........ r5177 | richard | 2008-09-10 23:29:43 +0100 (Wed, 10 Sep 2008) | 1 line package.bbclass: Adjust to handle split packages already being present in PACKAGES ........ r5178 | richard | 2008-09-10 23:32:22 +0100 (Wed, 10 Sep 2008) | 1 line gst-plugins-good: Remove bogus RPROVIDES and add to PACKAGES instead now the package class can handle this ........ r5181 | richard | 2008-09-11 12:00:49 +0100 (Thu, 11 Sep 2008) | 1 line poky-eabi.inc/poky-fixed-revisions.inc: Bump the matchbox-wm-2 revision and remove from the asneeded blacklist ........ r5183 | richard | 2008-09-11 16:43:25 +0100 (Thu, 11 Sep 2008) | 1 line eds-dbus: Add missing DEPENDS on libglade ........ r5185 | ross | 2008-09-11 17:07:38 +0100 (Thu, 11 Sep 2008) | 1 line eds-dbus: package the glade files into libedataserverui ........ r5187 | ross | 2008-09-11 17:57:47 +0100 (Thu, 11 Sep 2008) | 1 line eds-dbus: add libedataserverui to PACKAGES, fixing the borked packaging ........ git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5283 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/classes/package.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta/classes/package.bbclass') 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)) -- cgit v1.2.3-54-g00ecf