Patchwork kernel-module-split: append space to RDEPENDS

login
register
mail settings
Submitter Martin Jansa
Date March 6, 2013, 12:52 a.m.
Message ID <1362531151-1094-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/45567/
State Accepted
Commit 750d475a917cfde03d49cc350a3e1123bda5b1c6
Headers show

Comments

Martin Jansa - March 6, 2013, 12:52 a.m.
* it was generating invalid RDEPENDS when KERNEL_MODULES_META_PACKAGE had
  RDEPENDS set already without trailing space

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/kernel-module-split.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Khem Raj - March 6, 2013, 2:50 a.m.
On Tue, Mar 5, 2013 at 4:52 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * it was generating invalid RDEPENDS when KERNEL_MODULES_META_PACKAGE had
>   RDEPENDS set already without trailing space
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

Yes this fixes my regression

Tested-By: Khem Raj <raj.khem@gmail.com>

> ---
>  meta/classes/kernel-module-split.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
> index aa0c499..45639c6 100644
> --- a/meta/classes/kernel-module-split.bbclass
> +++ b/meta/classes/kernel-module-split.bbclass
> @@ -173,7 +173,7 @@ python split_kernel_module_packages () {
>      modules = do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION", True)))
>      if modules:
>          metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE', True)
> -        d.appendVar('RDEPENDS_' + metapkg, ' '.join(modules))
> +        d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
>
>      # If modules-load.d and modprobe.d are empty at this point, remove them to
>      # avoid warnings. removedirs only raises an OSError if an empty
> --
> 1.8.1.5
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index aa0c499..45639c6 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -173,7 +173,7 @@  python split_kernel_module_packages () {
     modules = do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION", True)))
     if modules:
         metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE', True)
-        d.appendVar('RDEPENDS_' + metapkg, ' '.join(modules))
+        d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
 
     # If modules-load.d and modprobe.d are empty at this point, remove them to
     # avoid warnings. removedirs only raises an OSError if an empty