diff options
author | Luca Fancellu <luca.fancellu@arm.com> | 2023-11-28 16:12:53 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-11-28 08:55:43 -0800 |
commit | e12d38e91efff3f9f28fc35f9b9dc16557d5f849 (patch) | |
tree | 4c4e4b66932f4c2b0df041d5269357ec68b32f3c | |
parent | 69d80c3a192d494daf3bd7df7310d9f2fbb1907b (diff) | |
download | meta-openembedded-contrib-e12d38e91efff3f9f28fc35f9b9dc16557d5f849.tar.gz |
linuxptp: Update downstream patches
Downstream patches for linuxptp are upstreamed on the project
development branch, update them with their latest status and
update the Upstream-Status.
Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch | 13 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch | 24 |
2 files changed, 26 insertions, 11 deletions
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch index ae54469927..b117dcf670 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch @@ -1,18 +1,16 @@ -From ecfc8e287eb6811e42c4e2800a913822f554d7c8 Mon Sep 17 00:00:00 2001 +From 6120cee594c543d17ae015bc601012debcf57177 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 31 Aug 2022 19:09:18 -0700 +Date: Mon, 23 Oct 2023 10:43:42 +0100 Subject: [PATCH] include string.h for strncpy() -Upstream-Status: Pending - Signed-off-by: Khem Raj <raj.khem@gmail.com> - +Upstream-Status: Backport [master: 6120cee594c543d17ae015bc601012debcf57177] --- interface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/interface.c b/interface.c -index 29229ad..9a83c36 100644 +index 29229ad6f53d..9a83c36933e7 100644 --- a/interface.c +++ b/interface.c @@ -5,6 +5,7 @@ @@ -23,3 +21,6 @@ index 29229ad..9a83c36 100644 #include "interface.h" struct interface { +-- +2.34.1 + diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch index e6a3386df0..3cf3a63b94 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch @@ -1,6 +1,6 @@ -From 2cc19a679ec37715df546dd9f00d8d9b0ab20059 Mon Sep 17 00:00:00 2001 +From cffb4807ac0b9ff7aea2aa4f3842985b5363d184 Mon Sep 17 00:00:00 2001 From: Luca Fancellu <luca.fancellu@arm.com> -Date: Wed, 18 Oct 2023 11:10:18 +0100 +Date: Mon, 23 Oct 2023 10:43:43 +0100 Subject: [PATCH] linuxptp: Use ${CC} in incdefs.sh The Makefile is defining CC and incdefs.sh is using @@ -8,13 +8,14 @@ ${CROSS_COMPILE}cpp inside it, allowing both to use different compilers depending on what the user pass during make invocation as CC. -Align them using ${CC} also inside incdefs.sh +Align them using ${CC} also inside incdefs.sh. Signed-off-by: Luca Fancellu <luca.fancellu@arm.com> -Upstream-Status: Pending +Upstream-Status: Backport [master: cffb4807ac0b9ff7aea2aa4f3842985b5363d184] --- incdefs.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/incdefs.sh b/incdefs.sh index a9e94f777f6b..391e63c7fac6 100755 @@ -29,6 +30,19 @@ index a9e94f777f6b..391e63c7fac6 100755 # Look for clock_adjtime(). for d in $dirs; do +diff --git a/makefile b/makefile +index 3e3b8b35fc96..7fc5f6fb8fa8 100644 +--- a/makefile ++++ b/makefile +@@ -39,7 +39,7 @@ OBJECTS = $(OBJ) hwstamp_ctl.o nsm.o phc2sys.o phc_ctl.o pmc.o pmc_agent.o \ + SRC = $(OBJECTS:.o=.c) + DEPEND = $(OBJECTS:.o=.d) + srcdir := $(dir $(lastword $(MAKEFILE_LIST))) +-incdefs := $(shell $(srcdir)/incdefs.sh) ++incdefs := $(shell CC="$(CC)" $(srcdir)/incdefs.sh) + version := $(shell $(srcdir)/version.sh $(srcdir)) + VPATH = $(srcdir) + -- 2.34.1 |