From patchwork Thu Jul 25 15:37:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Fl=C3=A1vio_Tapaj=C3=B3s?= X-Patchwork-Id: 1964813 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WVFQW2rwVz1yXp for ; Fri, 26 Jul 2024 01:38:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DA19760ABA; Thu, 25 Jul 2024 15:38:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id J_CFjRApt3Wn; Thu, 25 Jul 2024 15:38:06 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 6834460AC9 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 6834460AC9; Thu, 25 Jul 2024 15:38:06 +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 31EC81BF357 for ; Thu, 25 Jul 2024 15:38:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2105E4038E for ; Thu, 25 Jul 2024 15:38:04 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id I3i5KKiJZXzg for ; Thu, 25 Jul 2024 15:38:02 +0000 (UTC) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::1030; helo=mail-pj1-x1030.google.com; envelope-from=flavio.tapajos@newtesc.com.br; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 57DC340175 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 57DC340175 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by smtp2.osuosl.org (Postfix) with ESMTPS id 57DC340175 for ; Thu, 25 Jul 2024 15:38:02 +0000 (UTC) Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-2cb5243766dso5184a91.0 for ; Thu, 25 Jul 2024 08:38:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721921881; x=1722526681; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h8ruVhNtrjcFStqkWqEggJWTWKG1o4fgttQX3qKhu5I=; b=wNY05pV+viKM2kuakfCTcdXFmm28pa6oTTeDRdptMSIxZH0uUwemKauNQGMOmlD3er 69cPSUo081xPB70YftDM7Itkq4vkDvzG+KeABuKoeY0QGEId8iwm2Fy4JOse0CrODyas BTKwUX30OvWmK6Gldg8Fl+Nk+Y9xyAwavV/dIxDzq9+DL2QDOxQkILmwTmvCxFzRKUmp qUgzv5wxQ3N2isZrGtds9tFoP6iJp1i229XyG+OH61spwQ6xxX9PzEQ0kgRkEi8tXbmr NFLV9n9NuF+3OMLhDk3dwwpHwi+s8SjtUA265LlUZxQfwwbDKWIyiwcQbww7oKRFlIHc Gukw== X-Gm-Message-State: AOJu0YwtTMQJs/tJy8/A4QQ1ErdB0aGhLlhjUaV0DBYhJCzo/TDexpu1 qGPSKy/uytyWHE56/qW8wwMGcGTMIMLqqsflvcsILo+OODZ85JcFIuxHeMySNDoe9WTpn3Gl2j9 7 X-Google-Smtp-Source: AGHT+IGwkQDRzGkevYiCBHTvVtem4SVni3LlKsvIhEfQoLIVzQGUCFU/Yo6WF4mDnlmP8Zz4WCXX2A== X-Received: by 2002:a17:90a:53a4:b0:2c9:66d3:4663 with SMTP id 98e67ed59e1d1-2cf23e269e6mr2959709a91.43.1721921881231; Thu, 25 Jul 2024 08:38:01 -0700 (PDT) Received: from niltesque.newtesc.com.br ([187.120.6.114]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cf28c9c764sm1703749a91.26.2024.07.25.08.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 08:38:00 -0700 (PDT) From: =?utf-8?q?Fl=C3=A1vio_Tapaj=C3=B3s?= To: buildroot@buildroot.org Date: Thu, 25 Jul 2024 12:37:41 -0300 Message-ID: <20240725153743.101494-2-flavio.tapajos@newtesc.com.br> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240725153743.101494-1-flavio.tapajos@newtesc.com.br> References: <20240725153743.101494-1-flavio.tapajos@newtesc.com.br> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=newtesc-com-br.20230601.gappssmtp.com; s=20230601; t=1721921881; x=1722526681; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h8ruVhNtrjcFStqkWqEggJWTWKG1o4fgttQX3qKhu5I=; b=a/aW0wJ3cgSjqeBwMLOp59cb787E9TnWf7zht1U0ZZYXseztnooLZ16fcKSaaIu0QU UfqcY6mmrqM+Qq21NKaHrd6nFP6f2V+2vSi3EsFi8kqj1/AJ/03MvVpVrdDiHEdS4GfB 3m1tdsDnBtzcmtWc3843Pz/20xRSQnbv/1N6VQ+/VueU8e/u8saPnNyakVufh5RRyA5a TzkTc34Cu3Aq+loKEfo9xWQydhcN+XE3Gt91gkDUmZV3s/8tJ5q8GJlkyY1wAmxdOvm8 nrerv+iWrFMNXhcglFkke2NaaT3SYiJ/q+9BMkMx0k6z3wXH0HBiW26mB7CrcIjvuOph l+eA== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=newtesc.com.br X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=newtesc-com-br.20230601.gappssmtp.com header.i=@newtesc-com-br.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=a/aW0wJ3 Subject: [Buildroot] [PATCH 2/3] package/rsyslog: extra plugins option introduced X-BeenThere: buildroot@buildroot.org 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: =?utf-8?q?Fl=C3=A1vio_Tapaj=C3=B3s?= , Konstantin Menyaev Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Konstantin Menyaev By default rsyslog builds with a bunch of plugins, most of them are not even used, despite the dependent package like lubcurl. This option is useful in embedded systems to achieve compact footprint. Signed-off-by: Konstantin Menyaev Signed-off-by: Flávio Tapajós --- package/rsyslog/Config.in | 10 ++++++++++ package/rsyslog/rsyslog.mk | 35 +++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in index d9e8b1ab6f..044ea861bc 100644 --- a/package/rsyslog/Config.in +++ b/package/rsyslog/Config.in @@ -17,6 +17,16 @@ config BR2_PACKAGE_RSYSLOG http://www.rsyslog.com +if BR2_PACKAGE_RSYSLOG + +config BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS + bool "extra plugins" + default y + help + Rsyslog extra plugins support + +endif # BR2_PACKAGE_RSYSLOG + comment "rsyslog needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index fac78795c2..ae645011ba 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -15,12 +15,15 @@ RSYSLOG_CPE_ID_VENDOR = rsyslog RSYSLOG_IGNORE_CVES += CVE-2015-3243 RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' + +ifeq ($(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),y) RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \ mail omprog omruleset omstdout omuxsock \ pmaixforwardedfrom pmciscoios pmcisconames pmlastmsg pmsnare +endif -ifeq ($(BR2_PACKAGE_LIBRELP),y) +ifeq ($(BR2_PACKAGE_LIBRELP)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += librelp RSYSLOG_PLUGINS += relp endif @@ -33,7 +36,7 @@ RSYSLOG_CONF_OPTS += \ --disable-mmkubernetes \ --disable-mmnormalize -ifeq ($(BR2_PACKAGE_LIBCURL),y) +ifeq ($(BR2_PACKAGE_LIBCURL)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += libcurl RSYSLOG_CONF_OPTS += \ --enable-clickhouse \ @@ -52,35 +55,35 @@ RSYSLOG_CONF_OPTS += \ --disable-omhttpfs endif -ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) +ifeq ($(BR2_PACKAGE_CIVETWEB_LIB)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += apr-util civetweb RSYSLOG_CONF_OPTS += --enable-imhttp else RSYSLOG_CONF_OPTS += --disable-imhttp endif -ifeq ($(BR2_PACKAGE_CZMQ),y) +ifeq ($(BR2_PACKAGE_CZMQ)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += czmq RSYSLOG_CONF_OPTS += --enable-imczmq --enable-omczmq else RSYSLOG_CONF_OPTS += --disable-imczmq --disable-omczmq endif -ifeq ($(BR2_PACKAGE_GNUTLS),y) +ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += gnutls RSYSLOG_CONF_OPTS += --enable-gnutls else RSYSLOG_CONF_OPTS += --disable-gnutls endif -ifeq ($(BR2_PACKAGE_HIREDIS),y) +ifeq ($(BR2_PACKAGE_HIREDIS)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += hiredis RSYSLOG_CONF_OPTS += --enable-omhiredis else RSYSLOG_CONF_OPTS += --disable-omhiredis endif -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += libgcrypt RSYSLOG_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config RSYSLOG_CONF_OPTS += --enable-libgcrypt @@ -88,21 +91,21 @@ else RSYSLOG_CONF_OPTS += --disable-libgcrypt endif -ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +ifeq ($(BR2_PACKAGE_LIBMAXMINDDB)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += libmaxminddb RSYSLOG_CONF_OPTS += --enable-mmdblookup else RSYSLOG_CONF_OPTS += --disable-mmdblookup endif -ifeq ($(BR2_PACKAGE_LIBPCAP),y) +ifeq ($(BR2_PACKAGE_LIBPCAP)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += libpcap RSYSLOG_CONF_OPTS += --enable-impcap else RSYSLOG_CONF_OPTS += --disable-impcap endif -ifeq ($(BR2_PACKAGE_MARIADB),y) +ifeq ($(BR2_PACKAGE_MARIADB)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += mariadb RSYSLOG_CONF_OPTS += --enable-mysql RSYSLOG_CONF_ENV += ac_cv_prog_MYSQL_CONFIG=$(STAGING_DIR)/usr/bin/mysql_config @@ -110,7 +113,7 @@ else RSYSLOG_CONF_OPTS += --disable-mysql endif -ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +ifeq ($(BR2_PACKAGE_POSTGRESQL)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += postgresql RSYSLOG_CONF_OPTS += --enable-pgsql RSYSLOG_CONF_ENV += ac_cv_prog_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config @@ -118,28 +121,28 @@ else RSYSLOG_CONF_OPTS += --disable-pgsql endif -ifeq ($(BR2_PACKAGE_QPID_PROTON),y) +ifeq ($(BR2_PACKAGE_QPID_PROTON)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += qpid-proton RSYSLOG_CONF_OPTS += --enable-omamqp1 else RSYSLOG_CONF_OPTS += --disable-omamqp1 endif -ifeq ($(BR2_PACKAGE_RABBITMQ_C),y) +ifeq ($(BR2_PACKAGE_RABBITMQ_C)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += rabbitmq-c RSYSLOG_CONF_OPTS += --enable-omrabbitmq else RSYSLOG_CONF_OPTS += --disable-omrabbitmq endif -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += util-linux RSYSLOG_CONF_OPTS += --enable-uuid else RSYSLOG_CONF_OPTS += --disable-uuid endif -ifeq ($(BR2_INIT_SYSTEMD),y) +ifeq ($(BR2_INIT_SYSTEMD)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_CONF_OPTS += \ --enable-imjournal \ --enable-omjournal \ @@ -151,7 +154,7 @@ RSYSLOG_CONF_OPTS += \ --disable-omjournal endif -ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y) +ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS)$(BR2_PACKAGE_RSYSLOG_WITH_EXTRA_PLUGINS),yy) RSYSLOG_CONF_OPTS += --enable-libdbi RSYSLOG_DEPENDENCIES += libdbi-drivers else