diff options
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r-- | meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch | 26 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch | 36 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb (renamed from meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb) | 6 |
3 files changed, 2 insertions, 66 deletions
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch deleted file mode 100644 index 96163f654..000000000 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From b36cafdbcbe2193f5b669e703c608e19e23f80a3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 15 Jul 2017 11:16:42 -0700 | ||
4 | Subject: [PATCH 3/4] include missing time.h for time_t | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | util.h | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/util.h b/util.h | ||
12 | index e912f19..3c634c1 100644 | ||
13 | --- a/util.h | ||
14 | +++ b/util.h | ||
15 | @@ -22,7 +22,7 @@ | ||
16 | |||
17 | #include "ddt.h" | ||
18 | #include "ether.h" | ||
19 | - | ||
20 | +#include <time.h> | ||
21 | /** | ||
22 | * Table of human readable strings, one for each port state. | ||
23 | */ | ||
24 | -- | ||
25 | 2.13.3 | ||
26 | |||
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch deleted file mode 100644 index e69927514..000000000 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 3cd28aa771934d9165ff0d7e19932cde65de3e52 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 15 Jul 2017 11:16:57 -0700 | ||
4 | Subject: [PATCH 4/4] Adjust include header sequence to avoid duplicate | ||
5 | definitions on musl | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | raw.c | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/raw.c b/raw.c | ||
13 | index f51c829..494ea7f 100644 | ||
14 | --- a/raw.c | ||
15 | +++ b/raw.c | ||
16 | @@ -18,8 +18,6 @@ | ||
17 | */ | ||
18 | #include <errno.h> | ||
19 | #include <fcntl.h> | ||
20 | -#include <linux/filter.h> | ||
21 | -#include <linux/if_ether.h> | ||
22 | #include <net/ethernet.h> | ||
23 | #include <net/if.h> | ||
24 | #include <netinet/in.h> | ||
25 | @@ -32,6 +30,8 @@ | ||
26 | #include <sys/types.h> | ||
27 | #include <unistd.h> | ||
28 | |||
29 | +#include <linux/filter.h> | ||
30 | +#include <linux/if_ether.h> | ||
31 | #include <linux/errqueue.h> | ||
32 | #include <linux/net_tstamp.h> | ||
33 | #include <linux/sockios.h> | ||
34 | -- | ||
35 | 2.13.3 | ||
36 | |||
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb index c7b8b2933..eb262d36b 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb | |||
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
5 | SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \ | 5 | SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \ |
6 | file://build-Allow-CC-and-prefix-to-be-overriden.patch \ | 6 | file://build-Allow-CC-and-prefix-to-be-overriden.patch \ |
7 | file://no-incdefs-using-host-headers.patch \ | 7 | file://no-incdefs-using-host-headers.patch \ |
8 | file://0003-include-missing-time.h-for-time_t.patch \ | ||
9 | file://0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch \ | ||
10 | " | 8 | " |
11 | 9 | ||
12 | SRC_URI[md5sum] = "5688cdfe57932273e1dbf35b3b97b9a0" | 10 | SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11" |
13 | SRC_URI[sha256sum] = "fa8e00f6ec73cefa7bb313dce7f60dfe5eb9e2bde3353594e9ac18edc93e5165" | 11 | SRC_URI[sha256sum] = "0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d" |
14 | 12 | ||
15 | EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ | 13 | EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ |
16 | EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'" | 14 | EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'" |