diff options
| author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
| commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
| tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-devtools/libubox | |
| parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
| download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz | |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/libubox')
3 files changed, 98 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch new file mode 100644 index 0000000000..02117fa8d6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57804cf..1aa7f27 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) + + 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) + IF(EXISTS ${json}) + ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c) + TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json}) ++ SET_TARGET_PROPERTIES(blobmsg_json PROPERTIES VERSION 1.0.1 SOVERSION 1) + + ADD_LIBRARY(blobmsg_json-static STATIC blobmsg_json.c) + SET_TARGET_PROPERTIES(blobmsg_json-static +@@ -55,6 +57,7 @@ IF(EXISTS ${json}) + TARGET_LINK_LIBRARIES(jshn blobmsg_json ${json}) + + ADD_LIBRARY(json_script SHARED json_script.c) ++ SET_TARGET_PROPERTIES(json_script PROPERTIES VERSION 1.0.1 SOVERSION 1) + TARGET_LINK_LIBRARIES(json_script ubox) + + INSTALL(TARGETS blobmsg_json blobmsg_json-static jshn json_script diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch new file mode 100644 index 0000000000..6f09c8b293 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch @@ -0,0 +1,40 @@ +[PATCH] fix the CMAKE_INSTALL_LIBDIR + +Upstream-Status: Pending + +libdir maybe /usr/lib64 for 64bit machine + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57804cf..2c7bdc1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,8 +35,8 @@ INSTALL(FILES ${headers} + DESTINATION include/libubox + ) + INSTALL(TARGETS ubox ubox-static +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + + ADD_SUBDIRECTORY(lua) +@@ -58,8 +58,8 @@ IF(EXISTS ${json}) + TARGET_LINK_LIBRARIES(json_script ubox) + + INSTALL(TARGETS blobmsg_json blobmsg_json-static jshn json_script +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION bin + ) + +-- +1.9.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb new file mode 100644 index 0000000000..f9f4e08b71 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "C utility functions for OpenWrt" +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "\ + file://avl.c;endline=39;md5=00810155fed3d604816ec5814523d60a \ + file://avl-cmp.c;endline=15;md5=1603e6094b432a5f3f320877a06f41b5 \ + file://base64.c;endline=61;md5=51fdff010d45b0086ac0a6e035693dc0 \ + file://blobmsg.c;endline=15;md5=7ed64c1570e8c9b46c4fc6fbd16c489e \ + file://list.h;endline=28;md5=2d5f5475fbd0f08741354c5a99c2e983 \ + file://md5.h;endline=39;md5=048bf9f68963c207a0c2b3a94c9d2aaa \ + file://md5.c;endline=51;md5=0a448eea0bcbc89e3c7e6608f2d119a0 \ + file://usock.h;endline=18;md5=f0dfdc8de858e66d66d74036611bba14 \ +" + +SRC_URI = "\ + git://git.openwrt.org/project/libubox.git \ + file://0001-version-libraries.patch \ + file://fix-libdir.patch \ +" + +SRCREV = "155bf39896f126b1ba121b816922a88dc34c31e3" +PV = "1.0.1+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit cmake + +DEPENDS = "json-c" + +EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_LUA=OFF" |