From patchwork Sun Mar 21 13:58:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1456289 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=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) 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=PeubQsNZ; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F3K6v3z0dz9sRf for ; Mon, 22 Mar 2021 01:01:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 36B0E60629; Sun, 21 Mar 2021 14:01:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6tBS2hiG4sr9; Sun, 21 Mar 2021 14:01:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 8AE256060E; Sun, 21 Mar 2021 14:01:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 26FF61BF48C for ; Sun, 21 Mar 2021 14:01:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1681D40264 for ; Sun, 21 Mar 2021 14:01:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VVz9N_wgyNyS for ; Sun, 21 Mar 2021 14:01:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by smtp2.osuosl.org (Postfix) with ESMTPS id 11FA040245 for ; Sun, 21 Mar 2021 14:01:15 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id o16so13958712wrn.0 for ; Sun, 21 Mar 2021 07:01:15 -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=Z3kwBNpwPORdBsSnzsneAuRXDkqqAh7HzXK91sKitAc=; b=PeubQsNZOkSjyHLAUVGvoap2TCnUEyRuQH+5NBl3OumvMdQukBOBBU5TJBNwtITLg2 5MNJu4LwbeVNpUsRFAPXFcz378CvczQ8k8JTIEpXUnAMabxctKwwlpZXc/GoRUuIMVft x3pcUwuzdc+Pko96vBOE4Fbpk5QduZ5h60mSZFv6YRc2QRnyra4ON1Y53ImJuJ4gP45s WKVVl2/7vLIzB9LZ89ZNGZdHqqE2lJJGO3qtwY7v1UvA5ZQ3ovU/ORhScuyIl+a7fZnW blg1HzUUcS4xqRKpoR+mi7xQ357LpzNLGObwyp9UlpYZKMDTnNZ0IsN6vJlLzARQaf5O iT8g== 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=Z3kwBNpwPORdBsSnzsneAuRXDkqqAh7HzXK91sKitAc=; b=j7BU3Hv2Qx+8tc90ZICuj7JzvtVuJdJwGOziNi7ZRmk5R7nsKrdnhY/Lc2b1Sp6kFq gyTQCUcAvgpTOb0e3dbzDL9GxtNOGiG5NBvZI1Ris/QR46N5ko5x61YkTCgxiGgIVJJo FghIJEn87l9IpyAcf4f21gP8oz8iCWKoW2mjXVZbofGcQa9IU0JRTn5ZiEEOOJ/tgZw9 A8rYLgg4jzjRYF+xKs6ZAkiJhpBslRF2oAw/HIH4AGBfdi9JWMgE6U4XDhd5ysy+BX2v txzyYe+UEL90Sy/FI4zdV0jDV5nLJjXdqSazOUiL1ayCO+SG3edEIATnrJ1gY48Qey+F Fa7g== X-Gm-Message-State: AOAM532HU+yB0Cnk1JYIWnI1UNol5t+naozm8YsvQJ9TE0Iz1mPrafcv e0JjkWZrrXInPkDZWOFtG/wZ3xmNEYk= X-Google-Smtp-Source: ABdhPJy8tBk9nuzV21Nnk5l1QHJeQ6gUDgBKAboRmssLpucVXsh9YZ3MX5KQxlBJUfCO76Tw+kVJag== X-Received: by 2002:adf:f005:: with SMTP id j5mr13390604wro.423.1616335274101; Sun, 21 Mar 2021 07:01:14 -0700 (PDT) Received: from kali.home (lfbn-ren-1-358-30.w2-10.abo.wanadoo.fr. [2.10.19.30]) by smtp.gmail.com with ESMTPSA id w132sm14004147wmg.39.2021.03.21.07.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Mar 2021 07:01:13 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 21 Mar 2021 14:58:42 +0100 Message-Id: <20210321135842.1165539-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3, 1/1] package/rsyslog: enable options when libcurl is enabled 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: Matt Weber , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Following the bump to 8.1910.0, items requiring libcurl were disabled by default. This patch selectively enables options which depend on libcurl when that package is enabled in the build. Signed-off-by: Matthew Weber [Fabrice: Disable mmkubernetes which also depends on lognorm and while at it also disable mmnormalize which is available since version 6.1.2 (from 2010) and https://github.com/rsyslog/rsyslog/commit/b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf] Signed-off-by: Fabrice Fontaine Reviewed-by: Joachim Wiberg --- Changes v2 -> v3: - Disable mmnormalize and mmkubernetes Changes v1 -> v2 [Thomas - Flipped libcurl conditional and name of this patchset to rsyslog package/rsyslog/rsyslog.mk | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 99e80ae268..70adcd553b 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -24,14 +24,27 @@ endif RSYSLOG_CONF_OPTS = --disable-generate-man-pages \ $(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x)) -# Disable items requiring libcurl +# Disable items requiring lognorm +RSYSLOG_CONF_OPTS += \ + --disable-mmkubernetes \ + --disable-mmnormalize + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +RSYSLOG_DEPENDENCIES += libcurl +RSYSLOG_CONF_OPTS += --enable-elasticsearch \ + --enable-clickhouse \ + --enable-omhttp \ + --enable-fmhttp \ + --enable-imdocker \ + --enable-omhttpfs +else RSYSLOG_CONF_OPTS += --disable-elasticsearch \ --disable-clickhouse \ --disable-omhttp \ --disable-fmhttp \ --disable-imdocker \ - --disable-omhttpfs \ - --disable-mmkubernetes + --disable-omhttpfs +endif ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) RSYSLOG_DEPENDENCIES += civetweb