summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch8
-rw-r--r--meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-makefile-use-conditional-assignment-for-KBUILD_OUTPU.patch42
-rw-r--r--meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch8
-rw-r--r--meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch12
-rw-r--r--meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb (renamed from meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb)22
5 files changed, 26 insertions, 66 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 60f2079d37..ae54469927 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,4 +1,4 @@
1From d49b4fb8063ecd89617587e5ea566cc9da9393ef Mon Sep 17 00:00:00 2001 1From ecfc8e287eb6811e42c4e2800a913822f554d7c8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 31 Aug 2022 19:09:18 -0700 3Date: Wed, 31 Aug 2022 19:09:18 -0700
4Subject: [PATCH] include string.h for strncpy() 4Subject: [PATCH] include string.h for strncpy()
@@ -6,12 +6,13 @@ Subject: [PATCH] include string.h for strncpy()
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
9--- 10---
10 interface.c | 1 + 11 interface.c | 1 +
11 1 file changed, 1 insertion(+) 12 1 file changed, 1 insertion(+)
12 13
13diff --git a/interface.c b/interface.c 14diff --git a/interface.c b/interface.c
14index 65bdff0..5228db9 100644 15index 29229ad..9a83c36 100644
15--- a/interface.c 16--- a/interface.c
16+++ b/interface.c 17+++ b/interface.c
17@@ -5,6 +5,7 @@ 18@@ -5,6 +5,7 @@
@@ -22,6 +23,3 @@ index 65bdff0..5228db9 100644
22 #include "interface.h" 23 #include "interface.h"
23 24
24 struct interface { 25 struct interface {
25--
262.37.3
27
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-makefile-use-conditional-assignment-for-KBUILD_OUTPU.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-makefile-use-conditional-assignment-for-KBUILD_OUTPU.patch
deleted file mode 100644
index fb51906521..0000000000
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-makefile-use-conditional-assignment-for-KBUILD_OUTPU.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From dfd38cb29c0768692f886d3ab9158bd2b3132582 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 22 Nov 2022 15:20:48 +0800
4Subject: [PATCH] makefile: use conditional assignment for KBUILD_OUTPUT
5
6Refer [1],from make 4.4, all variables that are marked as export will
7also be passed to the shell started by the shell function. use "=" will
8make KBUILD_OUTPUT always empty for shell function, use "?=" to make
9"export KBUILD_OUTPUT" in enrironment can work.
10
11[snip of 4.4 NEWS]
12* WARNING: Backward-incompatibility!
13 Previously makefile variables marked as export were not exported to commands
14 started by the $(shell ...) function. Now, all exported variables are
15 exported to $(shell ...).
16[snip]
17
18[1] https://git.savannah.gnu.org/cgit/make.git/tree/NEWS?h=4.4&id=ed493f6c9116cc217b99c2cfa6a95f15803235a2#n74
19
20Upstream-Status: Submitted [linuxptp-devel@lists.sourceforge.net]
21
22Signed-off-by: Changqing Li <changqing.li@windriver.com>
23---
24 makefile | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/makefile b/makefile
28index 529d8a0..3db60fa 100644
29--- a/makefile
30+++ b/makefile
31@@ -15,7 +15,7 @@
32 # with this program; if not, write to the Free Software Foundation, Inc.,
33 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
34
35-KBUILD_OUTPUT =
36+KBUILD_OUTPUT ?=
37
38 DEBUG =
39 CC ?= $(CROSS_COMPILE)gcc
40--
412.25.1
42
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
index 876088649e..9c87851e48 100644
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
@@ -1,4 +1,4 @@
1From 8a4cad5e2f2cbb6a34bdc6e877fe499502b8c4c8 Mon Sep 17 00:00:00 2001 1From be8808005772da48c052cf34a343a6d140541f6a Mon Sep 17 00:00:00 2001
2From: Marcel Ziswiler <marcel.ziswiler@toradex.com> 2From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
3Date: Fri, 23 Dec 2016 18:12:29 +0100 3Date: Fri, 23 Dec 2016 18:12:29 +0100
4Subject: [PATCH] linuxptp: Use cross cpp in incdefs 4Subject: [PATCH] linuxptp: Use cross cpp in incdefs
@@ -8,11 +8,13 @@ we need to ensure we use correct setttings from toolchain
8 8
9Upstream-Status: Inappropriate [OE-Specific] 9Upstream-Status: Inappropriate [OE-Specific]
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 11
13 makefile | 2 +- 12---
13 incdefs.sh | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/incdefs.sh b/incdefs.sh
17index a9e94f7..dd1692f 100755
16--- a/incdefs.sh 18--- a/incdefs.sh
17+++ b/incdefs.sh 19+++ b/incdefs.sh
18@@ -27,7 +27,7 @@ user_flags() 20@@ -27,7 +27,7 @@ user_flags()
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch
index 55ce4c9a90..d4d6fac0ee 100644
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch
@@ -1,4 +1,4 @@
1From af485c638c61fa883212ea424e676fbf90bee594 Mon Sep 17 00:00:00 2001 1From 886bca11ff8fcc55386b6e4397b13e64950f93fb Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 1 Jul 2014 17:37:31 -0300 3Date: Tue, 1 Jul 2014 17:37:31 -0300
4Subject: [PATCH] build: Allow CC and prefix to be overriden 4Subject: [PATCH] build: Allow CC and prefix to be overriden
@@ -6,16 +6,17 @@ Subject: [PATCH] build: Allow CC and prefix to be overriden
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 8Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
9
9--- 10---
10 makefile | 4 ++-- 11 makefile | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-) 12 1 file changed, 2 insertions(+), 2 deletions(-)
12 13
13diff --git a/makefile b/makefile 14diff --git a/makefile b/makefile
14index 22e7d0d..809cc8f 100644 15index 3e3b8b3..5c1a1f9 100644
15--- a/makefile 16--- a/makefile
16+++ b/makefile 17+++ b/makefile
17@@ -18,7 +18,7 @@ 18@@ -18,7 +18,7 @@
18 KBUILD_OUTPUT = 19 KBUILD_OUTPUT ?=
19 20
20 DEBUG = 21 DEBUG =
21-CC = $(CROSS_COMPILE)gcc 22-CC = $(CROSS_COMPILE)gcc
@@ -32,6 +33,3 @@ index 22e7d0d..809cc8f 100644
32 sbindir = $(prefix)/sbin 33 sbindir = $(prefix)/sbin
33 mandir = $(prefix)/man 34 mandir = $(prefix)/man
34 man8dir = $(mandir)/man8 35 man8dir = $(mandir)/man8
35--
361.7.10.4
37
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb
index 5903cb38ca..0b559df8c3 100644
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb
@@ -1,19 +1,23 @@
1DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux" 1SUMMARY = "linuxptp package for linux"
2DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 \
3for Linux"
2HOMEPAGE = "http://linuxptp.sourceforge.net/" 4HOMEPAGE = "http://linuxptp.sourceforge.net/"
3LICENSE = "GPL-2.0-only" 5LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5 7
6SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v3.1/linuxptp-${PV}.tgz \ 8LINUXPTP_SRC_URI = "http://sourceforge.net/projects/linuxptp"
9
10SRC_URI = "${LINUXPTP_SRC_URI}/files/v4.1/linuxptp-${PV}.tgz \
7 file://build-Allow-CC-and-prefix-to-be-overriden.patch \ 11 file://build-Allow-CC-and-prefix-to-be-overriden.patch \
8 file://Use-cross-cpp-in-incdefs.patch \ 12 file://Use-cross-cpp-in-incdefs.patch \
9 file://0001-include-string.h-for-strncpy.patch \ 13 file://0001-include-string.h-for-strncpy.patch \
10 file://0001-makefile-use-conditional-assignment-for-KBUILD_OUTPU.patch \
11 " 14 "
12 15
13UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/linuxptp/files/" 16SRC_URI[md5sum] = "1db8699fc155965341759be5e5aad938"
14UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" 17SRC_URI[sha256sum] = "e1743d44f8208897e30895da3579e670ff919b914feb4b5a949f3e421ddde535"
15 18
16SRC_URI[sha256sum] = "94d6855f9b7f2d8e9b0ca6d384e3fae6226ce6fc012dbad02608bdef3be1c0d9" 19UPSTREAM_CHECK_URI = "${LINUXPTP_SRC_URI}/files/"
20UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
17 21
18EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}' mandir=${mandir}" 22EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}' mandir=${mandir}"
19 23
@@ -24,10 +28,10 @@ do_install() {
24 28
25 # Install example configs from source tree 29 # Install example configs from source tree
26 install -d ${D}${docdir}/${PN} 30 install -d ${D}${docdir}/${PN}
27 cp -R --no-dereference --preserve=mode,links ${S}/configs ${D}${docdir}/${PN} 31 cp -R --no-dereference --preserve=mode,links ${S}/configs \
32 ${D}${docdir}/${PN}
28} 33}
29 34
30PACKAGES =+ "${PN}-configs" 35PACKAGES =+ "${PN}-configs"
31 36
32FILES:${PN}-configs = "${docdir}" 37FILES:${PN}-configs += "${docdir}"
33FILES:${PN}-doc = "${mandir}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-07 18:14:46 +0000