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 From patchwork Mon Jun 10 15:45:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1113153 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="sKnFEefj"; 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 45MyCC4kWDz9sN6 for ; Tue, 11 Jun 2019 01:45:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9B9AC20431; Mon, 10 Jun 2019 15:45:38 +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 LihchW9I0k40; Mon, 10 Jun 2019 15:45:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9BA7820412; Mon, 10 Jun 2019 15:45:35 +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 0ACA11BF399 for ; Mon, 10 Jun 2019 15:45:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0807986569 for ; Mon, 10 Jun 2019 15:45:34 +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 NUPy2E99ZyzI for ; Mon, 10 Jun 2019 15:45:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 279168656A for ; Mon, 10 Jun 2019 15:45:33 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id c6so8672957wml.0 for ; Mon, 10 Jun 2019 08:45:33 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nz8XczAP/jI8nvP/ifqbyc48E1a1V3ULSriP3Yb14to=; b=sKnFEefjpRmnzHfj/Qj3v5tc4m7hm/+Ry+nxbxmv6uWhsMPxm2JgbokW0ZqfJfJaoA oTI/6QsR+10qC3islpTQNdPbpCd0JOSqBtQpx7AbdA2i6ihBL2BLn7EzD3h/0xY9b3WY i44BrLJVU6eQzIoqWtOZQ8UISEyc8OImdo1kTT0An7W4MmBudgvNV2IA807Ortu2w7ux GadbqcvnSBJF6+9cRO7uZSUlm//2EfmfwyfJ7xqpZtJECL3o3cDhnPS9mgA43350UYeq 0UD0eBluD8b7rFIM9Qi7W3NlvrmS1kb/FKIElmoYMDJ2Aogq85rtPJav3nc+Or5wFTkX IQDQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nz8XczAP/jI8nvP/ifqbyc48E1a1V3ULSriP3Yb14to=; b=TSxdPBnr8ciVlxsFqpD6y1RvAOvePyiPgo+awoFG6ne9tx4gSA8iSanSn4GkMZZRm7 pME/eSGNUVZcgPPhD5mAXOESF+iRp/mhE3I6RFvM356KK6mAVr7Vz92voL1ISH0zZ5a1 JYPq1KlmIn68da5WNYXYgzY8gc4WzLs8630lSA2vlq6fZ67QY5+w33wa83WwaiNftMwO YLsAzlu3pZrzQj7/H8LeA/2hvvqZwnYQFzmI/KqUy6Ci97U9tXLeGZ+/csWuUf/Wu+bo cDVt5xX9SiIpExkzM3resCUX12SyIOGtRc5GoAXiQ+Y5wcS00hL+IVhRxqJXOn8xSxfh vubQ== X-Gm-Message-State: APjAAAXrW0uBub7LVXIfIsc5gFlx4hFr4BTwFS15DGBhWY4gCGDzTljF WDlv3CT4OALpRLiPllZFAtLgDh7MpQI= X-Google-Smtp-Source: APXvYqyWLZZ9Ub/ArG4XL+ry/khIqyr9WMNX2OUbHZf5AKnfvcXX+ncj5V3Wl369HVwPJgrXGhOHDQ== X-Received: by 2002:a1c:238e:: with SMTP id j136mr13055727wmj.4.1560181531447; Mon, 10 Jun 2019 08:45:31 -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.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 10 Jun 2019 08:45:30 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 10 Jun 2019 17:45:29 +0200 Message-Id: <20190610154530.26937-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190610154530.26937-1-fontaine.fabrice@gmail.com> References: <20190610154530.26937-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] package/collectd: add onewire 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" Signed-off-by: Fabrice Fontaine --- package/collectd/Config.in | 7 +++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 4ca2204a56..32a7441324 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -359,6 +359,13 @@ config BR2_PACKAGE_COLLECTD_OLSRD help Reads information about meshed networks from olsrd. +config BR2_PACKAGE_COLLECTD_ONEWIRE + bool "onewire" + select BR2_PACKAGE_OWFS + help + Collects temperature information from sensors connected over + the OneWire bus. + config BR2_PACKAGE_COLLECTD_OPENLDAP bool "openldap" depends on BR2_USE_WCHAR diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 6563668ce0..3ff314bb82 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -17,7 +17,7 @@ COLLECTD_PLUGINS_DISABLE = \ apple_sensors aquaero ascent barometer dbi dpdkstat email \ 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 \ + nut oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish virt vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone @@ -102,6 +102,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS),--enable-notify_nagios,--disable-notify_nagios) \ $(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \ $(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \ + $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),--enable-onewire,--disable-onewire) \ $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \ $(if $(BR2_PACKAGE_COLLECTD_OPENVPN),--enable-openvpn,--disable-openvpn) \ $(if $(BR2_PACKAGE_COLLECTD_PING),--enable-ping,--disable-ping) \ @@ -164,6 +165,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \ $(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \ + $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),owfs) \ $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),openldap) \ $(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \ $(if $(BR2_PACKAGE_COLLECTD_POSTGRESQL),postgresql) \ From patchwork Mon Jun 10 15:45:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1113152 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.137; helo=fraxinus.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="ineF5toR"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45MyC9093rz9sCJ for ; Tue, 11 Jun 2019 01:45:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2CDAF84AC5; Mon, 10 Jun 2019 15:45:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sQ8yXr117l52; Mon, 10 Jun 2019 15:45:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id EC9DE84C36; Mon, 10 Jun 2019 15:45:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 40D771BF399 for ; Mon, 10 Jun 2019 15:45:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3857C84C36 for ; Mon, 10 Jun 2019 15:45:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zaE0KC3Fxgck for ; Mon, 10 Jun 2019 15:45:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 247C684AC5 for ; Mon, 10 Jun 2019 15:45:35 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id c6so8673066wml.0 for ; Mon, 10 Jun 2019 08:45:35 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Llq73EmkBKLrshVJsQtrcQ/dKeBJbTbbU62IULoEMj4=; b=ineF5toR8HOYMp630fAXNfHIMkNTKq+qWOKbOdtKJSSxgdK3ZDnKJJCWjFFaElTjWd S/PRUw6K9l/r93wZbj8t39blPfh9vhDMsLm/i3ovoK4wm7lmvWX+eiWxjo5+nC9aOJdT +sygCBaNA+unwHnnlj1LHLf7I2VShZxHRk+2pkQTkF6h1np3n1HlMQQ4Xv9+b5JMd8Gf yssUEDy3ki2AlVvdwlPl6ng6gZy+1qsfNrI2mRcOtCGD33dYOyWWSqLplhvA7td61fyU OfiZUHAwaFHuyf7q+5NMSkXU/n7oO97MUnmYNLjOIEBIAvU8gGovDmiUWU0IsCPIfSmb pAUw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Llq73EmkBKLrshVJsQtrcQ/dKeBJbTbbU62IULoEMj4=; b=gqbiOu80CqIOlEI5icPX4HriFebR1NIplpLv9F+iSf3sgaALQaWhuVk19RHKL04g92 1LKKEl0YEByE7E79px5HMBaaJxYiqT7wMbF+Eg0BT9WU8eaF4LmAHU9AyACZhXLYiVVc P+Jd3axV+8Mw86yosJhx80BGnNhcGHD/lAfUuBCGzFucfSgZ7FD8E0itkpTIaM+Raqw9 FaUnSiLQS9ugzie+qQ6Sf703wu43rPqQh2W4hXGRBXamR/OxBGm3mNpMLllBHD4yXGXn xS6MOs3djVQNh97I6dULXQOnLUrf3TaecUSxOMUzNv2T6q49PFx6mH7n7PhfuAprb6cX rDMg== X-Gm-Message-State: APjAAAVZmR2CzsLzg3JlOCs8p1nosUfgSOU7ot4+b0/fQsKdAwbKWDdT HTW/auPhf0YbviqwUbbsZn5g9wVAe6s= X-Google-Smtp-Source: APXvYqxRqfQgMM3yQsQS7sB7mBOwSVszRMg8J3IBFy4EWgr/KXUsI3KxtoNKdeccOku0HkcVqx6SxQ== X-Received: by 2002:a7b:cb4b:: with SMTP id v11mr14052447wmj.103.1560181533414; Mon, 10 Jun 2019 08:45:33 -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.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 10 Jun 2019 08:45:32 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 10 Jun 2019 17:45:30 +0200 Message-Id: <20190610154530.26937-3-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190610154530.26937-1-fontaine.fabrice@gmail.com> References: <20190610154530.26937-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/3] package/collectd: add lvm 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" Signed-off-by: Fabrice Fontaine --- package/collectd/Config.in | 13 +++++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 32a7441324..7d375f2c67 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -289,6 +289,19 @@ config BR2_PACKAGE_COLLECTD_LOAD help Collects the system load. +config BR2_PACKAGE_COLLECTD_LVM + bool "lvm" + depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 app library + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LVM2_APP_LIBRARY + help + Collects the size of logical volumes (LV) and free space + inside a volume group (VG) from Linux' Logical Volume Manager + (LVM). + +comment "lvm needs a glibc or uClibc toolchain" + depends on BR2_TOOLCHAIN_USES_MUSL + config BR2_PACKAGE_COLLECTD_MD bool "md" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 3ff314bb82..3d0d04826e 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 hddtemp intel_rdt ipmi java libvirt lpar lua lvm \ + gmond hddtemp intel_rdt ipmi java libvirt lpar lua \ madwifi mbmon mic multimeter netapp notify_desktop numa \ nut oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ @@ -86,6 +86,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \ $(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \ + $(if $(BR2_PACKAGE_COLLECTD_LVM),--enable-lvm,--disable-lvm) \ $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \ @@ -158,6 +159,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ + $(if $(BR2_PACKAGE_COLLECTD_LVM),lvm2) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \