a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From fd204f628021c9bb13870a8c983d9c63e1a53ebb Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Mon, 23 Mar 2020 11:04:11 +0100
|
|
Subject: [PATCH] src/evemu.c: fix build with kernels >= 4.16
|
|
|
|
Commit 30973c0b forgot to update all occurences of input_event, this
|
|
will result in the following build failure with kernel >= 4.16:
|
|
|
|
evemu.c: In function 'write_event_desc':
|
|
evemu.c:753:23: error: 'const struct input_event' has no member named 'time'; did you mean 'type'?
|
|
time = millis(&ev->time);
|
|
^~~~
|
|
type
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/487dd5056ec0a977d55b23417d5db2664dcc91fa
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Retrieved from:
|
|
https://gitlab.freedesktop.org/libevdev/evemu/-/commit/fd204f628021c9bb13870a8c983d9c63e1a53ebb]
|
|
---
|
|
src/evemu.c | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/src/evemu.c b/src/evemu.c
|
|
index c7ff561..42dbe1d 100644
|
|
--- a/src/evemu.c
|
|
+++ b/src/evemu.c
|
|
@@ -733,11 +733,6 @@ out:
|
|
return rc;
|
|
}
|
|
|
|
-static inline unsigned long millis(const struct timeval *tv)
|
|
-{
|
|
- return tv->tv_sec * 1000 + tv->tv_usec/1000;
|
|
-}
|
|
-
|
|
static int write_event_desc(FILE *fp, const struct input_event *ev)
|
|
{
|
|
int rc;
|
|
@@ -750,7 +745,7 @@ static int write_event_desc(FILE *fp, const struct input_event *ev)
|
|
libevdev_event_code_get_name(ev->type, ev->code),
|
|
ev->value);
|
|
} else {
|
|
- time = millis(&ev->time);
|
|
+ time = ev->input_event_sec * 1000 + ev->input_event_usec/1000;
|
|
dt = time - last_ms;
|
|
last_ms = time;
|
|
rc = fprintf(fp, "# ------------ %s (%d) ---------- %+ldms\n",
|
|
--
|
|
2.24.1
|
|
|