* [PATCH] devtools: ignore .gitignore in SPDX check
@ 2025-02-07 18:26 Stephen Hemminger
2025-02-10 16:51 ` Thomas Monjalon
2025-02-10 17:20 ` [RFC] git: consolidate .gitignore files Stephen Hemminger
0 siblings, 2 replies; 8+ messages in thread
From: Stephen Hemminger @ 2025-02-07 18:26 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Thomas Monjalon
New .gitignore file in dts was getting marked as error.
Change to ignore all .gitignore files.
Remove no longer use Kbuild pattern.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
devtools/check-spdx-tag.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/devtools/check-spdx-tag.sh b/devtools/check-spdx-tag.sh
index b983268b1e..47bc9f7b60 100755
--- a/devtools/check-spdx-tag.sh
+++ b/devtools/check-spdx-tag.sh
@@ -22,9 +22,9 @@ check_spdx() {
git grep -L SPDX-License-Identifier -- \
':^.git*' ':^.mailmap' ':^.ci/*' \
':^README' ':^MAINTAINERS' ':^VERSION' ':^ABI_VERSION' \
- ':^*/Kbuild' ':^*/README*' \
+ ':^*/README*' ':^*/.gitignore' \
':^license/' ':^config/' ':^buildtools/' ':^*/poetry.lock' \
- ':^kernel/linux/uapi/.gitignore' ':^kernel/linux/uapi/version' \
+ ':^kernel/linux/uapi/version' \
':^*.cocci' ':^*.abignore' \
':^*.map' ':^*.ini' ':^*.data' ':^*.json' ':^*.cfg' ':^*.txt' \
':^*.svg' ':^*.png' \
--
2.47.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] devtools: ignore .gitignore in SPDX check
2025-02-07 18:26 [PATCH] devtools: ignore .gitignore in SPDX check Stephen Hemminger
@ 2025-02-10 16:51 ` Thomas Monjalon
2025-02-10 17:20 ` [RFC] git: consolidate .gitignore files Stephen Hemminger
1 sibling, 0 replies; 8+ messages in thread
From: Thomas Monjalon @ 2025-02-10 16:51 UTC (permalink / raw)
To: Stephen Hemminger
Cc: dev, Nicholas Pratte, Luca Vizzarro, Paul Szczepanek, Dean Marx
07/02/2025 19:26, Stephen Hemminger:
> New .gitignore file in dts was getting marked as error.
> Change to ignore all .gitignore files.
Actually I would prefer we don't create too much .gitignore files.
It is easier to manage if we have all in a single .gitignore.
We have already a line for DTS in the main .gitignore,
so it would be more consistent to move the recent additions
in dts/.gitignore to the root .gitignore.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [RFC] git: consolidate .gitignore files
2025-02-07 18:26 [PATCH] devtools: ignore .gitignore in SPDX check Stephen Hemminger
2025-02-10 16:51 ` Thomas Monjalon
@ 2025-02-10 17:20 ` Stephen Hemminger
2025-02-11 8:38 ` Thomas Monjalon
` (2 more replies)
1 sibling, 3 replies; 8+ messages in thread
From: Stephen Hemminger @ 2025-02-10 17:20 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Paul Szczepanek, Patrick Robb, Maxime Coquelin
Lets have only one .gitignore at top level.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
.gitignore | 6 ++++++
dts/.gitignore | 4 ----
kernel/linux/uapi/.gitignore | 4 ----
3 files changed, 6 insertions(+), 8 deletions(-)
delete mode 100644 dts/.gitignore
delete mode 100644 kernel/linux/uapi/.gitignore
diff --git a/.gitignore b/.gitignore
index 903fe9bc64..a1a6843494 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,8 @@ TAGS
# DTS results
dts/output
+dts/nodes.yaml
+dts/test_rund.yaml
# ignore default build directory, and directories from test-meson-builds.sh
build
@@ -50,3 +52,7 @@ build-*
# ignore other build directory patterns
*-gcc*
*-clang*
+
+# ignore Linux UAPI kernel headers
+kernel/linux/uapi/version
+kernel/linux/uapi/**/*.h
diff --git a/dts/.gitignore b/dts/.gitignore
deleted file mode 100644
index d53a2f3b7e..0000000000
--- a/dts/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# default configuration files for DTS
-nodes.yaml
-test_runs.yaml
-
diff --git a/kernel/linux/uapi/.gitignore b/kernel/linux/uapi/.gitignore
deleted file mode 100644
index 558ba597d6..0000000000
--- a/kernel/linux/uapi/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-**
-!**/
-!**/*.h
-!version
--
2.47.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC] git: consolidate .gitignore files
2025-02-10 17:20 ` [RFC] git: consolidate .gitignore files Stephen Hemminger
@ 2025-02-11 8:38 ` Thomas Monjalon
2025-02-11 15:43 ` Patrick Robb
2025-03-14 11:00 ` Thomas Monjalon
2 siblings, 0 replies; 8+ messages in thread
From: Thomas Monjalon @ 2025-02-11 8:38 UTC (permalink / raw)
To: Stephen Hemminger
Cc: dev, Paul Szczepanek, Patrick Robb, Maxime Coquelin, Stephen Hemminger
10/02/2025 18:20, Stephen Hemminger:
> +# ignore Linux UAPI kernel headers
> +kernel/linux/uapi/version
> +kernel/linux/uapi/**/*.h
The original .gitignore had some "!" for an opposite logic.
I think we can just completely drop this one, it looks unneeded.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC] git: consolidate .gitignore files
2025-02-10 17:20 ` [RFC] git: consolidate .gitignore files Stephen Hemminger
2025-02-11 8:38 ` Thomas Monjalon
@ 2025-02-11 15:43 ` Patrick Robb
2025-03-14 11:00 ` Thomas Monjalon
2 siblings, 0 replies; 8+ messages in thread
From: Patrick Robb @ 2025-02-11 15:43 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, Paul Szczepanek, Maxime Coquelin
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
On Mon, Feb 10, 2025 at 12:21 PM Stephen Hemminger <
stephen@networkplumber.org> wrote:
>
> diff --git a/.gitignore b/.gitignore
> index 903fe9bc64..a1a6843494 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -43,6 +43,8 @@ TAGS
>
> # DTS results
> dts/output
> +dts/nodes.yaml
> +dts/test_rund.yaml
>
test_rund -> test_runs
--
> 2.47.2
>
>
Thanks, I see no issue with consolidating.
Reviewed-by: Patrick Robb <probb@iol.unh.edu>
[-- Attachment #2: Type: text/html, Size: 1076 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC] git: consolidate .gitignore files
2025-02-10 17:20 ` [RFC] git: consolidate .gitignore files Stephen Hemminger
2025-02-11 8:38 ` Thomas Monjalon
2025-02-11 15:43 ` Patrick Robb
@ 2025-03-14 11:00 ` Thomas Monjalon
2025-03-14 15:18 ` Patrick Robb
2 siblings, 1 reply; 8+ messages in thread
From: Thomas Monjalon @ 2025-03-14 11:00 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, Paul Szczepanek, Patrick Robb, Maxime Coquelin
10/02/2025 18:20, Stephen Hemminger:
> Lets have only one .gitignore at top level.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Applied with uAPI rules dropped and these explanations added:
"
Some generated DTS files must be ignored.
The Linux uAPI files should not be ignored.
"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC] git: consolidate .gitignore files
2025-03-14 11:00 ` Thomas Monjalon
@ 2025-03-14 15:18 ` Patrick Robb
2025-03-14 15:28 ` Thomas Monjalon
0 siblings, 1 reply; 8+ messages in thread
From: Patrick Robb @ 2025-03-14 15:18 UTC (permalink / raw)
To: Thomas Monjalon; +Cc: Stephen Hemminger, dev, Paul Szczepanek, Maxime Coquelin
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
https://git.dpdk.org/next/dpdk-next-dts/commit/?id=564f4abb42df0cdf7da8c53933705bc205642005
This commit on next-dts changes the name of this default config file from
test_runs.yaml to test_run.yaml. However, it is not pulled to main yet.
I can send a patch equivalent to Stephen's which changes test_rund.yml to
test_run.yaml. But, should it be applied to next-dts instead of main, so
that it is "on top of" commit 564f4abb42df0cdf7da8c53933705bc205642005
which necessitates it?
[-- Attachment #2: Type: text/html, Size: 696 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC] git: consolidate .gitignore files
2025-03-14 15:18 ` Patrick Robb
@ 2025-03-14 15:28 ` Thomas Monjalon
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Monjalon @ 2025-03-14 15:28 UTC (permalink / raw)
To: Patrick Robb; +Cc: Stephen Hemminger, dev, Paul Szczepanek, Maxime Coquelin
14/03/2025 16:18, Patrick Robb:
> https://git.dpdk.org/next/dpdk-next-dts/commit/?id=564f4abb42df0cdf7da8c53933705bc205642005
>
> This commit on next-dts changes the name of this default config file from
> test_runs.yaml to test_run.yaml. However, it is not pulled to main yet.
>
> I can send a patch equivalent to Stephen's which changes test_rund.yml to
> test_run.yaml. But, should it be applied to next-dts instead of main, so
> that it is "on top of" commit 564f4abb42df0cdf7da8c53933705bc205642005
> which necessitates it?
Please can you rebase next-dts on top of main?
It will force you to make the change in the root .gitconfig
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-03-14 15:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-07 18:26 [PATCH] devtools: ignore .gitignore in SPDX check Stephen Hemminger
2025-02-10 16:51 ` Thomas Monjalon
2025-02-10 17:20 ` [RFC] git: consolidate .gitignore files Stephen Hemminger
2025-02-11 8:38 ` Thomas Monjalon
2025-02-11 15:43 ` Patrick Robb
2025-03-14 11:00 ` Thomas Monjalon
2025-03-14 15:18 ` Patrick Robb
2025-03-14 15:28 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).