forked from MentorEmbedded/meta-mentor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* modify typo in upstream patch * print input event time in sec.usec format * Upstream-Request: openembedded/meta-openembedded#719 Signed-off-by: Richa Bharti <[email protected]>
- Loading branch information
Richa Bharti
authored and
Richa Bharti
committed
Jul 20, 2023
1 parent
45dde5c
commit 9849e96
Showing
2 changed files
with
42 additions
and
0 deletions.
There are no files selected for viewing
41 changes: 41 additions & 0 deletions
41
...staging/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001 | ||
From: Khem Raj <[email protected]> | ||
Date: Sat, 30 Nov 2019 11:58:58 -0800 | ||
Subject: [PATCH] Fix build on 32bit arches with 64bit time_t | ||
|
||
time element is deprecated on new input_event structure in kernel's | ||
input.h [1] | ||
|
||
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f | ||
|
||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6] | ||
Signed-off-by: Khem Raj <[email protected]> | ||
--- | ||
evtest.c | 7 ++++++- | ||
1 file changed, 6 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/evtest.c b/evtest.c | ||
index 548c203..93063cd 100644 | ||
--- a/evtest.c | ||
+++ b/evtest.c | ||
@@ -61,6 +61,11 @@ | ||
#include <sys/types.h> | ||
#include <unistd.h> | ||
|
||
+#ifndef input_event_sec | ||
+#define input_event_sec time.tv_sec | ||
+#define input_event_usec time.tv_usec | ||
+#endif | ||
+ | ||
#define BITS_PER_LONG (sizeof(long) * 8) | ||
#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) | ||
#define OFF(x) ((x)%BITS_PER_LONG) | ||
@@ -1140,7 +1145,7 @@ static int print_events(int fd) | ||
type = ev[i].type; | ||
code = ev[i].code; | ||
|
||
- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); | ||
+ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_usec); | ||
|
||
if (type == EV_SYN) { | ||
if (code == SYN_MT_REPORT) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |