From patchwork Mon Jun 10 15:45:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1113151 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X1CE4y9y"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45MyC63d43z9sCJ for ; Tue, 11 Jun 2019 01:45:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 654922041C; Mon, 10 Jun 2019 15:45:36 +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 dZ67U+p4eBUo; Mon, 10 Jun 2019 15:45:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E0AB920385; Mon, 10 Jun 2019 15:45:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 14E761BF399 for ; Mon, 10 Jun 2019 15:45:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0FB6986576 for ; Mon, 10 Jun 2019 15:45:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2Fr1PnuU3xgp for ; Mon, 10 Jun 2019 15:45:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 079548656A for ; Mon, 10 Jun 2019 15:45:31 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id e16so9725574wrn.1 for ; Mon, 10 Jun 2019 08:45:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2JNLA6lQmirxq5tL2qIk3m6dGJsB/QnRS5DDapmsAw8=; b=X1CE4y9y2uUahZswZ8O0pRvj1GspvaGBpLdeU50ZlpuWvkjEyI30DLaA8Exjrm0Tli R0P5kHTBMq+2a74pGSJaOjI0FXTv5nYQLOsG3vr8BakBl5xyD25lFCKTcC4z245unz46 J+MaXA93BwzUIGhZnAoTGfXBafRRkDf1g+4Bgqr1wI2fdgxyariQbLK2D62yWW/jj7wS L7lfXx8APhTPt5zytBmtWjDvJvITBZ7seBiH+DoVyzMkES5N+ovClXhnvjb9JHEp1AZi r2iNobxAN53sRWOGBnAv6OJAIOaDdkAj85ZvlpBrinwl4juVOSNji5USwWCgzhi3XuVy /BEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2JNLA6lQmirxq5tL2qIk3m6dGJsB/QnRS5DDapmsAw8=; b=KNOcFkrE8jlmjGxMHo6iJI6nwPcS3H4X+mEeMc+8ESIeL3VZ8ST1vEddZs7zBwSlon yqPHxyh6t8ulssZeVyuPoCHeXan51a6lK7CBVekVDArwl4SOa/QoOBHaS3o1dKd2XLwS +EUtCUc5E/v3QaiV8komZITKD4iYV1wAZbHlb3nCiN0TzaHUxFWcisEgfbrB6RSgSSVv q/LmKMhpd+dpu5pAJscb98tldyMi+G0KK1CjPxqyGVTm7o+J1Za03pHTR2G9PTv4aPy1 2imv5OY2Xvv/SFVn+o+UJDPXYCjQ3VsnLNFnCc5T2Nv9PjjlQyK01U+UquUVs8imsYGW g+mA== X-Gm-Message-State: APjAAAVNzcyXd41xlDyRuUqLL2g0JshmwyOleoh7LqKMDxqz1NZitenr 7smDbJvIqn2AbGkE8sIqlUqTYWBD98I= X-Google-Smtp-Source: APXvYqz9bfxs8WAEKQIDX+jQTjQS9wsW1crPWVkAxVGz4AvIivHzvRCzi0efkhhqG+IGNdyRvYMaSw== X-Received: by 2002:adf:a201:: with SMTP id p1mr14075659wra.113.1560181529155; Mon, 10 Jun 2019 08:45:29 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id h23sm11513789wmb.25.2019.06.10.08.45.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 10 Jun 2019 08:45:27 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 10 Jun 2019 17:45:28 +0200 Message-Id: <20190610154530.26937-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/collectd: add grpc support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use --with-libgrpc++ option as otherwise collectd will try to find grpc++.pc which is not available Signed-off-by: Fabrice Fontaine --- package/collectd/Config.in | 17 +++++++++++++++++ package/collectd/collectd.mk | 7 ++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 990dd44e6d..4ca2204a56 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -549,6 +549,23 @@ config BR2_PACKAGE_COLLECTD_GRAPHITE Writes data collected to Carbon (Graphite's) storage API. http://graphite.wikidot.com/start +config BR2_PACKAGE_COLLECTD_GRPC + bool "grpc" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc + depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf + depends on BR2_HOST_GCC_AT_LEAST_4_8 # grpc -> protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # grpc -> protobuf + select BR2_PACKAGE_GRPC + help + Send/receive values using the gRPC protocol. + +comment "grpc needs a toolchain w/ C++, host and target gcc >= 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_8 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + config BR2_PACKAGE_COLLECTD_MQTT bool "mqtt" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index ca9a9e7a95..6563668ce0 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -15,7 +15,7 @@ COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ apple_sensors aquaero ascent barometer dbi dpdkstat email \ - gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lua lvm \ + gmond hddtemp intel_rdt ipmi java libvirt lpar lua lvm \ madwifi mbmon mic multimeter netapp notify_desktop numa \ nut onewire oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ @@ -75,6 +75,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),--enable-gps,--disable-gps) \ $(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \ + $(if $(BR2_PACKAGE_COLLECTD_GRPC),--enable-grpc,--disable-grpc) \ $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ $(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ @@ -153,6 +154,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ + $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ @@ -176,6 +178,9 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis) # include/library fixups +ifeq ($(BR2_PACKAGE_GRPC),y) +COLLECTD_CONF_OPTS += --with-libgrpc++=$(STAGING_DIR)/usr +endif ifeq ($(BR2_PACKAGE_LIBCURL),y) COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr endif