Patchwork kernel.bbclass: blacklist 'kernel-misc' from kernel-modules

login
register
mail settings
Submitter Koen Kooi
Date March 23, 2011, 7:55 p.m.
Message ID <1300910131-9827-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/1735/
State New, archived
Headers show

Comments

Koen Kooi - March 23, 2011, 7:55 p.m.
From: Koen Kooi <koen@dominion.thruhere.net>

When 'kernel-misc' is empty do_rootfs will fail when including 'kernel-modules'

The proper fix would be to have a whitelist for the 'kernel-modules' meta-pkg

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/classes/kernel.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Khem Raj - March 23, 2011, 8:18 p.m.
On Wed, Mar 23, 2011 at 12:55 PM,  <koen@dominion.thruhere.net> wrote:
> From: Koen Kooi <koen@dominion.thruhere.net>
>
> When 'kernel-misc' is empty do_rootfs will fail when including 'kernel-modules'
>
> The proper fix would be to have a whitelist for the 'kernel-modules' meta-pkg
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

Worked nicely.

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

> ---
>  meta/classes/kernel.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 3eb6659..9f014d4 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -429,7 +429,7 @@ python populate_packages_prepend () {
>        metapkg = "kernel-modules"
>        bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
>        bb.data.setVar('FILES_' + metapkg, "", d)
> -       blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf' ]
> +       blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'kernel-misc' ]
>        for l in module_deps.values():
>                for i in l:
>                        pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
> --
> 1.6.6.1
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Richard Purdie - March 23, 2011, 11:05 p.m.
On Wed, 2011-03-23 at 13:18 -0700, Khem Raj wrote:
> On Wed, Mar 23, 2011 at 12:55 PM,  <koen@dominion.thruhere.net> wrote:
> > From: Koen Kooi <koen@dominion.thruhere.net>
> >
> > When 'kernel-misc' is empty do_rootfs will fail when including 'kernel-modules'
> >
> > The proper fix would be to have a whitelist for the 'kernel-modules' meta-pkg
> >
> > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> 
> Worked nicely.
> 
> Tested-by: Khem Raj <raj.khem@gmail.com>
> 
> > ---
> >  meta/classes/kernel.bbclass |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> > index 3eb6659..9f014d4 100644
> > --- a/meta/classes/kernel.bbclass
> > +++ b/meta/classes/kernel.bbclass
> > @@ -429,7 +429,7 @@ python populate_packages_prepend () {
> >        metapkg = "kernel-modules"
> >        bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
> >        bb.data.setVar('FILES_' + metapkg, "", d)
> > -       blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf' ]
> > +       blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'kernel-misc' ]
> >        for l in module_deps.values():
> >                for i in l:
> >                        pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))

Merged to master, thanks!

Richard

Patch

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3eb6659..9f014d4 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -429,7 +429,7 @@  python populate_packages_prepend () {
 	metapkg = "kernel-modules"
 	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
 	bb.data.setVar('FILES_' + metapkg, "", d)
-	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf' ]
+	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'kernel-misc' ]
 	for l in module_deps.values():
 		for i in l:
 			pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))