From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E2D8BA0C41 for ; Tue, 30 Nov 2021 17:43:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D748F41170; Tue, 30 Nov 2021 17:43:46 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id CF21841170 for ; Tue, 30 Nov 2021 17:43:45 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id DC0463FFE1 for ; Tue, 30 Nov 2021 16:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290624; bh=GGlP52dl56nuf+0DFVWfWJlM/6sTSc9rU/+a9+kNUxc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fkZ4IMl4FfkN3E23MLVs1vhqg+itXA9w+Wwg1qgSZ5k9qCroR2AeXsh1+c9wWC5aH FDckhgWeBaExtVpPrLQzuyo0Q/SmXqZSiFGZUFgAuvmKiyla+AvGPiY2AcOhIV4P84 dow/fugkgq4HMXJ39F0b32oUjJUUPW9Lo+YvyJ27bM9tHcTP3z4iAFeI3gJOq7hUIb l1niM4R+Y1Wviaduk8EGLzKXsy/xArLmYxIbJ8JtCUK472LAcawGBlIaw/oh9T6jy7 64E2UdpV40qB6iWT7dtAN8hp/5Rnd2ZgLtP6eGWPvRg9xv8it+0QZHckFZH0y8fWY0 Fs1jm8IKT0VuA== Received: by mail-ed1-f72.google.com with SMTP id d13-20020a056402516d00b003e7e67a8f93so17534894ede.0 for ; Tue, 30 Nov 2021 08:43:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GGlP52dl56nuf+0DFVWfWJlM/6sTSc9rU/+a9+kNUxc=; b=ICGg6ip+JdwgolA4bR/JpPyomuyrsupNsUOnhk4NQ31v2gHIg4mU7e7TLw2KOZOT8z XwdNr/AdYw/tl7maDVxucg3eJw60zM7HGpRRrkeZNvbpjQMPzK0LhQbD9uxUt+dnPSuV KVkmOIXVyojOLad8XBvDZq95Wm0h3nWkqEhzalFunjRA5wqkA5ZcfYnoqP2K6Jz6mCbv bMAhIJltjWplLHg82v1lotz+/TobS4zZSrep/CnUlqZcQlCuM0hcADxfU4gQlr3udz2N 2KLzvvF3Q9ArykPfju5h89SdUfmK58yY6b9/CJpk6BGMV0y9+ePLdSc/HPWtfNoBODDB WsAw== X-Gm-Message-State: AOAM532g+kmh6TKMlYIEpNST3yeoPcfP8M7/q6RyfwoAEWyFJ51trg3/ HL/3IFUYy0LyDGT+SxURuqx1WATECI5AoudFGUS0yTEeYMI9h7wiagoflGnjNf6gPKYoEsv4lp6 BXRCI2/KdfUGStAa9XlamicvU X-Received: by 2002:a05:6402:50c7:: with SMTP id h7mr54863edb.277.1638290624306; Tue, 30 Nov 2021 08:43:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxz+Mr9ITPx+Div/6DoOijNWW2o1PqfqqA6ATWtNK7N/eMWbA2mIKDBrlmoA+OCBIDIJ3IDlg== X-Received: by 2002:a05:6402:50c7:: with SMTP id h7mr54847edb.277.1638290624183; Tue, 30 Nov 2021 08:43:44 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id ds17sm9711078ejc.45.2021.11.30.08.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:43:43 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Marchand Cc: dpdk stable Subject: patch 'examples/ntb: fix build dependency' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:52 +0100 Message-Id: <20211130163605.2460997-148-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/7f9c3453bca07753b504ed3b4a6d570974b990f0 Thanks. Christian Ehrhardt --- >From 7f9c3453bca07753b504ed3b4a6d570974b990f0 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 16 Nov 2021 21:51:35 +0100 Subject: [PATCH] examples/ntb: fix build dependency [ upstream commit 2c7302145c0405b056850382731e5352d44f7d64 ] Caught while building with -Ddisable_drivers=*/*. This example requires raw/ntb specific API. Fix dependency to avoid a compilation error: FAILED: examples/c590b3c@@dpdk-ntb@exe/ntb_ntb_fwd.c.o ccache gcc -Iexamples/c590b3c@@dpdk-ntb@exe -Iexamples -I../examples -Iexamples/ntb -I../examples/ntb -I. -I../ -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -Ilib/eal/common -I../lib/eal/common -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/telemetry/../metrics -I../lib/telemetry/../metrics -Ilib/telemetry -I../lib/telemetry -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/cmdline -I../lib/cmdline -Ilib/rawdev -I../lib/rawdev -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Werror -O2 -g -include rte_config.h -Wextra -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-missing-field-initializers -D_GNU_SOURCE -march=corei7 -Wno-format-truncation -D_FILE_OFFSET_BITS=64 -DALLOW_EXPERIMENTAL_API -MD -MQ 'examples/c590b3c@@dpdk-ntb@exe/ntb_ntb_fwd.c.o' -MF 'examples/c590b3c@@dpdk-ntb@exe/ntb_ntb_fwd.c.o.d' -o 'examples/c590b3c@@dpdk-ntb@exe/ntb_ntb_fwd.c.o' -c ../examples/ntb/ntb_fwd.c ../examples/ntb/ntb_fwd.c:21:10: fatal error: rte_pmd_ntb.h: No such file or directory #include ^~~~~~~~~~~~~~~ compilation terminated. Fixes: 5194299d6ef5 ("examples/ntb: support more functions") Signed-off-by: David Marchand --- examples/ntb/meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build index f5435fe120..b4f9dc395d 100644 --- a/examples/ntb/meson.build +++ b/examples/ntb/meson.build @@ -9,11 +9,8 @@ if host_machine.system() != 'linux' build = false endif -deps += 'rawdev' +deps += ['rawdev','rawdev_ntb'] cflags += ['-D_FILE_OFFSET_BITS=64'] sources = files( 'ntb_fwd.c' ) -if dpdk_conf.has('RTE_LIBRTE_PMD_NTB_RAWDEV') - deps += 'rawdev_ntb' -endif -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:14.473519534 +0100 +++ 0148-examples-ntb-fix-build-dependency.patch 2021-11-30 16:50:06.102875819 +0100 @@ -1 +1 @@ -From 2c7302145c0405b056850382731e5352d44f7d64 Mon Sep 17 00:00:00 2001 +From 7f9c3453bca07753b504ed3b4a6d570974b990f0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2c7302145c0405b056850382731e5352d44f7d64 ] + @@ -42 +43,0 @@ -Cc: stable@dpdk.org @@ -50 +51 @@ -index 37899dfeb6..18eaffdf21 100644 +index f5435fe120..b4f9dc395d 100644 @@ -53,2 +54,3 @@ -@@ -12,11 +12,8 @@ if not is_linux - subdir_done() +@@ -9,11 +9,8 @@ + if host_machine.system() != 'linux' + build = false @@ -56 +57,0 @@ - @@ -58 +59 @@ -+deps += ['rawdev', 'raw_ntb'] ++deps += ['rawdev','rawdev_ntb'] @@ -61 +62 @@ - 'ntb_fwd.c', + 'ntb_fwd.c' @@ -63,2 +64,2 @@ --if dpdk_conf.has('RTE_RAW_NTB') -- deps += 'raw_ntb' +-if dpdk_conf.has('RTE_LIBRTE_PMD_NTB_RAWDEV') +- deps += 'rawdev_ntb'