From patchwork Mon Jul 27 20:32:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1337290 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr 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=th34F8iT; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BFs2k5Y2hz9sTK for ; Tue, 28 Jul 2020 06:33:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9D36B8787C; Mon, 27 Jul 2020 20:33: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 hR1EKgdY8Vp2; Mon, 27 Jul 2020 20:33:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 710E287775; Mon, 27 Jul 2020 20:33:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7D4A41BF973 for ; Mon, 27 Jul 2020 20:33:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 708DF88265 for ; Mon, 27 Jul 2020 20:33:10 +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 x0VSp3GGFSxq for ; Mon, 27 Jul 2020 20:33:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id AB1DE881F9 for ; Mon, 27 Jul 2020 20:33:09 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id r2so11063347wrs.8 for ; Mon, 27 Jul 2020 13:33:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GbFH/1rxs4fio+sKm7Zsa53u1RSavZE7iWVZv5fMin4=; b=th34F8iTz2PQwMwTHq7X63ytjsGhMaLvz2p9+rY+DzkUBi703bzYx6aUQJqCS13wZz d5ECP8WQ50s+z8t99mlol39E9ymLfidTewWunnFJXOhLV7kqe5nU8MNgXkADLuqmxm1H w+dkVwHTw036sb9Ub16SK9DkAK3Y1O1wLFuMyspYspijw2sPyHDmXHuEbj0QVOslFaMN +rvozT694v7WfgmYf3bBPJLK2h2DRMDrgS0Rh3rbIQyqk3r2lc/Q8+0jbvFnaGgY+oql kol4aFfoGWVjXnSSxWTjJEw/n0YiTN/Cupgt1yYrUzAwepCVI0zEgUk1+twdZNoWBijW GHKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GbFH/1rxs4fio+sKm7Zsa53u1RSavZE7iWVZv5fMin4=; b=DmDLolSUpPD6Bkl8jdKDk3FEUxj32mbFjrmeIxeGvz4Qb9wxgyRlwbAoScsLb6LKP8 bwsytSwNFwc5TiYcy4JXhFMy6h+1aUyxc8hFDZKwvhwhygO6mSw4YKe15XUF/MXzhu2u HdHvPcMp4GoSfr+6yvKh1EhmWQGoboHrDF9Bjr9psQD78eBl7Jbi7og0jezZjwNVpfbs K7NUTm4BmxfBzVHqUPLEL+e1cNF2bN5ckNGc11rvzufi4035rHRFLa+cDrDiySqNmiTC Rakt0FB1UkNrmg7jiV0r2XRuob1WGA9dTKX3giVvIxZAS1omPaPa04M79zKgzbs1mmG4 IVXQ== X-Gm-Message-State: AOAM531u8NbSjDNQC7RZioWm/OtNGQWGjhXnwhofsyMn/yYx3LITMmNU V8YZwgY9PSRWAQ0Op+CA3qj8/nIP X-Google-Smtp-Source: ABdhPJzdhN4QURL8a0Pg+dxT4Ok6+HeaJvB0m6w9C8pIZ7XYXJifHzSJ1AeubI2fPJXf1UmtNTRIrA== X-Received: by 2002:adf:de8d:: with SMTP id w13mr21389201wrl.129.1595881987913; Mon, 27 Jul 2020 13:33:07 -0700 (PDT) Received: from scaer.home ([2a01:cb19:8b51:cb00:d4f:d67b:e735:cdab]) by smtp.gmail.com with ESMTPSA id j11sm13888159wrq.69.2020.07.27.13.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 13:33:07 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 27 Jul 2020 22:32:58 +0200 Message-Id: <911a9bf5739d94545cc482c765f876a9ff73e304.1595881971.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 7/9 v2] package/collectd: depend on luainterpreter for lua 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: James Hilliard , "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: James Hilliard Since collectd lua support is compatible with any luainterpreter implementation we should depend on BR2_PACKAGE_HAS_LUAINTERPRETER instead of unconditionally selecting BR2_PACKAGE_LUA. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: use luainterpreter as dependency] Signed-off-by: Yann E. MORIN --- package/collectd/Config.in | 5 ++++- package/collectd/collectd.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 188be3c0fb..276ad17329 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -65,11 +65,14 @@ config BR2_PACKAGE_COLLECTD_LOGSTASH config BR2_PACKAGE_COLLECTD_LUA bool "lua" - select BR2_PACKAGE_LUA + depends on BR2_PACKAGE_HAS_LUAINTERPRETER help Embeds a Lua interpreter into collectd and provides an interface to collectd's plugin system. +comment "lua support needs a Lua interpreter" + depends on !BR2_PACKAGE_HAS_LUAINTERPRETER + config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL bool "notify_email" depends on !BR2_STATIC_LIBS # libesmtp diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 24cdad7e1b..6d084dbe42 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -160,7 +160,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_LUA),lua) \ + $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \