patch 'build: enable developer mode for all working trees' has been queued to stable release 21.11.3
Kevin Traynor
ktraynor at redhat.com
Tue Oct 25 17:05:56 CEST 2022
Hi,
FYI, your patch has been queued to stable release 21.11.3
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/01/22. 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/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/155a98e8645ecc0c01a9f29ea92c204d583e747e
Thanks.
Kevin
---
>From 155a98e8645ecc0c01a9f29ea92c204d583e747e Mon Sep 17 00:00:00 2001
From: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Date: Wed, 10 Aug 2022 20:40:58 +0300
Subject: [PATCH] build: enable developer mode for all working trees
[ upstream commit 7ccd05e7b7fa1444c5abfd72f4b5cde627721e7d ]
Developer mode was detected if `.git` was a directory.
Linked git working trees created by `git worktree add`
contain `.git` file instead of `.git` directory.
Developer mode was not detected for such directories.
Detect developer mode by the presence of `.git` path.
Fixes: bc4617433845 ("build: enable a developer mode setting")
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit at xilinx.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 21dc51f00d..dff7cff4aa 100644
--- a/meson.build
+++ b/meson.build
@@ -17,5 +17,5 @@ if get_option('developer_mode').auto()
if meson.version().version_compare('>=0.53') # fs module available
fs = import('fs')
- developer_mode = fs.is_dir('.git')
+ developer_mode = fs.exists('.git')
endif
else
--
2.37.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-10-25 14:18:58.621106988 +0100
+++ 0001-build-enable-developer-mode-for-all-working-trees.patch 2022-10-25 14:18:58.346797858 +0100
@@ -1 +1 @@
-From 7ccd05e7b7fa1444c5abfd72f4b5cde627721e7d Mon Sep 17 00:00:00 2001
+From 155a98e8645ecc0c01a9f29ea92c204d583e747e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7ccd05e7b7fa1444c5abfd72f4b5cde627721e7d ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index a32f14024b..7d6643da3a 100644
+index 21dc51f00d..dff7cff4aa 100644
@@ -26 +27 @@
-@@ -21,5 +21,5 @@ if get_option('developer_mode').auto()
+@@ -17,5 +17,5 @@ if get_option('developer_mode').auto()
More information about the stable
mailing list