mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-02 01:18:08 +01:00
a67db8fcbd
Ever since an old patch version, it has (for reasonable security reasons) not supported patched with ../ in the filename. Many of our patches have been relying on this behaviour being OK, because we start off with an ancient patch version that didn't perform such checks. As soon as we need this behaviour after we build a newer patch though, we will have problems. So, let's change the policy. Patches are relative to where tarballs are extracted, rather than the "working directory" - e.g. have patches for `coreutils-9.4/src/cp.c` instead of `src/cp.c`. Keeping this consistent has a few implications; - patches are applied from the build/ directory in bash era now, with `-p0` - when patches are manually applied in the bash era, use `-p` as required, usually `-p1` - in kaem era where patches are always manually applied, `-p1` is used
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
|
|
|
|
SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
Name the union in i2c_hid_desc_override, to avoid unknown field error
|
|
|
|
--- linux-4.14.336/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c.bak 2024-02-15 13:27:20.177877726 +0100
|
|
+++ linux-4.14.336/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c 2024-02-15 15:11:15.787482938 +0100
|
|
@@ -18,7 +18,7 @@
|
|
union {
|
|
struct i2c_hid_desc *i2c_hid_desc;
|
|
uint8_t *i2c_hid_desc_buffer;
|
|
- };
|
|
+ } u;
|
|
uint8_t *hid_report_desc;
|
|
unsigned int hid_report_desc_size;
|
|
uint8_t *i2c_name;
|
|
@@ -36,6 +36,7 @@
|
|
*/
|
|
|
|
static const struct i2c_hid_desc_override sipodev_desc = {
|
|
+ .u = {
|
|
.i2c_hid_desc_buffer = (uint8_t [])
|
|
{0x1e, 0x00, /* Length of descriptor */
|
|
0x00, 0x01, /* Version of descriptor */
|
|
@@ -52,6 +53,7 @@
|
|
0x06, 0x00, /* Version ID */
|
|
0x00, 0x00, 0x00, 0x00 /* Reserved */
|
|
},
|
|
+ },
|
|
|
|
.hid_report_desc = (uint8_t [])
|
|
{0x05, 0x01, /* Usage Page (Desktop), */
|
|
@@ -422,7 +424,7 @@
|
|
if (strcmp(override->i2c_name, i2c_name))
|
|
return NULL;
|
|
|
|
- return override->i2c_hid_desc;
|
|
+ return override->u.i2c_hid_desc;
|
|
}
|
|
|
|
char *i2c_hid_get_dmi_hid_report_desc_override(uint8_t *i2c_name,
|