Re: [Minios-devel] [UNIKRAFT PATCH 2/2] build: set max depth for lib and plat search

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Reviewed-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>

On 07.10.19 17:00, Sharan Santhanam wrote:
> Configure script make a recursive search of the directory. We restrict
> the depth of the search on the current directory alone.
>
> Signed-off-by: Sharan Santhanam <sharan.santhanam@xxxxxxxxx>
> ---
>   Makefile                              | 4 +++-
>   support/scripts/uk_build_configure.sh | 4 ++--
>   2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index c022561..99369cd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -137,6 +137,7 @@ ELIB_DIR := $(realpath $(patsubst %/,%,$(patsubst 
> %.,%,$(ELIB_DIR))))
>   # KConfig settings
>   
>   CONFIG_UK_PLAT        := $(CONFIG_UK_BASE)/plat/
> +CONFIG_UK_LIB         := $(CONFIG_UK_BASE)/lib/
>   CONFIG_DIR            := $(CONFIG_UK_APP)
>   CONFIG_CONFIG_IN      := $(CONFIG_UK_BASE)/Config.uk
>   CONFIG                := $(CONFIG_UK_BASE)/support/kconfig
> @@ -155,7 +156,8 @@ KCONFIG_DEF_PLATS     := $(shell find $(CONFIG_UK_PLAT)/* 
> -maxdepth 0 \
>                            -type d \( -path $(CONFIG_UK_PLAT)/common -o \
>                            -path $(CONFIG_UK_PLAT)/drivers \
>                            \) -prune -o  -type d -print)
> -KCONFIG_LIB_DIR       := $(CONFIG_UK_BASE)/lib $(ELIB_DIR)
> +KCONFIG_LIB_DIR       := $(shell find $(CONFIG_UK_LIB)/* -maxdepth 0 -type d) \
> +                        $(CONFIG_UK_BASE)/lib $(ELIB_DIR)
>   KCONFIG_PLAT_DIR      := $(KCONFIG_DEF_PLATS) $(EPLAT_DIR) $(CONFIG_UK_PLAT)
>   KCONFIG_PLAT_IN       := $(KCONFIG_DIR)/plat.uk
>   
> diff --git a/support/scripts/uk_build_configure.sh b/support/scripts/uk_build_configure.sh
> index 1df8c5d..4082910 100755
> --- a/support/scripts/uk_build_configure.sh
> +++ b/support/scripts/uk_build_configure.sh
> @@ -24,13 +24,13 @@ fetch_plats() {
>   
>   fetch_libs() {
>         local files=;
> -       files=`find ${@} -name "Config.uk"`
> +       files=`find ${@} -maxdepth 1 -name "Config.uk"`
>         echo ${files}
>   }
>   
>   fetch_app() {
>         local files=;
> -       files=`find ${1} -name "Config.uk"`
> +       files=`find ${1} -maxdepth 1 -name "Config.uk"`
>         echo ${files}
>   }
>   
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel