Merge pull request #14129 from jlxawk/hwdb-sensor-jumper-ezpad-go

hwdb: add accel sensor entry for Jumper EZpad Go
test-proc-cmdline: disable EFI-dependent tests when EFI is disabled
2019-11-25 11:59:38 +01:00 · 2019-11-25 08:37:09 +01:00 · 2019-11-25 08:32:22 +01:00 · 2019-11-25 08:31:39 +01:00 · 2019-11-24 08:54:38 +08:00
4 changed files with 12 additions and 2 deletions
--- a/hwdb.d/60-sensor.hwdb
+++ b/hwdb.d/60-sensor.hwdb
@ -353,6 +353,10 @@ sensor:modalias:acpi:BOSC0200*:dmi:bvnINSYDECorp.:bvrjumperx.T87.KFBNEE*
 sensor:modalias:acpi:BOSC0200*:dmi:*:svnJumper:pnEZpad:*:rvr.A006:*
 ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, -1, 0; 0, 0, 1

+# EZpad Go
+sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:*:svnjumper:pnEZpad:*:ct31:*
+ ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
+
 #########################################
 # Kazam
 #########################################
--- a/hwdb.d/70-mouse.hwdb
+++ b/hwdb.d/70-mouse.hwdb
@ -441,10 +441,14 @@ mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:1017:
 mouse:usb:v046dp1017:name:Logitech Anywhere MX:
 MOUSE_WHEEL_CLICK_ANGLE=20

-# Logitech Anywhere MX 2S
+# Logitech Anywhere MX 2S (via Logitech Unifying Receiver)
 mouse:usb:v046dp406a:name:Logitech MX Anywhere 2S:
 MOUSE_WHEEL_CLICK_ANGLE=20

+# Logitech Anywhere MX 2S (via Bluetooth)
+mouse:bluetooth:v046dpb01a:name:MX Anywhere 2S Mouse:
+ MOUSE_WHEEL_CLICK_ANGLE=20
+
 # Logitech MX Master
 # Horiz wheel has 14 stops, angle is rounded up
 mouse:usb:v046dp4060:name:Logitech MX Master:
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@ -1113,7 +1113,7 @@
        </varlistentry>

        <varlistentry>
-          <term><varname>ConditionArchitecture=</varname></term>
+          <term><varname>ConditionVirtualization=</varname></term>

          <listitem><para>Check whether the system is executed in a virtualized environment and optionally
          test whether it is a specific implementation. Takes either boolean value to check if being executed
--- a/src/test/test-proc-cmdline.c
+++ b/src/test/test-proc-cmdline.c
@ -173,6 +173,7 @@ static void test_proc_cmdline_get_bool(void) {
        assert_se(putenv((char*) "SYSTEMD_PROC_CMDLINE=") == 0);
        assert_se(putenv((char*) "SYSTEMD_EFI_OPTIONS=foo_bar bar-waldo=1 x_y-z=0 quux=miep\nda=yes\nthe=1") == 0);

+#if ENABLE_EFI
        assert_se(proc_cmdline_get_bool("", &value) == -EINVAL);
        assert_se(proc_cmdline_get_bool("abc", &value) == 0 && value == false);
        assert_se(proc_cmdline_get_bool("foo_bar", &value) > 0 && value == true);
@ -186,6 +187,7 @@ static void test_proc_cmdline_get_bool(void) {
        assert_se(proc_cmdline_get_bool("quux", &value) == -EINVAL && value == false);
        assert_se(proc_cmdline_get_bool("da", &value) > 0 && value == true);
        assert_se(proc_cmdline_get_bool("the", &value) > 0 && value == true);
+#endif
 }

 static void test_proc_cmdline_get_key_many(void) {
Author	SHA1	Message	Date
hadess	1a92b3f2ec	Merge pull request #14129 from jlxawk/hwdb-sensor-jumper-ezpad-go hwdb: add accel sensor entry for Jumper EZpad Go	2019-11-25 11:59:38 +01:00
Mike Gilbert	e05b7c0955	test-proc-cmdline: disable EFI-dependent tests when EFI is disabled Fixes: https://github.com/systemd/systemd/issues/14116	2019-11-25 08:37:09 +01:00
Haochen Tong	9e94246cad	hwdb: add bluetooth entry for Logitech MX Anywhere 2S	2019-11-25 08:32:22 +01:00
Steve Ramage	81a4108180	man: restores ConditionVirtualization documentation (#14138 ) Resolves #14137. Error introduced in `337b733449`.	2019-11-25 08:31:39 +01:00
J. Xing	9627fc633f	hwdb: add accel sensor entry for Jumper EZpad Go This commit fix the accelerometer orientation on the Jumper EZpad Go tablet. The tablet does not have its product name filled in dmi table, make the match string a bit generic. Here we assume that the use of a KIOX000A + bios-vendor + chassis-type combo is unique enough to match the currently available product in Jumper's x86 tablet series. For future reference, as in 2019, the tablet has a dmialias of: dmi:bvnAmericanMegatrendsInc.:bvrZB-BI-11.6-SF133AR200-059-J \ :bd05/21/2019:svnjumper:pnEZpad:pvrTobefilledbyO.E.M.:rvnTob \ efilledbyO.E.M.:rnTobefilledbyO.E.M.:rvrTobefilledbyO.E.M.:c \ vnTobefilledbyO.E.M.:ct31:cvrTobefilledbyO.E.M.:	2019-11-24 08:54:38 +08:00