Patchwork [2/2] UBUNTU: [Config] build-in uinput module

login
register
mail settings
Submitter Leann Ogasawara
Date Aug. 20, 2010, 10:46 p.m.
Message ID <1282344373.4512.1285.camel@emiko>
Download mbox | patch
Permalink /patch/62326/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - Aug. 20, 2010, 10:46 p.m.
On Wed, 2010-08-18 at 07:05 -0600, Tim Gardner wrote:
> On 08/18/2010 03:54 AM, Jeremy Kerr wrote:
> > The bluetooth userspace tools can use /dev/uinput to report events
> > from bluetooth input devices (eg volume up/down controls on a BT
> > headset).
> >
> > However, the uinput module is not loaded automatically, as there is no
> > physical device to match on. Consequently, we don't have the uinput
> > device node present when the bluetooth daemon starts, and no synthesized
> > BT events are reported.
> >
> > Instead of compiling uinput as a module, this change builds it into the
> > kernel, so it is always available.
> >
> > BugLink: http://bugs.launchpad.net/bugs/584812
> >
> > Signed-off-by: Jeremy Kerr<jeremy.kerr@canonical.com>
> >
> > ---
> >   debian.master/config/config.common.ports  |    2 +-
> >   debian.master/config/config.common.ubuntu |    2 +-
> >   2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
> > index a983a52..95bb3c8 100644
> > --- a/debian.master/config/config.common.ports
> > +++ b/debian.master/config/config.common.ports
> > @@ -1515,7 +1515,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=m
> >   CONFIG_INPUT_TWL4030_VIBRA=m
> >   CONFIG_INPUT_WM831X_ON=m
> >   CONFIG_INPUT_YEALINK=m
> > -CONFIG_INPUT_UINPUT=m
> > +CONFIG_INPUT_UINPUT=y
> >   CONFIG_IOMMU_API=y
> >   CONFIG_IOMMU_HELPER=y
> >   CONFIG_IOSAPIC=y
> > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> > index 9e40bac..7a84e2b 100644
> > --- a/debian.master/config/config.common.ubuntu
> > +++ b/debian.master/config/config.common.ubuntu
> > @@ -1966,7 +1966,7 @@ CONFIG_INPUT_SPARSEKMAP=m
> >   CONFIG_INPUT_TABLET=y
> >   CONFIG_INPUT_TWL4030_PWRBUTTON=m
> >   CONFIG_INPUT_TWL4030_VIBRA=m
> > -CONFIG_INPUT_UINPUT=m
> > +CONFIG_INPUT_UINPUT=y
> >   CONFIG_INPUT_WINBOND_CIR=m
> >   CONFIG_INPUT_WISTRON_BTNS=m
> >   CONFIG_INPUT_WM831X_ON=m
> >
> 
> Again, the implication is that this patch is for Maverick. Should this 
> config option be added to the enforcer so we don't lose it in subsequent 
> releases?
> 
> Acked-by: Tim Gardner <tim.gardner@canonical.com>

I've gone ahead and added this to the config enforcer as well.

>From c87b9e3698d8a5a358c398103c173c842dfa4800 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 20 Aug 2010 12:03:22 -0700
Subject: [PATCH] UBUNTU: [Config] Add CONFIG_INPUT_UINPUT=y to config enforcer

BugLink: http://bugs.launchpad.net/bugs/584812

The uinput module is not loaded automatically, as there is no physical
device to match on.  Ensure that it's built into the kernel so that it's
always available.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 debian.master/config/enforce |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Patch

diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index 644caee..4e5e7f8 100644
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -55,3 +55,6 @@  value CONFIG_FRAMEBUFFER_CONSOLE y
 # UbuntuSpec:foundations-m-grub2-boot-framebuffer
 (( arch i386 | arch amd64 ) & value CONFIG_FB_VESA y) | \
 	value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA
+
+# Build in uinput module so that it's always available (LP: 584812)
+value CONFIG_INPUT_UINPUT y