[Buildroot] [PATCH 3/6] system: provide no default for custom skeleton path

Romain Naour romain.naour at gmail.com
Sun Jul 17 11:59:08 UTC 2016


Hi Yann, All,

Le 17/07/2016 à 10:44, Yann E. MORIN a écrit :
> Being custom means that our default one is not suitable to start with.
> So there is no reson to offer it as the default path.
                 ^
reason

> 
> Add a check that it is not empty.
> 
> Add a separating empty line, for good measure, too.

Reviewed-by: Romain Naour <romain.naour at gmail.com>

Best regards,
Romain

> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> Cc: Romain Naour <romain.naour at openwide.fr>
> Cc: Arnout Vandecappelle <arnout at mind.be>
> 
> ---
> Changes v2 -> v3:
>   - add a check that it is not empty (Romain, Arnout)
> ---
>  package/skeleton/skeleton.mk | 6 ++++++
>  system/Config.in             | 2 +-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk
> index 7a7c200..d580fcb 100644
> --- a/package/skeleton/skeleton.mk
> +++ b/package/skeleton/skeleton.mk
> @@ -17,6 +17,12 @@ ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
>  
>  SKELETON_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH))
>  
> +ifeq ($(BR_BUILDING),y)
> +ifeq ($(SKELETON_PATH),)
> +$(error No path specified for the custom skeleton)
> +endif
> +endif
> +
>  ifeq ($(BR2_ROOTFS_MERGED_USR),y)
>  
>  # Ensure the user has prepared a merged /usr.
> diff --git a/system/Config.in b/system/Config.in
> index b895db9..6fce8e1 100644
> --- a/system/Config.in
> +++ b/system/Config.in
> @@ -184,9 +184,9 @@ config BR2_ROOTFS_SKELETON_CUSTOM
>  endchoice
>  
>  if BR2_ROOTFS_SKELETON_CUSTOM
> +
>  config BR2_ROOTFS_SKELETON_CUSTOM_PATH
>  	string "custom target skeleton path"
> -	default "system/skeleton"
>  	help
>  	  Path to custom target skeleton.
>  
> 




More information about the buildroot mailing list