From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 31393A051C for ; Tue, 11 Feb 2020 12:24:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 282CC2B9C; Tue, 11 Feb 2020 12:24:46 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 061EC2B9C for ; Tue, 11 Feb 2020 12:24:45 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id t14so3051092wmi.5 for ; Tue, 11 Feb 2020 03:24:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NtnqOHXca/npm0IilDYO/EDhgOi6I0aPC87ydJggFx0=; b=ATpwEFSOuCsIQM4ZIQ9ixbVNh3rCDQo3tCtSJWZJmt/IGv4rFsxNMaqSR0UaVpezoO DsKISCMYRaT0AJBeIeD4rMBQ0atzbPsiPkVImU4sEZfOs86Bw/pt7ARukzujIS5L1K7Q AhSo3/whBx0oq+MuN2ZzPjdv8AlHHHcRON4b9kxinY2yFjkNkywSFn/+qaFrVbMkzPLA ZiQLtcTds4ris0yFN9VbgBboB4eogMRJECjVK31uF7FRCCrdX6qZDBHjQp+SdO65RtdF e4in53r8ee+rZ2MO5xuntcsDvU2J035tBwnIfIYBH7UpEIb+wguFjn8q63u8D+NsUgHe uwfQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=NtnqOHXca/npm0IilDYO/EDhgOi6I0aPC87ydJggFx0=; b=RsPrwff0HUF8YlaKS/VZ57PIoEx8l5lOSnVmj6MpoDbF6lPKUwdwpCFLUlTh84RjTR tvGFrQbb0E1NHluc2z3OplMb1u3v91eHGJJdTGyZre1XKbpsy/3QZFBzbk3C0X/4yxwj pd7amPBfO7RBTtuvfV9qIRxE9KkEvc2mwQHo9euNWgYzf1a5p8QMir8dKJKeWOBZuR8v OWIfxmQRqntrxCfS4e3km7UziF9U6MfKKWuOpb6AgymblzOl7brv239qKboV+n/bpuGV BkUJWW/ebSYDty1Q4+1cmZqD06lLaRzi6B2bYibDJ+lU4yxWSsNmnYeVy5fsg6+TIgSB GGwg== X-Gm-Message-State: APjAAAV6bW82eTOeFlLfsfUoqNeJ1nBXpTcbnniU4BmWkakrdSL/6ytF RFe8SjU7ROkI61Gfd9BMF7U= X-Google-Smtp-Source: APXvYqx2lGMobI38cupzoxwZshOa5SMnHnee13MyrBUSg2w3yXN+S130cMrsaE5PsrXygyyGPW/i8Q== X-Received: by 2002:a1c:5f41:: with SMTP id t62mr5246966wmb.42.1581420284664; Tue, 11 Feb 2020 03:24:44 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v12sm4655183wru.23.2020.02.11.03.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:24:44 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Rosen Xu , dpdk stable Date: Tue, 11 Feb 2020 11:19:37 +0000 Message-Id: <20200211112216.3929-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ipn3ke: fix meson build' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. 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. Thanks. Luca Boccassi --- >From ea1e97addf528d6749741e8eaf60ee3fec9cbc74 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 12 Dec 2019 17:28:43 +0000 Subject: [PATCH] net/ipn3ke: fix meson build [ upstream commit 7a3c4f4de26381f3f2b85297f603ad6a5f96a9f3 ] The ipn3ke driver and the ifpga driver had circular dependencies on each other, meaning that neither could be built with meson. Fix this by: * setting the build order of net and raw to match that in makefiles * removing the dependency from the net driver on the rawdev one * fixing the dependency names in the rawdev driver meson.build file Fixes: 8418c92811b4 ("net/ipn3ke: remove configuration for i40e port bonding") Fixes: e1defba4cf66 ("raw/ifpga/base: support device tree") Signed-off-by: Bruce Richardson Acked-by: Rosen Xu --- drivers/meson.build | 4 ++-- drivers/net/ipn3ke/meson.build | 4 +++- drivers/raw/ifpga/meson.build | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 72eec46088..32d68aa1d0 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -9,8 +9,8 @@ endif dpdk_driver_classes = ['common', 'bus', 'mempool', # depends on common and bus. - 'raw', # depends on common and bus. - 'net', # depends on common, bus, mempool and raw. + 'net', # depends on common, bus, mempool + 'raw', # depends on common, bus and net. 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. 'event', # depends on common, bus, mempool and net. diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build index e3c8a6768c..bfec592aba 100644 --- a/drivers/net/ipn3ke/meson.build +++ b/drivers/net/ipn3ke/meson.build @@ -21,9 +21,11 @@ endif if build allow_experimental_apis = true + includes += include_directories('../../raw/ifpga') + sources += files('ipn3ke_ethdev.c', 'ipn3ke_representor.c', 'ipn3ke_tm.c', 'ipn3ke_flow.c') - deps += ['bus_ifpga', 'sched', 'pmd_i40e', 'rawdev', 'rawdev_ifpga'] + deps += ['bus_ifpga', 'ethdev', 'sched'] endif diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build index 206136ff48..d4027068d6 100644 --- a/drivers/raw/ifpga/meson.build +++ b/drivers/raw/ifpga/meson.build @@ -15,7 +15,7 @@ if build objs = [base_objs] deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs', - 'bus_vdev', 'bus_ifpga', 'net', 'i40e', 'ipn3ke'] + 'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke'] ext_deps += dep sources = files('ifpga_rawdev.c') -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:40.234853543 +0000 +++ 0031-net-ipn3ke-fix-meson-build.patch 2020-02-11 11:17:38.344000300 +0000 @@ -1,8 +1,10 @@ -From 7a3c4f4de26381f3f2b85297f603ad6a5f96a9f3 Mon Sep 17 00:00:00 2001 +From ea1e97addf528d6749741e8eaf60ee3fec9cbc74 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 12 Dec 2019 17:28:43 +0000 Subject: [PATCH] net/ipn3ke: fix meson build +[ upstream commit 7a3c4f4de26381f3f2b85297f603ad6a5f96a9f3 ] + The ipn3ke driver and the ifpga driver had circular dependencies on each other, meaning that neither could be built with meson. Fix this by: @@ -12,7 +14,6 @@ Fixes: 8418c92811b4 ("net/ipn3ke: remove configuration for i40e port bonding") Fixes: e1defba4cf66 ("raw/ifpga/base: support device tree") -Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Rosen Xu @@ -23,7 +24,7 @@ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build -index 3f8749d0b7..29708cc2bb 100644 +index 72eec46088..32d68aa1d0 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -9,8 +9,8 @@ endif @@ -36,7 +37,7 @@ + 'raw', # depends on common, bus and net. 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. - 'vdpa', # depends on common, bus and mempool. + 'event', # depends on common, bus, mempool and net. diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build index e3c8a6768c..bfec592aba 100644 --- a/drivers/net/ipn3ke/meson.build