rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Also update hwdb_parse.py

Browse Source 
This is needed because an additional property was added and the
tests fail otherwise. I think adding of the property is OK, it's
fully backwards compatible.

Also use %if 0 syntax to make it easy to copy&paste the commands.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-06-15 11:25:17 -04:00
parent f4a67616bd
commit 1d06cbf3d4
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hwdb.patch
View File

@ -277,3 +277,22 @@ index 82a4b7a575..12d97de69b 100644
+touchpad:usb:v045ep07* +touchpad:usb:v045ep07*
+ ID_INPUT_TOUCHPAD_INTEGRATION=internal + ID_INPUT_TOUCHPAD_INTEGRATION=internal
+ +
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
index b57e6f75aa..adf8a1963e 100755
--- a/hwdb/parse_hwdb.py
+++ b/hwdb/parse_hwdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
#
# This file is part of systemd. It is distrubuted under the MIT license, see
@@ -112,6 +112,8 @@ def property_grammar():
('ID_INPUT_TOUCHPAD_INTEGRATION', Or(('internal', 'external'))),
('XKB_FIXED_LAYOUT', STRING),
('XKB_FIXED_VARIANT', STRING),
+ ('KEYBOARD_LED_NUMLOCK', Literal('0')),
+ ('KEYBOARD_LED_CAPSLOCK', Literal('0')),
('ACCEL_MOUNT_MATRIX', mount_matrix),
)
fixed_props = [Literal(name)('NAME') - Suppress('=') - val('VALUE')

9
systemd.spec
View File

@ -40,10 +40,11 @@ Source10: systemd-udev-trigger-no-reload.conf
Source11: 20-grubby.install Source11: 20-grubby.install
Source12: https://raw.githubusercontent.com/systemd/systemd/1000522a60ceade446773c67031b47a566d4a70d/src/login/systemd-user.m4 Source12: https://raw.githubusercontent.com/systemd/systemd/1000522a60ceade446773c67031b47a566d4a70d/src/login/systemd-user.m4
# GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v233..v233-stable %if 0
# i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done|xclip GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v233..v233-stable
i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done|xclip
# GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} hwdb/[67]* > hwdb.patch GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[67]* hwdb/parse_hwdb.py > hwdb.patch
%endif
Patch0001: 0001-dhcp-server-add-two-missing-OOM-checks.patch Patch0001: 0001-dhcp-server-add-two-missing-OOM-checks.patch
Patch0002: 0002-import-bump-image-size-safety-limit-for-machinectl-p.patch Patch0002: 0002-import-bump-image-size-safety-limit-for-machinectl-p.patch