From patchwork Wed Apr 15 06:30:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1270918 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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.a=rsa-sha256 header.s=20161025 header.b=RKj9iJ1e; 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 492C9y6SDrz9sP7 for ; Wed, 15 Apr 2020 16:29:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id ADA86204BE; Wed, 15 Apr 2020 06:29:06 +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 bnuW3+tjgfpu; Wed, 15 Apr 2020 06:29:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2F35C20524; Wed, 15 Apr 2020 06:29:05 +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 C6AA21BF859 for ; Wed, 15 Apr 2020 06:29:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C3CB0826B7 for ; Wed, 15 Apr 2020 06:29:01 +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 P4nMBer6FjqF for ; Wed, 15 Apr 2020 06:29:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id EC89081F3F for ; Wed, 15 Apr 2020 06:29:00 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id f13so17640784wrm.13 for ; Tue, 14 Apr 2020 23:29:00 -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=RAiUf2eo03RWmCiNkTjfMIp+vkpQL75EDjHyxMygOVQ=; b=RKj9iJ1e7mwBiDp6ZrenhmoWSvHvzYwMuVXrQx/H9WtABk6iTJVSeRHhZ9iPM3d669 CiO3TxYqP27Saf10r1GlOCEqGv+zYnHo4PJqXaYX6CQa9WAR/4cdzDzcIQoCr9kbBL4D aWoc/KMbn/LKIxUDUIHM+k1j8HgHU87lHSCL2r97kJNBv0eVWqeyCcMs7jSZYkbB7/C2 eWgW7o7a+TSPSX29vKIGhHY1IV3djQiijq4W/YkedsQIbXr6fzn7ExydZAwE49kgWjcF HNYl6ML3U3oXvjbnHIDg7WqtNVwIttnezc/bT10c9IdyiIqhunbMP+vguyzKXeoUc7pQ wFLg== 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=RAiUf2eo03RWmCiNkTjfMIp+vkpQL75EDjHyxMygOVQ=; b=kh0fjyBiiuootIqOJzF8uOpyR4U2Yj+Gi5/og4ipMZymymIXoQDts6OM25hfm5Sv6K pBcdCTcS9KEM+0GUw6QtP1pd8Xo4b+6ugvJ1Xc2TyEns5CbM6NqMoMgw38xOXATUJxpP CeWZPMr2L0Z87Yoy4x3qcwO3+aGs8OFSI6wkfze5KPWYox2gJrdXc1sRZDjsW8/GL+IF bKYTILwc5pyWsnH1zZy17WCeUg622T2qztcNUO8R1GqOIKKinhyB6K51nhIt7Q5DDgBB jQSU0BkxH2emd2Iol13mV0GC+vnis6ahoFih+efS4EHawyvnQDDranXekSCsexcg9ON6 +ORg== X-Gm-Message-State: AGi0PuYsTIm4MMycodPiJWNqSRh7LgZATePBzkowWKmwqc0PdSxeOuJc hITs/n2aQ46l7MtMIP0PlWw3EQCv X-Google-Smtp-Source: APiQypKqPT1aU/57nG+jigY8oulI0r1CSPXQods7rLnfc8npGW10dONpHD6QtWAIIhEEFau38YCFPQ== X-Received: by 2002:a05:6000:12c5:: with SMTP id l5mr28474926wrx.185.1586932139084; Tue, 14 Apr 2020 23:28:59 -0700 (PDT) Received: from kali.home (lfbn-ren-1-403-35.w2-10.abo.wanadoo.fr. [2.10.23.35]) by smtp.gmail.com with ESMTPSA id c11sm22208698wrt.24.2020.04.14.23.28.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 23:28:58 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 15 Apr 2020 08:30:07 +0200 Message-Id: <20200415063008.2237470-5-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200415063008.2237470-1-fontaine.fabrice@gmail.com> References: <20200415063008.2237470-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3, 5/6] package/collectd: add capabilities option 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 , Asaf Kahlon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" capabilities plugin is available since version 5.11.0 and https://github.com/collectd/collectd/commit/b934f1572cdb54cf485b600546a72dbf9929ba2c It is currently enabled by default depending on jansson and libmicrohttpd availability Signed-off-by: Fabrice Fontaine Reviewed-by: Asaf Kahlon --- Changes v2 -> v3 (after review of Thomas Petazzoni): - Add dmidecode runtime dependency package/collectd/Config.in | 10 ++++++++++ package/collectd/collectd.mk | 2 ++ 2 files changed, 12 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 7186d67c36..3fc07a9014 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -128,6 +128,16 @@ config BR2_PACKAGE_COLLECTD_BIND help Collects BIND DNS statistics. +config BR2_PACKAGE_COLLECTD_CAPABILITIES + bool "capabilities" + depends on BR2_aarch64 || BR2_i386 || BR2_x86_64 # dmidecode + select BR2_PACKAGE_DMIDECODE # runtime + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBMICROHTTPD + help + Collects selected static platform data using dmidecode and + expose it through micro embedded webserver. + config BR2_PACKAGE_COLLECTD_CEPH bool "ceph" select BR2_PACKAGE_YAJL diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 964f4dc694..f04ccdb2ff 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -51,6 +51,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \ $(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \ + $(if $(BR2_PACKAGE_COLLECTD_CAPABILITIES),--enable-capabilities,--disable-capabilities) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),--enable-ceph,--disable-ceph) \ $(if $(BR2_PACKAGE_COLLECTD_CHRONY),--enable-chrony,--disable-chrony) \ $(if $(BR2_PACKAGE_COLLECTD_CGROUPS),--enable-cgroups,--disable-cgroups) \ @@ -153,6 +154,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_AMQP),rabbitmq-c) \ $(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \ + $(if $(BR2_PACKAGE_COLLECTD_CAPABILITIES),jansson libmicrohttpd) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \