summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch28
-rw-r--r--recipes-kernel/ceetm/ceetm/0001-Makefile-update-CFLAGS.patch31
-rw-r--r--recipes-kernel/ceetm/ceetm_git.bb7
3 files changed, 2 insertions, 64 deletions
diff --git a/recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch b/recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch
deleted file mode 100644
index 93b375eaa..000000000
--- a/recipes-kernel/ceetm/ceetm/0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 9049175076c4d6706e6264f894680d5d1845e409 Mon Sep 17 00:00:00 2001
2From: Zelan Zou <zelan.zou@nxp.com>
3Date: Fri, 13 Sep 2024 04:22:13 +0200
4Subject: [PATCH] Makefile: Fix build error with gcc15 [YOCIMX-8305]
5
6Upstream-Status: Pending
7
8Signed-off-by: Zelan Zou <zelan.zou@nxp.com>
9---
10 Makefile | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/Makefile b/Makefile
14index 9e55dad..60f8f7f 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -8,7 +8,7 @@ LDFLAGS += -Wl,-export-dynamic
18 # if you are not using flex-builder. Download the iproute2 sources for the
19 # desired version and point to those instead.
20 ifneq ($(IPROUTE2_DIR),)
21-CFLAGS += -I$(IPROUTE2_DIR) -I$(IPROUTE2_DIR)/include -I$(IPROUTE2_DIR)/usr/include/ -I$(IPROUTE2_DIR)/usr/include/include
22+CFLAGS += -I$(IPROUTE2_DIR) -I$(IPROUTE2_DIR)/include -I$(IPROUTE2_DIR)/usr/include/ -I$(IPROUTE2_DIR)/usr/include/include -Wno-error=incompatible-pointer-types
23 endif
24
25 MODDESTDIR := $(DESTDIR)/usr/lib/tc
26--
272.25.1
28
diff --git a/recipes-kernel/ceetm/ceetm/0001-Makefile-update-CFLAGS.patch b/recipes-kernel/ceetm/ceetm/0001-Makefile-update-CFLAGS.patch
deleted file mode 100644
index 136978869..000000000
--- a/recipes-kernel/ceetm/ceetm/0001-Makefile-update-CFLAGS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From fb1fe93a2bab083652a65804be5ddd37a7e86a9f Mon Sep 17 00:00:00 2001
2From: Chunrong Guo <chunrong.guo@nxp.com>
3Date: Wed, 14 Aug 2019 04:05:14 +0200
4Subject: [PATCH] Makefile: update CFLAGS
5
6*fix the below error:
7|error: json_print.h: No such file or directory
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com>
12---
13 Makefile | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/Makefile b/Makefile
17index f89700c..49243d8 100644
18--- a/Makefile
19+++ b/Makefile
20@@ -8,7 +8,7 @@ LDFLAGS += -Wl,-export-dynamic
21 # if you are not using flex-builder. Download the iproute2 sources for the
22 # desired version and point to those instead.
23 ifneq ($(IPROUTE2_DIR),)
24-CFLAGS += -I$(IPROUTE2_DIR) -I$(IPROUTE2_DIR)/include
25+CFLAGS += -I$(IPROUTE2_DIR) -I$(IPROUTE2_DIR)/include -I$(IPROUTE2_DIR)/usr/include/ -I$(IPROUTE2_DIR)/usr/include/include
26 endif
27
28 MODDESTDIR := $(DESTDIR)/usr/lib/tc
29--
302.7.4
31
diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 3ba31cb62..1b1ba6aa9 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -7,13 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8DEPENDS = "iproute2" 8DEPENDS = "iproute2"
9 9
10SRC_URI = "git://github.com/nxp-qoriq/ceetm;protocol=https;nobranch=1 \ 10SRC_URI = "git://github.com/nxp-qoriq/ceetm;protocol=https;nobranch=1"
11 file://0001-Makefile-update-CFLAGS.patch \
12 file://0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch \
13"
14SRCREV = "46b3565a48ca20f90ad601cef8250cdd35f18b22" 11SRCREV = "46b3565a48ca20f90ad601cef8250cdd35f18b22"
15 12
16export IPROUTE2_DIR = "${STAGING_DIR_TARGET}" 13export IPROUTE2_DIR = "${STAGING_DIR_TARGET}/usr/include"
17WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}" 14WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
18export CROSS_COMPILE = "${WRAP_TARGET_PREFIX}" 15export CROSS_COMPILE = "${WRAP_TARGET_PREFIX}"
19 16