From patchwork Wed Jan 31 17:45:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 136237 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3065C43A22; Wed, 31 Jan 2024 18:46:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19CF042DA1; Wed, 31 Jan 2024 18:46:03 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D436D402ED for ; Wed, 31 Jan 2024 18:46:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706723160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=604kyxMPtixIYh3pP8OkU/VgeAwo0vGZAzHrSPZL1pI=; b=Vv/GKTNAIK/Qp7fmw5BmUp0LuYrIpp6oZ0+5T9XlosIKcYwhWGRUxKlfCwwAc+b3NZWKPU tbG7xZu32LcKIk556Eb3NSWC9/hxOGgTs0uOzZ87+nh75bc192OLY2+sRI2arHOBssvJ2a 7UmOfiObONp8Rv6f96W7FqU72XqHsIM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-650-GOC1_rilMeWrdw3tuW4bUA-1; Wed, 31 Jan 2024 12:45:57 -0500 X-MC-Unique: GOC1_rilMeWrdw3tuW4bUA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8EA8085A58B; Wed, 31 Jan 2024 17:45:56 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CD912166B08; Wed, 31 Jan 2024 17:45:55 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: stable@dpdk.org, Kai Ji , Bruce Richardson , Markus Theil Subject: [PATCH 1/2] build: fix reasons conflict Date: Wed, 31 Jan 2024 18:45:51 +0100 Message-ID: <20240131174552.2601531-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The "_disable_reason" variables are subject to naming conflicts. This has been caught while looking at mingw builds where the graph application was skipped with an (which is caused by a missing reason variable set in app/graph/meson.build) and the graph library was skipped with the same too, even though this library meson does set a proper reason variable. Example in GHA: ================= Content Skipped ================= apps: dumpcap: not supported on Windows graph: pdump: not supported on Windows ... libs: acl: not supported on Windows bbdev: not supported on Windows ... graph: node: not supported on Windows Prefix all those variables with the type of component. Fixes: ecf75180171b ("build: list selected applications") Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- app/meson.build | 2 +- drivers/common/qat/meson.build | 10 +++++----- drivers/meson.build | 4 ++-- lib/meson.build | 2 +- meson.build | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/meson.build b/app/meson.build index 8aaed59f39..21b6da29b3 100644 --- a/app/meson.build +++ b/app/meson.build @@ -93,7 +93,7 @@ foreach app:apps if not build if reason != '' dpdk_apps_disabled += app - set_variable(app.underscorify() + '_disable_reason', reason) + set_variable('app_' + app.underscorify() + '_disable_reason', reason) endif continue endif diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build index 5c36fbb270..62abcb6fe3 100644 --- a/drivers/common/qat/meson.build +++ b/drivers/common/qat/meson.build @@ -17,13 +17,13 @@ qat_compress_relpath = '../../' + qat_compress_path if disable_drivers.contains(qat_crypto_path) qat_crypto = false dpdk_drvs_disabled += qat_crypto_path - set_variable(qat_crypto_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_crypto_path.underscorify() + '_disable_reason', 'Explicitly disabled via build config') endif if disable_drivers.contains(qat_compress_path) qat_compress = false dpdk_drvs_disabled += qat_compress_path - set_variable(qat_compress_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_compress_path.underscorify() + '_disable_reason', 'Explicitly disabled via build config') endif @@ -36,7 +36,7 @@ if arch_subdir == 'arm' else qat_crypto = false dpdk_drvs_disabled += qat_crypto_path - set_variable(qat_crypto_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_crypto_path.underscorify() + '_disable_reason', 'missing dependency for Arm, libcrypto') endif else @@ -57,7 +57,7 @@ else else qat_crypto = false dpdk_drvs_disabled += qat_crypto_path - set_variable(qat_crypto_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_crypto_path.underscorify() + '_disable_reason', 'missing dependency, libipsecmb or libcrypto') endif elif libcrypto.found() @@ -66,7 +66,7 @@ else else qat_crypto = false dpdk_drvs_disabled += qat_crypto_path - set_variable(qat_crypto_path.underscorify() + '_disable_reason', + set_variable('drv_' + qat_crypto_path.underscorify() + '_disable_reason', 'missing dependency, libipsecmb or libcrypto') endif endif diff --git a/drivers/meson.build b/drivers/meson.build index 5ba534049a..f2be71bc05 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -93,7 +93,7 @@ foreach subpath:subdirs if skip_class drv_path = join_paths(class, '*') dpdk_drvs_disabled += drv_path - set_variable(drv_path.underscorify() + '_disable_reason', reason) + set_variable('drv_' + drv_path.underscorify() + '_disable_reason', reason) continue endif endif @@ -199,7 +199,7 @@ foreach subpath:subdirs # component disable printout in those cases if reason != '' dpdk_drvs_disabled += drv_path - set_variable(drv_path.underscorify() + '_disable_reason', reason) + set_variable('drv_' + drv_path.underscorify() + '_disable_reason', reason) endif continue endif diff --git a/lib/meson.build b/lib/meson.build index 6c143ce5a6..55d483cd26 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -228,7 +228,7 @@ foreach l:libraries if not build dpdk_libs_disabled += name - set_variable(name.underscorify() + '_disable_reason', reason) + set_variable('lib_' + name.underscorify() + '_disable_reason', reason) continue endif diff --git a/meson.build b/meson.build index 5e161f43e5..8b248d4505 100644 --- a/meson.build +++ b/meson.build @@ -164,17 +164,17 @@ message(output_message + '\n') output_message = '\n=================\nContent Skipped\n=================\n' output_message += '\napps:\n\t' foreach app:dpdk_apps_disabled - reason = get_variable(app.underscorify() + '_disable_reason') + reason = get_variable('app_' + app.underscorify() + '_disable_reason') output_message += app + ':\t' + reason + '\n\t' endforeach output_message += '\nlibs:\n\t' foreach lib:dpdk_libs_disabled - reason = get_variable(lib.underscorify() + '_disable_reason') + reason = get_variable('lib_' + lib.underscorify() + '_disable_reason') output_message += lib + ':\t' + reason + '\n\t' endforeach output_message += '\ndrivers:\n\t' foreach drv:dpdk_drvs_disabled - reason = get_variable(drv.underscorify() + '_disable_reason') + reason = get_variable('drv_' + drv.underscorify() + '_disable_reason') output_message += drv + ':\t' + reason + '\n\t' endforeach message(output_message + '\n') From patchwork Wed Jan 31 17:45:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 136238 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D39943A22; Wed, 31 Jan 2024 18:46:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E0A942DAC; Wed, 31 Jan 2024 18:46:04 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A878042DA6 for ; Wed, 31 Jan 2024 18:46:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706723163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PDlja3fQpYJXLDeBN8qqNIiUKufxIwtVgMnHH8efCjo=; b=D/ZXbvFYIQ9fQLGas2slUrTDaTsYcn9pA6RqjosFiG82eBGjXjGh2eAZjyTz68bWsLXkFH 2idAsKkpcynsXfQnMldcoTTbBr9ESZkivtMuhgU8n6HKeU5UPZ47OzH6K7J9/yLzQNEzdu IKL+C+3TKxn2tdBiTURZRSiCsm7g8cg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619-w-okgr-CMqqJ_8nJ4TZ0Mw-1; Wed, 31 Jan 2024 12:46:00 -0500 X-MC-Unique: w-okgr-CMqqJ_8nJ4TZ0Mw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8667983B870; Wed, 31 Jan 2024 17:45:59 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CAF840D1B67; Wed, 31 Jan 2024 17:45:58 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: stable@dpdk.org, Sunil Kumar Kori , Rakesh Kudurumalla , Nithin Dabilpuram Subject: [PATCH 2/2] app/graph: fix build reason Date: Wed, 31 Jan 2024 18:45:52 +0100 Message-ID: <20240131174552.2601531-2-david.marchand@redhat.com> In-Reply-To: <20240131174552.2601531-1-david.marchand@redhat.com> References: <20240131174552.2601531-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When a component is disabled, the reason meson variable must be set to provide an explanation why. Since epoll is a Linux thing, report that the graph application is only supported on Linux. Fixes: 5b21ffb23308 ("app/graph: add CLI framework") Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Tyler Retzlaff Acked-by: Chengwen Feng --- app/graph/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/app/graph/meson.build b/app/graph/meson.build index 5b0f966d99..8aefdf505c 100644 --- a/app/graph/meson.build +++ b/app/graph/meson.build @@ -5,6 +5,7 @@ name = 'graph' build = cc.has_header('sys/epoll.h') if not build + reason = 'only supported on Linux' subdir_done() endif