diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2018-12-06 18:26:27 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-12-08 07:41:21 +0100 |
commit | 2a40eaa5a9b9dc4c4f5ae8fb22bac4c51997b83b (patch) | |
tree | 37a28f85741458c8c6352ba77fa605b27d3d794f | |
parent | d4c05b67d3bb9380b481f662b214c68454ae464c (diff) | |
download | ptxdist-2a40eaa5a9b9dc4c4f5ae8fb22bac4c51997b83b.tar.gz ptxdist-2a40eaa5a9b9dc4c4f5ae8fb22bac4c51997b83b.tar.xz |
linuxptp: fix build with new kernel headers
- picked patch from ML to support kernel header >= 4.19
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch | 54 | ||||
-rw-r--r-- | patches/linuxptp-2.0/series | 4 |
2 files changed, 58 insertions, 0 deletions
diff --git a/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch b/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch new file mode 100644 index 000000000..247a6a353 --- /dev/null +++ b/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch @@ -0,0 +1,54 @@ +From: Miroslav Lichvar <mlichvar@redhat.com> +Date: Thu, 6 Dec 2018 18:23:44 +0100 +Subject: [PATCH] Fix building with new kernel headers. + +net_tstamp.h in recent kernel versions requires time.h for clockid_t. + +Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com> +--- + clock.c | 2 +- + sk.c | 1 + + timemaster.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/clock.c b/clock.c +index faf2dea82a5b..9bbcefa5c57c 100644 +--- a/clock.c ++++ b/clock.c +@@ -17,11 +17,11 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include <errno.h> ++#include <time.h> + #include <linux/net_tstamp.h> + #include <poll.h> + #include <stdlib.h> + #include <string.h> +-#include <time.h> + #include <sys/queue.h> + + #include "address.h" +diff --git a/sk.c b/sk.c +index f18b2bf8732b..386b4c8adf80 100644 +--- a/sk.c ++++ b/sk.c +@@ -18,6 +18,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include <errno.h> ++#include <time.h> + #include <linux/net_tstamp.h> + #include <linux/sockios.h> + #include <linux/ethtool.h> +diff --git a/timemaster.c b/timemaster.c +index 4ba921edb902..28c215a2de95 100644 +--- a/timemaster.c ++++ b/timemaster.c +@@ -22,6 +22,7 @@ + #include <errno.h> + #include <libgen.h> + #include <limits.h> ++#include <time.h> + #include <linux/net_tstamp.h> + #include <net/if.h> + #include <signal.h> diff --git a/patches/linuxptp-2.0/series b/patches/linuxptp-2.0/series new file mode 100644 index 000000000..fe0aad830 --- /dev/null +++ b/patches/linuxptp-2.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fix-building-with-new-kernel-headers.patch +# b102f87ad3ef97777cea9ad16f755ca7 - git-ptx-patches magic |