summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-10-22 12:47:11 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-10-22 12:47:11 +0000
commit26c25574952fe199195edb34e7344dd99e948c6c (patch)
tree8a4fe0730d3aa5a4c2fc05ab3bf0cd6ed672b443 /classes
parent8b2a88e02fc5f25cb4effa7234e08eb25ba19fe6 (diff)
package.bbclass: Fix split_packages to remove spurious references to -dbg packages. The way it selects the principle package name needs totally reworking as the current code is flawed but apply a workaround for now (this is unrelated to other changes to package.bbclass)
Diffstat (limited to 'classes')
-rw-r--r--classes/package.bbclass11
1 files changed, 9 insertions, 2 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index bc84b4ebf8..652b60e226 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -51,7 +51,14 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
objs.append(relpath)
if extra_depends == None:
- extra_depends = packages[0]
+ # This is *really* broken
+ mainpkg = packages[0]
+ # At least try and patch it up I guess...
+ if mainpkg.find('-dbg'):
+ mainpkg = mainpkg.replace('-dbg', '')
+ if mainpkg.find('-dev'):
+ mainpkg = mainpkg.replace('-dev', '')
+ extra_depends = mainpkg
for o in objs:
import re, stat
@@ -275,7 +282,7 @@ python package_do_split_locales() {
mainpkg = mainpkg.replace('-dbg', '')
if mainpkg.find('-dev'):
mainpkg = mainpkg.replace('-dev', '')
-
+
for l in locales:
ln = legitimize_package_name(l)
pkg = pn + '-locale-' + ln