Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba645765e5 | ||
|
|
ad25e21266 |
2 changed files with 58 additions and 8 deletions
48
udev.git-617746e09795575c6258dd075ee7f0a44ce61e1e.patch
Normal file
48
udev.git-617746e09795575c6258dd075ee7f0a44ce61e1e.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
From: Kay Sievers <kay.sievers@vrfy.org>
|
||||
Date: Thu, 4 Aug 2011 21:25:03 +0000 (+0200)
|
||||
Subject: rules: move input_id to default rules
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=617746e09795575c6258dd075ee7f0a44ce61e1e
|
||||
|
||||
rules: move input_id to default rules
|
||||
|
||||
On Tue, Aug 2, 2011 at 10:56, Thomas Bächler <thomas@archlinux.org> wrote:
|
||||
> Commit c49df20758e0f22778cfc93b598f2929f4c86272 prevented udev from
|
||||
> creating broken symlinks for bluetooth hid devices. Unfortunately,
|
||||
> it also removed the ID_INPUT=1 and ID_INPUT_{KEY,MOUSE}=1 properties
|
||||
> from those devices. Xorg relies on these properties for cold- and
|
||||
> hotplugging of input devices.
|
||||
---
|
||||
|
||||
diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
|
||||
index f5b181d..30267fe 100644
|
||||
--- a/rules/rules.d/50-udev-default.rules
|
||||
+++ b/rules/rules.d/50-udev-default.rules
|
||||
@@ -20,6 +20,7 @@ KERNEL=="null|zero|full|random|urandom", MODE="0666"
|
||||
KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640"
|
||||
|
||||
# input
|
||||
+SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{program}="input_id %p"
|
||||
KERNEL=="mouse*|mice|event*", MODE="0640"
|
||||
KERNEL=="ts[0-9]*|uinput", MODE="0640"
|
||||
KERNEL=="js[0-9]*", MODE="0644"
|
||||
@@ -50,7 +51,7 @@ SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*", GROUP="video"
|
||||
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video"
|
||||
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
|
||||
|
||||
-# libusb device nodes
|
||||
+# 'libusb' device nodes
|
||||
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
|
||||
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
|
||||
|
||||
diff --git a/rules/rules.d/60-persistent-input.rules b/rules/rules.d/60-persistent-input.rules
|
||||
index 65a6381..e7611f5 100644
|
||||
--- a/rules/rules.d/60-persistent-input.rules
|
||||
+++ b/rules/rules.d/60-persistent-input.rules
|
||||
@@ -4,7 +4,6 @@ ACTION=="remove", GOTO="persistent_input_end"
|
||||
SUBSYSTEM!="input", GOTO="persistent_input_end"
|
||||
SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end"
|
||||
|
||||
-ENV{ID_INPUT}=="", IMPORT{program}="input_id %p"
|
||||
SUBSYSTEMS=="usb", ENV{ID_BUS}=="", IMPORT{program}="usb_id --export %p"
|
||||
|
||||
# determine class name for persistent symlinks
|
||||
18
udev.spec
18
udev.spec
|
|
@ -5,14 +5,15 @@
|
|||
Summary: A rule-based device node and kernel event manager
|
||||
Name: udev
|
||||
Version: 173
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Base
|
||||
Provides: udev-persistent = %{version}-%{release}
|
||||
Obsoletes: udev-persistent < 0:030-5
|
||||
Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
|
||||
|
||||
Patch1: udev-olpc-keymap-update.patch
|
||||
Patch10: udev-olpc-keymap-update.patch
|
||||
Patch11: udev.git-617746e09795575c6258dd075ee7f0a44ce61e1e.patch
|
||||
|
||||
ExclusiveOS: Linux
|
||||
URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
|
||||
|
|
@ -106,18 +107,16 @@ This package contains the header and pkg-config files for developing
|
|||
glib-based applications using libudev functionality.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%setup -q
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
|
||||
%build
|
||||
# prevent man pages from re-building (xmlto)
|
||||
find . -name "*.[1-8]" -exec touch '{}' \;
|
||||
|
||||
export V=1
|
||||
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now"
|
||||
|
||||
# prevent man pages from re-building (xmlto)
|
||||
find . -name "*.[1-8]" -exec touch '{}' \;
|
||||
export V=1
|
||||
|
||||
libtoolize -f -c
|
||||
%configure --with-selinux --prefix=%{_prefix} --exec-prefix="" \
|
||||
|
|
@ -305,6 +304,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
|
||||
|
||||
%changelog
|
||||
* Mon Aug 29 2011 Kay Sievers <kay@redhat.com> 173-2
|
||||
- fix bluetooth input device handling (brc#733862)
|
||||
|
||||
* Mon Aug 29 2011 Daniel Drake <dsd@laptop.org> 173-2
|
||||
- Update OLPC XO keymap
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue