[PATCH 1/2] Revert "patman: invoke the checkpatch.pl script with '--u-boot' and '--strict'"
This reverts commit 648d8186dd7f9c444fb07f355090d275dcdd4de4, because it broke usage of patman on Linux, whose check script doesn't know about '--strict' or '--u-boot'.
Reported-by: Sjoerd Simons sjoerd@collabora.com Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com ---
tools/patman/checkpatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py index 012c0d895c..d1b902dd96 100644 --- a/tools/patman/checkpatch.py +++ b/tools/patman/checkpatch.py @@ -211,7 +211,7 @@ def check_patch(fname, verbose=False, show_types=False, use_tree=False): stdout: Full output of checkpatch """ chk = find_check_patch() - args = [chk, '--u-boot', '--strict'] + args = [chk] if not use_tree: args.append('--no-tree') if show_types:
base-commit: 87c9e117bf57d6bb42c5521a3f6ec9ca7d97e5fa
This makes it possible to run the patman test suite simply by invoking 'pytest' from the patman sub-directory:
$ cd tools/patman $ pytest
Otherwise, the top level .checkpatch.conf would be ignored and multiple test_checkpatch.py tests would fail.
Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com ---
.gitignore | 1 + tools/patman/.checkpatch.conf | 1 + 2 files changed, 2 insertions(+) create mode 120000 tools/patman/.checkpatch.conf
diff --git a/.gitignore b/.gitignore index eb769f144c..3adf1faf4e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ # Normal rules (sorted alphabetically) # .* +!.checkpatch.conf *.a *.asn1.[ch] *.bin diff --git a/tools/patman/.checkpatch.conf b/tools/patman/.checkpatch.conf new file mode 120000 index 0000000000..c0e2020afe --- /dev/null +++ b/tools/patman/.checkpatch.conf @@ -0,0 +1 @@ +../../.checkpatch.conf \ No newline at end of file
On Fri, 13 Jan 2023 at 06:51, Maxim Cournoyer maxim.cournoyer@gmail.com wrote:
This makes it possible to run the patman test suite simply by invoking 'pytest' from the patman sub-directory:
$ cd tools/patman $ pytest
Otherwise, the top level .checkpatch.conf would be ignored and multiple test_checkpatch.py tests would fail.
Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com
.gitignore | 1 + tools/patman/.checkpatch.conf | 1 + 2 files changed, 2 insertions(+) create mode 120000 tools/patman/.checkpatch.conf
Reviewed-by: Simon Glass sjg@chromium.org
On Fri, 13 Jan 2023 at 06:51, Maxim Cournoyer maxim.cournoyer@gmail.com wrote:
This makes it possible to run the patman test suite simply by invoking 'pytest' from the patman sub-directory:
$ cd tools/patman $ pytest
Otherwise, the top level .checkpatch.conf would be ignored and multiple test_checkpatch.py tests would fail.
Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com
.gitignore | 1 + tools/patman/.checkpatch.conf | 1 + 2 files changed, 2 insertions(+) create mode 120000 tools/patman/.checkpatch.conf
Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm, thanks!
On Fri, 13 Jan 2023 at 06:50, Maxim Cournoyer maxim.cournoyer@gmail.com wrote:
This reverts commit 648d8186dd7f9c444fb07f355090d275dcdd4de4, because it broke usage of patman on Linux, whose check script doesn't know about '--strict' or '--u-boot'.
Reported-by: Sjoerd Simons sjoerd@collabora.com Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com
tools/patman/checkpatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Fri, 2023-01-13 at 08:50 -0500, Maxim Cournoyer wrote:
This reverts commit 648d8186dd7f9c444fb07f355090d275dcdd4de4, because it broke usage of patman on Linux, whose check script doesn't know about '--strict' or '--u-boot'.
I can confirm that this reverts fixes the reported issue:
Tested-by: Sjoerd Simons sjoerd@collabora.com
Reported-by: Sjoerd Simons sjoerd@collabora.com Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com
tools/patman/checkpatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py index 012c0d895c..d1b902dd96 100644 --- a/tools/patman/checkpatch.py +++ b/tools/patman/checkpatch.py @@ -211,7 +211,7 @@ def check_patch(fname, verbose=False, show_types=False, use_tree=False): stdout: Full output of checkpatch """ chk = find_check_patch() - args = [chk, '--u-boot', '--strict'] + args = [chk] if not use_tree: args.append('--no-tree') if show_types:
base-commit: 87c9e117bf57d6bb42c5521a3f6ec9ca7d97e5fa
On Fri, 2023-01-13 at 08:50 -0500, Maxim Cournoyer wrote:
This reverts commit 648d8186dd7f9c444fb07f355090d275dcdd4de4, because it broke usage of patman on Linux, whose check script doesn't know about '--strict' or '--u-boot'.
I can confirm that this reverts fixes the reported issue:
Tested-by: Sjoerd Simons sjoerd@collabora.com
Reported-by: Sjoerd Simons sjoerd@collabora.com Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com
tools/patman/checkpatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-dm, thanks!
Hi Simon
On Wed, 2023-01-18 at 21:11 -0500, Simon Glass wrote:
On Fri, 2023-01-13 at 08:50 -0500, Maxim Cournoyer wrote:
This reverts commit 648d8186dd7f9c444fb07f355090d275dcdd4de4, because it broke usage of patman on Linux, whose check script doesn't know about '--strict' or '--u-boot'.
I can confirm that this reverts fixes the reported issue:
Tested-by: Sjoerd Simons sjoerd@collabora.com
Reported-by: Sjoerd Simons sjoerd@collabora.com Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com
tools/patman/checkpatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-dm, thanks!
I also just stumbled over this and learned now that it already got fixed. Thanks!
Cheers
Marcel
On Thu, 19 Jan 2023 at 03:24, Marcel Ziswiler marcel.ziswiler@toradex.com wrote:
Hi Simon
On Wed, 2023-01-18 at 21:11 -0500, Simon Glass wrote:
On Fri, 2023-01-13 at 08:50 -0500, Maxim Cournoyer wrote:
This reverts commit 648d8186dd7f9c444fb07f355090d275dcdd4de4, because it broke usage of patman on Linux, whose check script doesn't know about '--strict' or '--u-boot'.
I can confirm that this reverts fixes the reported issue:
Tested-by: Sjoerd Simons sjoerd@collabora.com
Reported-by: Sjoerd Simons sjoerd@collabora.com Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com
tools/patman/checkpatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-dm, thanks!
I also just stumbled over this and learned now that it already got fixed. Thanks!
OK good!
- Simon
Cheers
Marcel
participants (4)
-
Marcel Ziswiler -
Maxim Cournoyer -
Simon Glass -
Sjoerd Simons