* [Buildroot] [PATCH 1/1] Bump libubox, libuci to last versions, add ubus package
@ 2014-10-12 7:29 Alexey Mednyy
2014-10-12 8:07 ` Thomas Petazzoni
2014-10-12 12:39 ` Yegor Yefremov
0 siblings, 2 replies; 3+ messages in thread
From: Alexey Mednyy @ 2014-10-12 7:29 UTC (permalink / raw)
To: buildroot
Signed-off-by: Alexey Mednyy <swexru@gmail.com>
---
package/Config.in | 1 +
package/libubox/libubox.mk | 2 +-
package/libuci/libuci.mk | 2 +-
package/ubus/Config.in | 11 ++++++++++
package/ubus/ubus-01-json-definition-fix.patch | 28 ++++++++++++++++++++++++++
package/ubus/ubus.mk | 26 ++++++++++++++++++++++++
6 files changed, 68 insertions(+), 2 deletions(-)
create mode 100644 package/ubus/Config.in
create mode 100644 package/ubus/ubus-01-json-definition-fix.patch
create mode 100644 package/ubus/ubus.mk
diff --git a/package/Config.in b/package/Config.in
index ea89c96..92fc6bb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -872,6 +872,7 @@ menu "Other"
source "package/libtasn1/Config.in"
source "package/libtpl/Config.in"
source "package/libubox/Config.in"
+ source "package/ubus/Config.in"
source "package/libuci/Config.in"
source "package/libunwind/Config.in"
source "package/liburcu/Config.in"
diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk
index 770b55d..7ff3c16 100644
--- a/package/libubox/libubox.mk
+++ b/package/libubox/libubox.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUBOX_VERSION = bbd846ec2d72b2629758b69dc122ac0b0f2c3e4b
+LIBUBOX_VERSION = 5a0bbefc8fa440446253b171d0ac038d839360e3
LIBUBOX_SITE = git://nbd.name/luci2/libubox.git
LIBUBOX_LICENSE = LGPLv2.1, GPLv2, BSD-3c, MIT
LIBUBOX_INSTALL_STAGING = YES
diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk
index ce18a38..9d5c172 100644
--- a/package/libuci/libuci.mk
+++ b/package/libuci/libuci.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUCI_VERSION = ed938cc8e423d4a33b8f31e6e6d1eb0805ae3d10
+LIBUCI_VERSION = e339407372ffc70b1451e4eda218c01aa95a6a7f
LIBUCI_SITE = git://nbd.name/uci.git
LIBUCI_LICENSE = LGPLv2.1
LIBUCI_INSTALL_STAGING = YES
diff --git a/package/ubus/Config.in b/package/ubus/Config.in
new file mode 100644
index 0000000..6a9c73d
--- /dev/null
+++ b/package/ubus/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UBUS
+ bool "ubus"
+ select BR2_PACKAGE_LIBUBOX
+ depends on !BR2_PREFER_STATIC_LIB
+ help
+ OpenWrt micro bus architecture, project
+ provide communication between various
+ daemons and applications.
+
+comment "ubus needs toolchain w/ dynamic library"
+ depends on BR2_PREFER_STATIC_LIB
diff --git a/package/ubus/ubus-01-json-definition-fix.patch b/package/ubus/ubus-01-json-definition-fix.patch
new file mode 100644
index 0000000..ccef101
--- /dev/null
+++ b/package/ubus/ubus-01-json-definition-fix.patch
@@ -0,0 +1,28 @@
+Fix wrong cmake behavior with json lib search
+
+Signed-off-by: Alexey Mednyy swexru at gmail.com
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cb2f420..679b258 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,11 +25,18 @@ TARGET_LINK_LIBRARIES(ubus ubox)
+ ADD_EXECUTABLE(ubusd ubusd.c ubusd_id.c ubusd_obj.c ubusd_proto.c ubusd_event.c)
+ TARGET_LINK_LIBRARIES(ubusd ubox)
+
+-find_library(json NAMES json-c json)
++find_library(json NAMES json-c)
+ ADD_EXECUTABLE(cli cli.c)
+ SET_TARGET_PROPERTIES(cli PROPERTIES OUTPUT_NAME ubus)
+ TARGET_LINK_LIBRARIES(cli ubus ubox blobmsg_json ${json})
+
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(JSONC json-c)
++IF(JSONC_FOUND)
++ ADD_DEFINITIONS(-DJSONC)
++ INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
++ENDIF()
++
+ ADD_SUBDIRECTORY(lua)
+ ADD_SUBDIRECTORY(examples)
+
diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk
new file mode 100644
index 0000000..9ac45ab
--- /dev/null
+++ b/package/ubus/ubus.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# UBUS
+#
+################################################################################
+
+UBUS_VERSION = 4c4f35cf2230d70b9ddd87638ca911e8a563f2f3
+UBUS_SITE = git://nbd.name/luci2/ubus.git
+UBUS_LICENSE = LGPLv2.1
+UBUS_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_JSON_C),json-c)
+
+ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy)
+UBUS_DEPENDENCIES += lua
+UBUS_CONF_OPTS += -DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
+ -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
+else
+ UBUS_CONF_OPTS += -DBUILD_LUA:BOOL=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+ UBUS_DEPENDENCIES += systemd
+else
+ UBUS_CONF_OPTS += -DENABLE_SYSTEMD:BOOL=OFF
+endif
+
+$(eval $(cmake-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] Bump libubox, libuci to last versions, add ubus package
2014-10-12 7:29 [Buildroot] [PATCH 1/1] Bump libubox, libuci to last versions, add ubus package Alexey Mednyy
@ 2014-10-12 8:07 ` Thomas Petazzoni
2014-10-12 12:39 ` Yegor Yefremov
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2014-10-12 8:07 UTC (permalink / raw)
To: buildroot
Dear Alexey Mednyy,
On Sun, 12 Oct 2014 11:29:56 +0400, Alexey Mednyy wrote:
> Signed-off-by: Alexey Mednyy <swexru@gmail.com>
> ---
> package/Config.in | 1 +
> package/libubox/libubox.mk | 2 +-
> package/libuci/libuci.mk | 2 +-
> package/ubus/Config.in | 11 ++++++++++
> package/ubus/ubus-01-json-definition-fix.patch | 28 ++++++++++++++++++++++++++
> package/ubus/ubus.mk | 26 ++++++++++++++++++++++++
> 6 files changed, 68 insertions(+), 2 deletions(-)
> create mode 100644 package/ubus/Config.in
> create mode 100644 package/ubus/ubus-01-json-definition-fix.patch
> create mode 100644 package/ubus/ubus.mk
Thanks for this submission. However, could you split it in three
patches: one bumping libubox, one bumping libuci, and one adding the
ubus package?
Thanks a lot!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] Bump libubox, libuci to last versions, add ubus package
2014-10-12 7:29 [Buildroot] [PATCH 1/1] Bump libubox, libuci to last versions, add ubus package Alexey Mednyy
2014-10-12 8:07 ` Thomas Petazzoni
@ 2014-10-12 12:39 ` Yegor Yefremov
1 sibling, 0 replies; 3+ messages in thread
From: Yegor Yefremov @ 2014-10-12 12:39 UTC (permalink / raw)
To: buildroot
Hi Alexey,
On Sun, Oct 12, 2014 at 9:29 AM, Alexey Mednyy <swexru@gmail.com> wrote:
> Signed-off-by: Alexey Mednyy <swexru@gmail.com>
> ---
> package/Config.in | 1 +
> package/libubox/libubox.mk | 2 +-
> package/libuci/libuci.mk | 2 +-
> package/ubus/Config.in | 11 ++++++++++
> package/ubus/ubus-01-json-definition-fix.patch | 28 ++++++++++++++++++++++++++
> package/ubus/ubus.mk | 26 ++++++++++++++++++++++++
Glad to see, that someone else is working on bringing OpenWrt stuff to
BR. Have you tried to run LuCI on BR? What is still missing to run
OpenWrt on BR?
Regards,
Yegor
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-12 12:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-12 7:29 [Buildroot] [PATCH 1/1] Bump libubox, libuci to last versions, add ubus package Alexey Mednyy
2014-10-12 8:07 ` Thomas Petazzoni
2014-10-12 12:39 ` Yegor Yefremov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.