.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=799

rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch

@@ -7,14 +7,12 @@ Subject: rules: add lid switch of ARM based Chromebook as a power switch to
  src/login/70-power-switch.rules | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/src/login/70-power-switch.rules b/src/login/70-power-switch.rules
-index 36fb827..d925ab7 100644
 --- a/src/login/70-power-switch.rules
 +++ b/src/login/70-power-switch.rules
-@@ -9,5 +9,6 @@ ACTION=="remove", GOTO="power_switch_end"
+@@ -11,5 +11,6 @@ SUBSYSTEM=="input", KERNEL=="event*", SU
- 
- SUBSYSTEM=="input", KERNEL=="event*", SUBSYSTEMS=="acpi", TAG+="power-switch"
  SUBSYSTEM=="input", KERNEL=="event*", KERNELS=="thinkpad_acpi", TAG+="power-switch"
+ SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="twl4030_pwrbutton", TAG+="power-switch"
+ SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="tps65217_pwr_but", TAG+="power-switch"
 +SUBSYSTEM=="input", KERNEL=="event*", KERNELS=="gpio-keys.8", TAG+="power-switch"
  
  LABEL="power_switch_end"

systemd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 15 08:48:36 UTC 2014 - werner@suse.de
+
+- Adapt patch
+  rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch
+  to make it work even with patch #438 and #439
+
 -------------------------------------------------------------------
 Tue Oct 14 16:23:51 UTC 2014 - werner@suse.de
 
@@ -9,8 +16,8 @@ Tue Oct 14 16:23:51 UTC 2014 - werner@suse.de
 Tue Oct 14 16:19:42 UTC 2014 - werner@suse.de
 
 - Add upstream patches
-  0001-units-introduce-network-pre.target-as-place-to-hook-.patch
   0001-keymap-Fix-touchpad-toggle-on-Toshiba-Satellite-P75-.patch
+  0001-units-introduce-network-pre.target-as-place-to-hook-.patch
   0002-keymap-Fix-touchpad-toggle-key-on-Asus-laptops.patch
   0003-sd-bus-check-return-value-of-vasprintf.patch
   0004-core-map-the-rescue-argument-to-rescue.target.patch
@@ -20,10 +27,10 @@ Tue Oct 14 16:19:42 UTC 2014 - werner@suse.de
 Tue Oct 14 16:18:36 UTC 2014 - werner@suse.de
 
 - Add upstream patches 
-  0001-sd-event-don-t-require-a-signal-event-source-to-be-e.patch
   0001-virt-detect-that-we-are-running-inside-the-docker-co.patch
   0002-bootchart-use-n-a-if-PRETTY_NAME-is-not-found.patch
   0003-fileio-label-return-error-when-writing-fails.patch
+  0001-sd-event-don-t-require-a-signal-event-source-to-be-e.patch
   0004-sd-event-check-the-value-of-received-signal.patch
   0005-sd-id128-do-stricter-checking-of-random-boot-id.patch
 

systemd.spec

@@ -1391,9 +1391,6 @@ cp %{SOURCE7} m4/
 %patch27 -p1
 %patch28 -p1
 %patch37 -p1
-%ifarch %arm
-%patch38 -p1
-%endif
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
@@ -1728,6 +1725,9 @@ cp %{SOURCE7} m4/
 %patch437 -p0
 %patch438 -p0
 %patch439 -p0
+%ifarch %arm
+%patch38 -p1
+%endif
 %patch440 -p0
 %patch441 -p0
 %patch442 -p0