-----Original Message-----
From: [email protected]
[mailto:[email protected]] On Behalf Of Xin Zhong
Sent: Wednesday, March 16, 2011 11:16 AM
To: [email protected]
Subject: [meego-commits] 14848: Changes to Trunk:Testing/udev
Hi,
I have made the following changes to udev in project Trunk:Testing. Please
review and accept ASAP.
Thank You,
Xin Zhong
[This message was auto-generated]
---
Request #14848:
submit: devel:udev/udev(r3)(update) -> Trunk:Testing/udev
Message:
Modify udev-162-keymap-for-lenovo-ideapad.patch to fix BMC#14198
State: new 2011-03-15T20:15:33 zhongxin
Comment: None
changes files:
--------------
--- udev.changes
+++ udev.changes
@@ -0,0 +1,6 @@
+* Tue Mar 15 2011 Neo Fang<[email protected]> - 161
+- Modify Lenovo-S10-3t keymap definition to fix BMC#14198
+
+* Thu Mar 03 2011 Neo Fang<[email protected]> - 161
+- Trigger add rtc in start_udev to fix BMC#13902
+
spec files:
-----------
other changes:
--------------
++++++ start_udev
--- start_udev
+++ start_udev
@@ -181,6 +181,7 @@
|| die 1 "$progname: udevtrigger failed to start" 1>&2
/sbin/udevadm settle $udevtimeout \
|| echo "$progname: failed waiting for queue, backgrounding" 1>&2
+ /sbin/udevadm trigger --action=add --subsystem-match="rtc"
/sbin/udevadm control --env STARTUP=
)&
exit 0
++++++ udev-162-keymap-for-lenovo-ideapad.patch
--- udev-162-keymap-for-lenovo-ideapad.patch
+++ udev-162-keymap-for-lenovo-ideapad.patch
@@ -1,56 +1,35 @@
-From 9cd075e35b8f660c75b0d72d4bea496fd6459f29 Mon Sep 17 00:00:00
2001
-From: David Woodhouse<[email protected]>
-Date: Thu, 12 Aug 2010 17:04:55 +0100
-Subject: [PATCH] Add keymap for Lenovo IdeaPad S10-3
-
-Tested on S10-3, but presumably applicable to all IdeaPads.
-
-Signed-off-by: Martin Pitt<[email protected]>
----
- Makefile.am | 1 +
- extras/keymap/95-keymap.rules | 2 ++
- extras/keymap/keymaps/lenovo-ideapad | 7 +++++++
- 3 files changed, 10 insertions(+), 0 deletions(-)
- create mode 100644 extras/keymap/keymaps/lenovo-ideapad
-
-diff --git a/Makefile.am b/Makefile.am
-index c16b259..77df6ab 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -537,6 +537,7 @@ dist_udevkeymap_DATA = \
- extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
- extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
- extras/keymap/keymaps/lenovo-3000 \
-+ extras/keymap/keymaps/lenovo-ideapad \
- extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
- extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
- extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
-diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules
-index 13b5571..2241422 100644
---- a/extras/keymap/95-keymap.rules
-+++ b/extras/keymap/95-keymap.rules
-@@ -65,6 +65,8 @@ ENV{DMI_VENDOR}=="Compaq*",
ATTR{[dmi/id]product_name}=="*E500*|*Evo N*", RUN+="
+diff -urN udev-161.orig/extras/keymap/95-keymap.rules
udev-161/extras/keymap/95-keymap.rules
+--- udev-161.orig/extras/keymap/95-keymap.rules 2010-08-02
18:37:55.000000000 +0800
++++ udev-161/extras/keymap/95-keymap.rules 2011-03-07
10:08:18.000000000 +0800
+@@ -65,6 +65,8 @@
ENV{DMI_VENDOR}=="LENOVO*",
ATTR{[dmi/id]product_version}=="*3000*", RUN+="keymap $name
lenovo-3000"
ENV{DMI_VENDOR}=="LENOVO*",
ATTR{[dmi/id]product_version}=="ThinkPad X6*",
ATTR{[dmi/id]product_version}=="* Tablet" RUN+="keymap $name
lenovo-thinkpad_x6_tablet"
ENV{DMI_VENDOR}=="LENOVO*",
ATTR{[dmi/id]product_version}=="ThinkPad X200 Tablet*",
ATTR{[dmi/id]product_version}=="* Tablet" RUN+="keymap $name
lenovo-thinkpad_x200_tablet"
+ENV{DMI_VENDOR}=="LENOVO*",
ATTR{[dmi/id]product_version}=="*IdeaPad*", RUN+="keymap $name
lenovo-ideapad"
-+ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_name}=="S10-*",
RUN+="keymap $name lenovo-ideapad"
++ENV{DMI_VENDOR}=="LENOVO*",
ATTR{[dmi/id]product_version}=="*S10-*", RUN+="keymap $name
lenovo-ideapad"
ENV{DMI_VENDOR}=="Hewlett-Packard*", RUN+="keymap $name
hewlett-packard"
ENV{DMI_VENDOR}=="Hewlett-Packard*",
ATTR{[dmi/id]product_name}=="*[tT][aA][bB][lL][eE][tT]*", RUN+="keymap
$name hewlett-packard-tablet"
-diff --git a/extras/keymap/keymaps/lenovo-ideapad
b/extras/keymap/keymaps/lenovo-ideapad
-new file mode 100644
-index 0000000..d5f2567
---- /dev/null
-+++ b/extras/keymap/keymaps/lenovo-ideapad
-@@ -0,0 +1,7 @@
+diff -urN udev-161.orig/extras/keymap/keymaps/lenovo-ideapad
udev-161/extras/keymap/keymaps/lenovo-ideapad
+--- udev-161.orig/extras/keymap/keymaps/lenovo-ideapad 1970-01-01
08:00:00.000000000 +0800
++++ udev-161/extras/keymap/keymaps/lenovo-ideapad 2011-03-07
10:09:52.000000000 +0800
+@@ -0,0 +1,8 @@
+# Key codes observed on S10-3, assumed valid on other IdeaPad models
+0x81 rfkill # does nothing in BIOS
+0x83 display_off # BIOS toggles screen state
+0xB9 brightnessup # does nothing in BIOS
+0xBA brightnessdown # does nothing in BIOS
+0xF1 camera # BIOS toggles camera power
-+0xf2 unknown # trackpad enable/disable (does nothing in BIOS)
---
-1.7.2.1
-
++0xF2 f22 # trackpad enable
++0xF3 f22 # trackpad disable
+diff -urN udev-161.orig/Makefile.am udev-161/Makefile.am
+--- udev-161.orig/Makefile.am 2010-08-11 21:28:51.000000000 +0800
++++ udev-161/Makefile.am 2011-03-07 10:07:28.000000000 +0800
+@@ -537,6 +537,7 @@
+ extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+ extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
+ extras/keymap/keymaps/lenovo-3000 \
++ extras/keymap/keymaps/lenovo-ideapad \
+ extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+ extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
+ extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
_______________________________________________
MeeGo-commits mailing list
[email protected]
http://lists.meego.com/listinfo/meego-commits
