SHA256
1
0
forked from pool/systemd
Dr. Werner Fink 2014-06-05 13:40:35 +00:00 committed by Git OBS Bridge
parent d23dfde37d
commit b496dc68e4
5 changed files with 67 additions and 2 deletions

View File

@ -0,0 +1,25 @@
From 4c02dd7153f970244950b5e00f7bdfea8d2ff0be Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Wed, 4 Jun 2014 17:55:14 +0200
Subject: [PATCH] hwdb: fix case-sensitive match
---
hwdb/60-keyboard.hwdb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb
index d053766..c7ff4e4 100644
--- hwdb/60-keyboard.hwdb
+++ hwdb/60-keyboard.hwdb
@@ -870,7 +870,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnOQO*Inc.*:pnOQO*Model*2*:pvr*
###########################################################
# Plantronics .Audio 626 DSP
-keyboard:usb:v047fpC006*
+keyboard:usb:v047FpC006*
KEYBOARD_KEY_b002f=f20 # Microphone mute button; should be micmute
###########################################################
--
1.7.9.2

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jun 5 13:29:20 UTC 2014 - werner@suse.de
- Add upstream patch 0001-hwdb-fix-case-sensitive-match.patch
-------------------------------------------------------------------
Thu Jun 5 13:23:24 UTC 2014 - werner@suse.de
- Add dynamic detection of util-linux version to be able to
disable the fsck option -l for version less than 2.25.0
-------------------------------------------------------------------
Thu Jun 5 08:06:02 UTC 2014 - werner@suse.de

View File

@ -530,6 +530,8 @@ Patch266: 0006-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
Patch267: 0007-keyboard-add-Plantronics-.Audio-mute-button.patch
# PATCHFIX-UPSTREAM added at 2014/06/03
Patch268: 0001-build-sys-use-glibc-s-xattr-support-instead-of-requi.patch
# PATCHFIX-UPSTREAM added at 2014/06/05
Patch269: 0001-hwdb-fix-case-sensitive-match.patch
# UDEV PATCHES
# ============
@ -586,7 +588,7 @@ Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
# PATCHFIX-UPSTREAM added at 2014/06/03
Patch1024: 1024-udev-always-close-lock-file-descriptor.patch
%define ul_version %(rpm -q util-linux --qf '%%{VERSION}' | awk -F . '{printf "%2.2d%2.2d%2.2d", $1, $2, $3}')
%define util_linux_version %(rpm -q util-linux --qf '%%{VERSION}' | awk -F . '{printf "%%2.2d%%2.2d%%2.2d", $1, $2, $3}')
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -1013,6 +1015,7 @@ cp %{SOURCE7} m4/
%patch266 -p0
%patch267 -p0
%patch268 -p0
%patch269 -p0
# udev patches
%patch1001 -p1
@ -1044,6 +1047,12 @@ cp %{SOURCE7} m4/
# ensure generate files are removed
rm -f units/emergency.service
# disable "-l" option for fsck if it does not support new locking scheme
# compare with commit c343be283b7152554bac0c02493a4e1759c163f7
%if 0%{util_linux_version} < 22500
sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
%endif
%build
autoreconf -fiv
# prevent pre-generated and distributed files from re-building

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jun 5 13:29:20 UTC 2014 - werner@suse.de
- Add upstream patch 0001-hwdb-fix-case-sensitive-match.patch
-------------------------------------------------------------------
Thu Jun 5 13:23:24 UTC 2014 - werner@suse.de
- Add dynamic detection of util-linux version to be able to
disable the fsck option -l for version less than 2.25.0
-------------------------------------------------------------------
Thu Jun 5 08:06:02 UTC 2014 - werner@suse.de

View File

@ -525,6 +525,8 @@ Patch266: 0006-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
Patch267: 0007-keyboard-add-Plantronics-.Audio-mute-button.patch
# PATCHFIX-UPSTREAM added at 2014/06/03
Patch268: 0001-build-sys-use-glibc-s-xattr-support-instead-of-requi.patch
# PATCHFIX-UPSTREAM added at 2014/06/05
Patch269: 0001-hwdb-fix-case-sensitive-match.patch
# UDEV PATCHES
# ============
@ -581,7 +583,7 @@ Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
# PATCHFIX-UPSTREAM added at 2014/06/03
Patch1024: 1024-udev-always-close-lock-file-descriptor.patch
%define ul_version %(rpm -q util-linux --qf '%%{VERSION}' | awk -F . '{printf "%2.2d%2.2d%2.2d", $1, $2, $3}')
%define util_linux_version %(rpm -q util-linux --qf '%%{VERSION}' | awk -F . '{printf "%%2.2d%%2.2d%%2.2d", $1, $2, $3}')
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -1008,6 +1010,7 @@ cp %{SOURCE7} m4/
%patch266 -p0
%patch267 -p0
%patch268 -p0
%patch269 -p0
# udev patches
%patch1001 -p1
@ -1039,6 +1042,12 @@ cp %{SOURCE7} m4/
# ensure generate files are removed
rm -f units/emergency.service
# disable "-l" option for fsck if it does not support new locking scheme
# compare with commit c343be283b7152554bac0c02493a4e1759c163f7
%if 0%{util_linux_version} < 22500
sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
%endif
%build
autoreconf -fiv
# prevent pre-generated and distributed files from re-building