Merge bk://openembedded@openembedded.bkbits.net/packages

into stealth.(none):/home/pb/oe/oe-packages

2004/07/29 10:58:21+01:00 (none)!pb
start fixing gnumeric package split code

BKrev: 4108ede0xCKqkQiiKk6i2CiMrb2u-g

diff --git a/classes/package.oeclass b/classes/package.oeclass
index 0322818..917ed2e 100644 (file)
--- a/classes/package.oeclass
+++ b/classes/package.oeclass
@@ -1,7 +1,7 @@
 def legitimize_package_name(s):
        return s.lower().replace('_', '-').replace('@', '+').replace(',', '+')
 
-def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None):
+def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False):
        import os, os.path, oe
 
        dvar = oe.data.getVar('D', d, 1)
@@ -37,7 +37,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
                if not m:
                        continue
                f = os.path.join(dvar + root, o)
-               if not stat.S_ISREG(os.lstat(f).st_mode):
+               mode = os.lstat(f).st_mode
+               if not (stat.S_ISREG(mode) or (allow_dirs and stat.S_ISDIR(mode))):
                        continue
                on = legitimize_package_name(m.group(1))
                pkg = output_pattern % on

diff --git a/gnumeric/gnumeric_1.3.1.oe b/gnumeric/gnumeric_1.3.1.oe
index f1240dc..55c1295 100644 (file)
--- a/gnumeric/gnumeric_1.3.1.oe
+++ b/gnumeric/gnumeric_1.3.1.oe
@@ -10,7 +10,7 @@ SRC_URI += 'file://workbook-control-gui-priv.h.patch;patch=1'
 EXTRA_OEMAKE_prepend = ' ORBIT_IDL=`which orbit-idl-2` '
 
 python populate_packages_prepend () {
-       gnumeric_libdir = oe.data.expand('${libdir}/gnumeric/${PV}', d)
+       gnumeric_libdir = oe.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
 
-       do_split_packages(d, gnumeric_libdir, '^([^/])/', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s')
+       do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
 }