diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-07-17 20:10:07 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-24 18:58:50 +0200 |
commit | a8b542f399330dda088f1a27fde4851dec7407d5 (patch) | |
tree | 32dc6e8c4fcb945500e7a5b6199692da84f534e1 /meta-oe/recipes-connectivity | |
parent | b9d8854ec0450a19b2dd6f54fb9f01201fd004d9 (diff) | |
download | meta-openembedded-a8b542f399330dda088f1a27fde4851dec7407d5.tar.gz |
linuxptp: Upgrade to 1.8
Fix build on musl along way
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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_1.8.bb (renamed from meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb) | 9 |
3 files changed, 68 insertions, 3 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 new file mode 100644 index 000000000..96163f654 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch | |||
@@ -0,0 +1,26 @@ | |||
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 new file mode 100644 index 000000000..e69927514 --- /dev/null +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch | |||
@@ -0,0 +1,36 @@ | |||
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.6.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb index 2e28644f0..c7b8b2933 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb | |||
@@ -4,10 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
4 | 4 | ||
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 | SRC_URI[md5sum] = "6aa15d83f5a35f1fd076ba9adc4e7285" | 12 | SRC_URI[md5sum] = "5688cdfe57932273e1dbf35b3b97b9a0" |
10 | SRC_URI[sha256sum] = "e7fd16a9f235b059be527bd512e86f0c1d9f2e7c36736e6d6d9727a4427ac14c" | 13 | SRC_URI[sha256sum] = "fa8e00f6ec73cefa7bb313dce7f60dfe5eb9e2bde3353594e9ac18edc93e5165" |
11 | 14 | ||
12 | EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ | 15 | EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ |
13 | EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'" | 16 | EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'" |