mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 14:25:53 +01:00
libubox: Update to latest tip of trunk
Fixes builds with CMake 4+. All patches that are still required have been refreshed and a new patch for CMake 4 compatibility has been added. Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Moritz Haase
Khem Raj
parent
d8259c30aa
commit
a7504ae1c2
|
|
@ -1,42 +0,0 @@
|
|||
From a12325a0cbf3bf1d66a0b0f8d85e08083bae6066 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
|
||||
Date: Wed, 25 Dec 2019 10:27:59 +0100
|
||||
Subject: [PATCH] blobmsg: fix array out of bounds GCC 10 warning
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes following warning reported by GCC 10.0.0 20191203:
|
||||
|
||||
blobmsg.c:234:2: error: 'strcpy' offset 6 from the object at 'attr' is out of the bounds of referenced subobject 'name' with type 'uint8_t[0]' {aka 'unsigned char[0]'} at offset 6 [-Werror=array-bounds]
|
||||
234 | strcpy((char *) hdr->name, (const char *)name);
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
In file included from blobmsg.c:16:
|
||||
blobmsg.h:42:10: note: subobject 'name' declared here
|
||||
42 | uint8_t name[];
|
||||
| ^~~~
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.com/ynezz/openwrt-libubox/commit/3775b3aa28de8c20d96b6f02786a327423b0748a]
|
||||
Reported-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Petr Štetiar <ynezz@true.cz>
|
||||
---
|
||||
blobmsg.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/blobmsg.c b/blobmsg.c
|
||||
index a860483..b6b7535 100644
|
||||
--- a/blobmsg.c
|
||||
+++ b/blobmsg.c
|
||||
@@ -195,7 +195,7 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
|
||||
attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED);
|
||||
hdr = blob_data(attr);
|
||||
hdr->namelen = cpu_to_be16(namelen);
|
||||
- strcpy((char *) hdr->name, (const char *)name);
|
||||
+ memcpy(hdr->name, name, namelen);
|
||||
pad_end = *data = blobmsg_data(attr);
|
||||
pad_start = (char *) &hdr->name[namelen];
|
||||
if (pad_start < pad_end)
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
|
@ -1,18 +1,27 @@
|
|||
From 0d97421370d1c52d0db798134420796a960df743 Mon Sep 17 00:00:00 2001
|
||||
From: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
|
||||
Date: Thu, 1 Oct 2015 17:31:36 +0300
|
||||
Subject: [PATCH 1/3] cmake: Set library version
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
|
||||
---
|
||||
CMakeLists.txt | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 57804cf..1aa7f27 100644
|
||||
index f40eaa6..cb089a2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -18,6 +18,7 @@ ENDIF()
|
||||
SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-fd.c vlist.c utils.c safe_list.c runqueue.c md5.c kvlist.c ulog.c base64.c)
|
||||
@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
|
||||
SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-fd.c vlist.c utils.c safe_list.c runqueue.c md5.c kvlist.c ulog.c base64.c udebug.c udebug-remote.c)
|
||||
|
||||
ADD_LIBRARY(ubox SHARED ${SOURCES})
|
||||
+SET_TARGET_PROPERTIES(ubox PROPERTIES VERSION 1.0.1 SOVERSION 1)
|
||||
ADD_LIBRARY(ubox-static STATIC ${SOURCES})
|
||||
SET_TARGET_PROPERTIES(ubox-static PROPERTIES OUTPUT_NAME ubox)
|
||||
|
||||
@@ -46,6 +47,7 @@ find_library(json NAMES json-c)
|
||||
@@ -65,6 +66,7 @@ find_library(json NAMES json-c)
|
||||
IF(EXISTS ${json})
|
||||
ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
|
||||
TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json})
|
||||
|
|
@ -20,7 +29,7 @@ index 57804cf..1aa7f27 100644
|
|||
|
||||
ADD_LIBRARY(blobmsg_json-static STATIC blobmsg_json.c)
|
||||
SET_TARGET_PROPERTIES(blobmsg_json-static
|
||||
@@ -55,6 +57,7 @@ IF(EXISTS ${json})
|
||||
@@ -78,6 +80,7 @@ IF(EXISTS ${json})
|
||||
TARGET_LINK_LIBRARIES(jshn blobmsg_json ${json})
|
||||
|
||||
ADD_LIBRARY(json_script SHARED json_script.c)
|
||||
|
|
@ -1,19 +1,23 @@
|
|||
[PATCH] fix the CMAKE_INSTALL_LIBDIR
|
||||
From ff1f1c6c67ca9c955385a967b1b6609da76c5944 Mon Sep 17 00:00:00 2001
|
||||
From: Roy Li <rongqing.li@windriver.com>
|
||||
Date: Fri, 30 Oct 2015 13:06:03 +0800
|
||||
Subject: [PATCH 2/3] cmake: fix the CMAKE_INSTALL_LIBDIR
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
libdir maybe /usr/lib64 for 64bit machine
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
|
||||
---
|
||||
CMakeLists.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 57804cf..2c7bdc1 100644
|
||||
index cb089a2..783fa0a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -35,8 +35,8 @@ INSTALL(FILES ${headers}
|
||||
@@ -42,8 +42,8 @@ INSTALL(FILES ${headers}
|
||||
DESTINATION include/libubox
|
||||
)
|
||||
INSTALL(TARGETS ubox ubox-static
|
||||
|
|
@ -24,7 +28,7 @@ index 57804cf..2c7bdc1 100644
|
|||
)
|
||||
|
||||
ADD_SUBDIRECTORY(lua)
|
||||
@@ -58,8 +58,8 @@ IF(EXISTS ${json})
|
||||
@@ -84,8 +84,8 @@ IF(EXISTS ${json})
|
||||
TARGET_LINK_LIBRARIES(json_script ubox)
|
||||
|
||||
INSTALL(TARGETS blobmsg_json blobmsg_json-static jshn json_script
|
||||
|
|
@ -35,6 +39,3 @@ index 57804cf..2c7bdc1 100644
|
|||
RUNTIME DESTINATION bin
|
||||
)
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From 93e7b9014a14193e39e5d414c81da2d32f94ed43 Mon Sep 17 00:00:00 2001
|
||||
From: Moritz Haase <Moritz.Haase@bmw.de>
|
||||
Date: Mon, 14 Jul 2025 09:23:09 +0200
|
||||
Subject: [PATCH 3/3] cmake: Don't include 'lua' and 'examples' directories if
|
||||
disabled
|
||||
|
||||
It's the sensible thing to do and unblocks builds with CMake 4+, since both
|
||||
CMakeLists.txt files in the directories in question have
|
||||
'cmake_minimum_required(VERSION 2.6)'.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
|
||||
---
|
||||
CMakeLists.txt | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 783fa0a..61e152c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -46,8 +46,12 @@ INSTALL(TARGETS ubox ubox-static
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
)
|
||||
|
||||
-ADD_SUBDIRECTORY(lua)
|
||||
-ADD_SUBDIRECTORY(examples)
|
||||
+IF(BUILD_LUA)
|
||||
+ ADD_SUBDIRECTORY(lua)
|
||||
+ENDIF()
|
||||
+IF(BUILD_EXAMPLES)
|
||||
+ ADD_SUBDIRECTORY(examples)
|
||||
+ENDIF()
|
||||
|
||||
MACRO(ADD_UNIT_TEST_SAN name)
|
||||
ADD_EXECUTABLE(${name}-san ${name}.c)
|
||||
|
|
@ -14,12 +14,12 @@ LIC_FILES_CHKSUM = "\
|
|||
|
||||
SRC_URI = "\
|
||||
git://git.openwrt.org/project/libubox.git;branch=master \
|
||||
file://0001-version-libraries.patch \
|
||||
file://fix-libdir.patch \
|
||||
file://0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch \
|
||||
file://0001-cmake-Set-library-version.patch \
|
||||
file://0002-cmake-fix-the-CMAKE_INSTALL_LIBDIR.patch \
|
||||
file://0003-cmake-Don-t-include-lua-and-examples-directories-if-.patch \
|
||||
"
|
||||
|
||||
SRCREV = "07413cce72e19520af55dfcbc765484f5ab41dd9"
|
||||
SRCREV = "b7acc8e6fd5e13611ad90a593e98f9589af4009a"
|
||||
PV = "1.0.1+git"
|
||||
|
||||
# Upstream repo does not tag
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user