[Buildroot] [PATCH] Makefile: ignore *.orig and *.rej in check-package target

[Buildroot] [PATCH] Makefile: ignore *.orig and *.rej in check-package target

[Thomas Petazzoni via buildroot]

When one is applying patches, it is pretty common to end up with .orig
and/or .rej files lying around. Unfortunately, our 'Config.*' match in
check-package ends up matching those files, causing false positives
when running "make check-package". To avoid this, this commit
excludes *.orig and *.rej files for the find logic used in the
check-package target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 5f266e36b2..14b7ecd475 100644
--- a/Makefile
+++ b/Makefile
@@ -1253,6 +1253,7 @@ check-flake8:
 
 check-package:
 	find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \
+		-a -not -name '*.orig' -a -not -name '*.rej' \
 		-exec ./utils/check-package --exclude=Sob {} +
 
 include docs/manual/manual.mk
-- 
2.37.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] Makefile: ignore *.orig and *.rej in check-package target

[Yann E. MORIN]

Thomas, All,

On 2022-08-03 21:23 +0200, Thomas Petazzoni via buildroot spake thusly:
> When one is applying patches, it is pretty common to end up with .orig
> and/or .rej files lying around. Unfortunately, our 'Config.*' match in
> check-package ends up matching those files, causing false positives
> when running "make check-package". To avoid this, this commit
> excludes *.orig and *.rej files for the find logic used in the
> check-package target.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  Makefile | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Makefile b/Makefile
> index 5f266e36b2..14b7ecd475 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1253,6 +1253,7 @@ check-flake8:
>  
>  check-package:
>  	find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \
> +		-a -not -name '*.orig' -a -not -name '*.rej' \

I was wondering if we could have easily used 'git ls-tree' like is done
in check-flake8, but that is not so trivial. Indeed, check-flake8
filters absed on the content of files, so it needs to find all of our
files, while check-package filters on filename, and so the filtering
would become a bit more convoluted with 'git ls-tree' than it is with
'find'.

Applied to master, thanks (and of course, I forgot to add the above to
the commit log before pushing).

Regards,
Yann E. MORIN.

>  		-exec ./utils/check-package --exclude=Sob {} +
>  
>  include docs/manual/manual.mk
> -- 
> 2.37.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] Makefile: ignore *.orig and *.rej in check-package target

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes:

 > When one is applying patches, it is pretty common to end up with .orig
 > and/or .rej files lying around. Unfortunately, our 'Config.*' match in
 > check-package ends up matching those files, causing false positives
 > when running "make check-package". To avoid this, this commit
 > excludes *.orig and *.rej files for the find logic used in the
 > check-package target.

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2022.05.x and 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot