From 29425caf484ee79028563b5b28273e5757604107 Mon Sep 17 00:00:00 2001 From: Bruno Randolf Date: Wed, 22 Sep 2004 13:43:53 +0000 Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into null.(none):/data/mtx/oe/oe.write/packages 2004/09/22 15:41:59+02:00 (none)!br1 perl build for mipsel. package all modules in seperate ipkgs. BKrev: 41518199E61VILo1bjmTICJhj4-fBg --- classes/package.oeclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/package.oeclass b/classes/package.oeclass index cdebea9c6b..cb87267e9e 100644 --- a/classes/package.oeclass +++ b/classes/package.oeclass @@ -1,7 +1,7 @@ def legitimize_package_name(s): - return s.lower().replace('_', '-').replace('@', '+').replace(',', '+') + return s.lower().replace('_', '-').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, allow_dirs=False, prepend=False): +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, prepend=False, match_path=False): import os, os.path, oe dvar = oe.data.getVar('D', d, 1) @@ -33,7 +33,11 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst for o in objs: import re, stat - m = re.match(file_regex, os.path.basename(o)) + if match_path: + m = re.match(file_regex, o) + else: + m = re.match(file_regex, os.path.basename(o)) + if not m: continue f = os.path.join(dvar + root, o) -- cgit v1.2.3