summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Freihofer <adrian.freihofer@gmail.com>2024-02-15 23:53:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-19 11:34:33 +0000
commita510d455d3b93e2d7c5e1aef7b2dbe7d77d6a03d (patch)
tree42b04aadbfd407dbe4890377f199ae405f18a357
parent09839f6a8a7be68d133170ce9b2decf2fa99144b (diff)
downloadpoky-a510d455d3b93e2d7c5e1aef7b2dbe7d77d6a03d.tar.gz
vscode: drop .vscode folder
There is a new official bitbake plugin: https://marketplace.visualstudio.com/items?itemName=yocto-project.yocto-bitbake This plugin automatically updates the .vscode/settings.json file. Having the settings.json file in git and a plugin which modifies this file is not ideal. It can lead to anoying situations especially when working with git. For example a git stash reverts the settings which are automatically applied by the plugin. While git stashed the settings.json file the plugin immediately changes the file again and tries to run bitbake based on the newly generated settings. When git does a stash pop the restored settings.json file conflicts with the new settigns.json file which has been generated while the git stash took place. Therefore this patch removes the .vscode folder from git. Removing the settings.json leads to other issues as already described in the commit message of 5ff688fe29. But we still need another solution where the settings.json file is not in Git. Discussion is here: https://github.com/yoctoproject/vscode-bitbake/issues/95 (From OE-Core rev: f36771e155b9e0cf24a885bf3340d59036aa42c5) Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--.gitignore1
-rw-r--r--.vscode/settings.json32
2 files changed, 0 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore
index f6ce090b5f..ec0447356e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,3 @@ downloads/
37sstate-cache/ 37sstate-cache/
38toaster.sqlite 38toaster.sqlite
39.vscode/ 39.vscode/
40vscode-bitbake-build/
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 517a86d1bf..0000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,32 +0,0 @@
1{
2 "files.watcherExclude": {
3 "**/.git/**": true,
4 "**/cache/**": true,
5 "**/tmp*/**": true,
6 "**/downloads/**": true,
7 "**/sstate-cache/**": true,
8 "**/vscode-bitbake-build/**": true,
9 "**/workspace/sources/**": true,
10 "**/workspace/attic/**": true
11 },
12 "files.exclude": {
13 "**/.git/**": true,
14 "**/cache/**": true,
15 "**/tmp*/**": true,
16 "**/downloads/**": true,
17 "**/sstate-cache/**": true,
18 "**/vscode-bitbake-build/**": true,
19 "**/workspace/sources/**": true,
20 "**/workspace/attic/**": true
21 },
22 "python.analysis.exclude": [
23 "**/.git/**",
24 "**/cache/**",
25 "**/tmp*/**",
26 "**/downloads/**",
27 "**/sstate-cache/**",
28 "**/vscode-bitbake-build/**",
29 "**/workspace/sources/**",
30 "**/workspace/attic/**"
31 ]
32}