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 BC036A04DB for ; Tue, 17 Nov 2020 12:14:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AAE5A5916; Tue, 17 Nov 2020 12:14:30 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by dpdk.org (Postfix) with ESMTP id 34E75F3E for ; Tue, 17 Nov 2020 12:14:27 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 10so2864823wml.2 for ; Tue, 17 Nov 2020 03:14:27 -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=JXR5qeKQSJzwuS1w2ijhmHXZocCqRrtp7Vh5r/GCqT0=; b=pEH1Y4MruTuJFArUFDEdQT/hdbueHevS5G+YtnqOhaKPihbcjX9PTO5F8wztLm33sL NFGZb0+UakSdD0IpvV3kzID5zpB3HHVFtsl6JSvNQOZifcPzc1TlHG7nVu+rnkr2u/gh DMWXgVQuyt/Z8kJ574exxFe06o0elP9zvk02qKwmNLhwVcHzzZoG4Pz+UEJ6tW1kNJ4K zF1Rk6R0rcBtMpUldEIcKGIS4ItmOKeSKS/P6cVeQ9Ctu7r0q47AsTemZVu1q76J7K6q ku1El19AdY+6vUcfq4CHxKVUy+tLSudU0UEe0DrRZzCdlNmiqgipLm/x80PA0R65WRXC n4hA== 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=JXR5qeKQSJzwuS1w2ijhmHXZocCqRrtp7Vh5r/GCqT0=; b=sKuBZC8Pn+62UgwtjXIAgfWXqA2SEGbch2QvzHafcK9HK7kGqxig/vb9ZOKZwPf4X3 HFl7LVULOTnYQh5Wsq7PIgRMW0Qa+SnNIUgRxIUQmPnuLoArvNC1oFfu6Nka3pkNzGRj 7cUqbUi5FmxFbDCQ9GccCLk2c3kzVDZ1kRT/MqlUs6CHPczcjWXTfXB834n/QNnROXqy Qe8VLo1evH2X7BOtYRUngpbJO4CVKCcjNYf7qR/Ju0SPT7x2iTQfiZ8O+89tkLY3GHLx cSReNT/sRZLl1dz6bMB08Dubv60ncDteybqhhX+w+BBKYbmKCg/GmT+avTwLxDpwPJp8 uypA== X-Gm-Message-State: AOAM530IorBG2RYC4NCmu9s7ULU7hCziNDJLE034Of5YVMwH3kUTIz2+ 5cdmiugzxK4+MS7Zv2Ts4sU= X-Google-Smtp-Source: ABdhPJydESCDOxsm62NBrjIyv66mNJk1hhW/XYZtTtQp/QAoJa14vpUXQ6G7Z+r0Bm8ytZdJVfA51Q== X-Received: by 2002:a7b:c242:: with SMTP id b2mr3801464wmj.162.1605611666924; Tue, 17 Nov 2020 03:14:26 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i11sm27965786wro.85.2020.11.17.03.14.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:14:26 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: dpdk stable Date: Tue, 17 Nov 2020 11:13:37 +0000 Message-Id: <20201117111416.1961049-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples: fix flattening directory layout on install' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/44b8800491dd3b28d752995188f158e95e7d24fb Thanks. Luca Boccassi --- >From 44b8800491dd3b28d752995188f158e95e7d24fb Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 12 Nov 2020 09:41:39 +0000 Subject: [PATCH] examples: fix flattening directory layout on install [ upstream commit e5b95003f1df2ac65cbd11e642b1d6a91bd1058a ] By installing the examples one-by-one in a loop in the examples meson.build file we effectively flattened out the structure of the examples folder and omitted some common and shared subfolders that were never directly built. Instead, we can remove the loop and just have the whole "examples" folder installed as-is in a single statement, preserving its directory structure, and thereby fixing the build of a number of the examples. Fixes: 2daf565f91b5 ("examples: install as part of ninja install") Signed-off-by: Bruce Richardson --- examples/meson.build | 7 ------- meson.build | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/examples/meson.build b/examples/meson.build index ec6bd5a080..eeeb217ada 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -46,13 +46,6 @@ all_examples = [ 'vm_power_manager/guest_cli', 'vmdq', 'vmdq_dcb', ] -# install all example code on install - irrespective of whether the example in -# question is to be built as part of this build or not. -foreach ex:all_examples - install_subdir(ex, - install_dir: get_option('datadir') + '/dpdk/examples', - exclude_files: 'meson.build') -endforeach if get_option('examples') == '' subdir_done() diff --git a/meson.build b/meson.build index 41b1beb980..00949de995 100644 --- a/meson.build +++ b/meson.build @@ -48,6 +48,9 @@ subdir('doc') # build any examples explicitly requested - useful for developers - and # install any example code into the appropriate install path subdir('examples') +install_subdir('examples', + install_dir: get_option('datadir') + '/dpdk', + exclude_files: 'meson.build') # build kernel modules if enabled if get_option('enable_kmods') -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.129238801 +0000 +++ 0003-examples-fix-flattening-directory-layout-on-install.patch 2020-11-17 11:13:12.861115401 +0000 @@ -1 +1 @@ -From e5b95003f1df2ac65cbd11e642b1d6a91bd1058a Mon Sep 17 00:00:00 2001 +From 44b8800491dd3b28d752995188f158e95e7d24fb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e5b95003f1df2ac65cbd11e642b1d6a91bd1058a ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index f179955325..46ec80919e 100644 +index ec6bd5a080..eeeb217ada 100644 @@ -27 +28 @@ -@@ -47,13 +47,6 @@ all_examples = [ +@@ -46,13 +46,6 @@ all_examples = [ @@ -42 +43 @@ -index 61d9a4f5fa..45d974cd2c 100644 +index 41b1beb980..00949de995 100644 @@ -45 +46 @@ -@@ -59,6 +59,9 @@ subdir('doc') +@@ -48,6 +48,9 @@ subdir('doc')