From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Sun, 12 Aug 2018 10:46:09 +0200
Subject: [Buildroot] [PATCH v2] Makefile: introduce check-package target
In-Reply-To: <20180811104423.31391-1-thomas.petazzoni@bootlin.com>
References: <20180811104423.31391-1-thomas.petazzoni@bootlin.com>
Message-ID: <20180812084609.GD2402@scaer>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Thomas, All,

On 2018-08-11 12:44 +0200, Thomas Petazzoni spake thusly:
> The snippet of code that runs a check-package on all
> .mk/.hash/Config.in files is currently only available within
> .gitlab-ci.yml, and isn't immediately and easily usable by Buildroot
> users. In order to simplify this, this commit introduces a top-level
> "check-package" make target that implements the same logic. The
> .gitlab-ci.yml file is changed to use "make check-package".
> 
> Since this target is oriented towards Buildroot developers, we
> intentionally do not clutter the already noisy "make help" text with
> this additional make target.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

[tested from in-tree and out-of-tree]
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

I was thinking that, maybe, we would also like to later extend this to
also scan the br2-external trees.

Unfortunately, the layout of a br2-external tree is totally free, i.e.
we do not enforce the package/ boot/ and so on segregation. And since a
br2-external may also contain arbitrary files, we can't just blindly
scan it entirely either.

So, people who want to check their packages in a br2-external tree will
have to do it on their own...

Regards,
Yann E. MORIN.

> ---
> I often found myself copy/pasting this find command line from
> .gitlab-ci.yml to my shell, and got tired of doing this, hence this
> patch.
> 
> Changes since v1:
>  - Adjust .gitlab-ci.yml.in as well (Ricardo)
>  - Add check-package to noconfig_targets (Ricardo)
> ---
>  .gitlab-ci.yml    | 3 +--
>  .gitlab-ci.yml.in | 3 +--
>  Makefile          | 6 +++++-
>  3 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 9d4301076f..d4807c5c85 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -43,8 +43,7 @@ check-flake8:
>  
>  check-package:
>      script:
> -        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
> -            -exec ./utils/check-package {} +
> +        - make check-package
>  
>  .defconfig: &defconfig
>      # Running the defconfigs for every push is too much, so limit to
> diff --git a/.gitlab-ci.yml.in b/.gitlab-ci.yml.in
> index fb2650c5ce..38e24c8d01 100644
> --- a/.gitlab-ci.yml.in
> +++ b/.gitlab-ci.yml.in
> @@ -43,8 +43,7 @@ check-flake8:
>  
>  check-package:
>      script:
> -        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
> -            -exec ./utils/check-package {} +
> +        - make check-package
>  
>  .defconfig: &defconfig
>      # Running the defconfigs for every push is too much, so limit to
> diff --git a/Makefile b/Makefile
> index f79d39fd26..c4ed45837d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -130,7 +130,7 @@ export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlo
>  noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
>  	defconfig %_defconfig allyesconfig allnoconfig alldefconfig silentoldconfig release \
>  	randpackageconfig allyespackageconfig allnopackageconfig \
> -	print-version olddefconfig distclean manual manual-%
> +	print-version olddefconfig distclean manual manual-% check-package
>  
>  # Some global targets do not trigger a build, but are used to collect
>  # metadata, or do various checks. When such targets are triggered,
> @@ -1125,6 +1125,10 @@ release:
>  print-version:
>  	@echo $(BR2_VERSION_FULL)
>  
> +check-package:
> +	find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) \
> +		-exec ./utils/check-package {} +
> +
>  .PHONY: .gitlab-ci.yml
>  .gitlab-ci.yml: .gitlab-ci.yml.in
>  	cp $< $@
> -- 
> 2.14.4
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'