From patchwork Sat Nov 28 19:14:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Prado X-Patchwork-Id: 549688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id B667B1402D0 for ; Sun, 29 Nov 2015 06:15:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=e-labworks-com.20150623.gappssmtp.com header.i=@e-labworks-com.20150623.gappssmtp.com header.b=HCWoXtCm; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D937E876F2; Sat, 28 Nov 2015 19:15:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KlH8hS7baFzS; Sat, 28 Nov 2015 19:15:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 88BAC8729F; Sat, 28 Nov 2015 19:15:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id ECE661C0A72 for ; Sat, 28 Nov 2015 19:15:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E809B329A3 for ; Sat, 28 Nov 2015 19:15:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QrG6P80wvIo5 for ; Sat, 28 Nov 2015 19:15:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk0-f176.google.com (mail-qk0-f176.google.com [209.85.220.176]) by silver.osuosl.org (Postfix) with ESMTPS id AFF87329F6 for ; Sat, 28 Nov 2015 19:15:10 +0000 (UTC) Received: by qkda6 with SMTP id a6so46019011qkd.3 for ; Sat, 28 Nov 2015 11:15:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=e-labworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=YGiPRJ2sVO0qP0H6SOxWIh5b+/javm+L9l7V6WSO25g=; b=HCWoXtCmzf4JyTax7M++JHiQmwvxc2d3llVy1YxPvccjFH5TcxezQpslRKZLZyNcaK o+uNb874ujbdG1qX2bg61zGl1mYd6CHHkICy/ymI14UUG7qwmupIdEFa6tFhAhza6ax1 Ou2W6i9PYxDPoPJ+eBPdAZvoKr/kWbFxAM40IJSLdsZXXMtCIBNomsLSRLqEMxMcUeUW SWdBU7mScgyUQwGWFOTNf8n3QPhPTL6KHAT8qHtykWjs1uG4A0sV46BH+X9kwzcvAlRi bCOkilXWsfQ0ybQROtQpuvfNVyE0Zy+/6DJaNZx86WGb2vquM3+L7B/VRwK/uSF3/yv8 CZWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YGiPRJ2sVO0qP0H6SOxWIh5b+/javm+L9l7V6WSO25g=; b=jfGurhRd3i3QcOXDhpFMU6bN1obt7hywLQKNtPa9ap42c+i+SGo7bLqqj5w0slRzfK UruXcZy5X9EleStF7pk03OaDYtexsYpVe3YnA2tn03QWncWBCW692KOHZHZY4b3p+uJJ 9Op5Z9SOcPav1H1eW+2cfDZ161WSVxLa+HiOcAIzTpv7RidCqrUlGHOKiIch0WTfuU8v eu0tJbtzQnt0HQZmDMX/AqGgUQGVhbGixJL5C3oRmaqCTz4IYNjnGBy0sC2XsrwXmkqj DrwrgKxoTK8qoUX5xeSZpGreF3GOjiUF8aZnEj8awPhF9Ov2CZEWlJXPV2VsxjZ9fboD y2+w== X-Gm-Message-State: ALoCoQkSer/S+ev0U6R1RgQj5nFkip4geRsWmP7ZAyOm5TEHl4Yw5Aq/BFTx1agVmMfn3Y54K1ts X-Received: by 10.55.48.130 with SMTP id w124mr35914539qkw.79.1448738109663; Sat, 28 Nov 2015 11:15:09 -0800 (PST) Received: from localhost.localdomain ([177.141.170.120]) by smtp.gmail.com with ESMTPSA id 2sm11794130qgi.42.2015.11.28.11.15.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 28 Nov 2015 11:15:09 -0800 (PST) From: Sergio Prado To: buildroot@buildroot.org Date: Sat, 28 Nov 2015 17:14:42 -0200 Message-Id: <1448738082-3674-1-git-send-email-sergio.prado@e-labworks.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH v2] ubus: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Sergio Prado --- Changes v1 -> v2: - fix error in patch that would make the configure step fails when building with the examples disabled - adding a comment section because of the dependency on dynamic library - removing the default option in BR2_PACKAGE_UBUS_EXAMPLES - fixing indentation on BR2_PACKAGE_LUA options - removing staging install commands to keep the default installation logic. --- package/Config.in | 1 + .../0001-Install-server-and-client-examples.patch | 23 +++++++++++++ package/ubus/Config.in | 28 +++++++++++++++ package/ubus/ubus.hash | 2 ++ package/ubus/ubus.mk | 40 ++++++++++++++++++++++ 5 files changed, 94 insertions(+) create mode 100644 package/ubus/0001-Install-server-and-client-examples.patch create mode 100644 package/ubus/Config.in create mode 100644 package/ubus/ubus.hash create mode 100644 package/ubus/ubus.mk diff --git a/package/Config.in b/package/Config.in index 988fe844b872..12a3e91c8e44 100644 --- a/package/Config.in +++ b/package/Config.in @@ -430,6 +430,7 @@ endif source "package/ti-utils/Config.in" source "package/triggerhappy/Config.in" source "package/uboot-tools/Config.in" + source "package/ubus/Config.in" source "package/udev/Config.in" source "package/udisks/Config.in" source "package/usb_modeswitch/Config.in" diff --git a/package/ubus/0001-Install-server-and-client-examples.patch b/package/ubus/0001-Install-server-and-client-examples.patch new file mode 100644 index 000000000000..0ee4d3e64fdb --- /dev/null +++ b/package/ubus/0001-Install-server-and-client-examples.patch @@ -0,0 +1,23 @@ +Install server and client examples + +Signed-off-by: Sergio Prado +--- + examples/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 0279f6e66b50..2f8f4e026e20 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -9,4 +9,8 @@ IF (BUILD_EXAMPLES) + + ADD_EXECUTABLE(client client.c count.c) + TARGET_LINK_LIBRARIES(client ubus ubox) ++ ++ INSTALL(TARGETS server client ++ RUNTIME DESTINATION sbin ++ ) + ENDIF() +-- +1.9.1 + diff --git a/package/ubus/Config.in b/package/ubus/Config.in new file mode 100644 index 000000000000..8567321876fa --- /dev/null +++ b/package/ubus/Config.in @@ -0,0 +1,28 @@ +comment "ubus needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +config BR2_PACKAGE_UBUS + bool "ubus" + select BR2_PACKAGE_LIBUBOX + select BR2_PACKAGE_JSON_C + depends on !BR2_STATIC_LIBS # libubox + help + IPC/RPC bus that allows communication between processes. + + It consists of few parts including a daemon (ubusd), a library + (libubus) and a command line interface (ubus). Although created + for the OpenWRT project, it can be used as a general IPC/RPC + mechanism in other projects. + + * Select BR2_PACKAGE_LUA_5_1 if you want to have Lua support. + + https://wiki.openwrt.org/doc/techref/ubus + +if BR2_PACKAGE_UBUS + +config BR2_PACKAGE_UBUS_EXAMPLES + bool "build and install ubus examples" + help + Build and install client and server ubus examples. + +endif diff --git a/package/ubus/ubus.hash b/package/ubus/ubus.hash new file mode 100644 index 000000000000..af9b652b0e1d --- /dev/null +++ b/package/ubus/ubus.hash @@ -0,0 +1,2 @@ +# No hash for this git snapshot +none xxx ubus-259450f414d8c9ee41896e8e6d6bc57ec00e2b63.tar.gz diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk new file mode 100644 index 000000000000..cd66b868dfd9 --- /dev/null +++ b/package/ubus/ubus.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# ubus +# +################################################################################ + +UBUS_VERSION = 259450f414d8c9ee41896e8e6d6bc57ec00e2b63 +UBUS_SITE = git://git.openwrt.org/project/ubus.git + +UBUS_LICENSE = LGPLv2.1 +UBUS_LICENSE_FILES = ubusd_acl.h + +UBUS_INSTALL_STAGING = YES + +UBUS_DEPENDENCIES = json-c libubox + +# package only compiles with Lua 5.1 +ifeq ($(BR2_PACKAGE_LUA_5_1),y) +UBUS_DEPENDENCIES += lua +UBUS_CONF_OPTS += -DBUILD_LUA=ON \ + -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include \ + -DLUAPATH=/usr/lib/lua/$(LUAINTERPRETER_ABIVER) +else +UBUS_CONF_OPTS += -DBUILD_LUA=OFF +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +UBUS_DEPENDENCIES += systemd +UBUS_CONF_OPTS += -DENABLE_SYSTEMD=ON +else +UBUS_CONF_OPTS += -DENABLE_SYSTEMD=OFF +endif + +ifeq ($(BR2_PACKAGE_UBUS_EXAMPLES),y) +UBUS_CONF_OPTS += -DBUILD_EXAMPLES=ON +else +UBUS_CONF_OPTS += -DBUILD_EXAMPLES=OFF +endif + +$(eval $(cmake-package))