On Fri, Jan 14, 2022 at 12:31:25PM +0100, Christian Melki wrote:
> This option sometimes breaks builds with various external dependencies.
> Especially vendor trees that have sourcedir path references.
>
> Signed-off-by: Christian Melki <[email protected]>
> ---
> platforms/u-boot.in | 10 ++++++++++
> rules/u-boot.make | 6 ++++--
> 2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
> index d5410e4a1..6589a1940 100644
> --- a/platforms/u-boot.in
> +++ b/platforms/u-boot.in
> @@ -20,6 +20,16 @@ config U_BOOT_MD5
> string
> prompt "U-Boot source md5"
>
> +config U_BOOT_BUILD_OOT
> + prompt "Out of tree build"
> + default y
> + bool
> + help
> + U-Boot is usually built out of tree.
> + But for some builds, f.ex. with firmware blobs, out of tree builds
> + can break because of vendors using source paths to files.
> + Disable OOT build if you need a workaround for those type of builds.
> +
> choice
> prompt "config system"
> default U_BOOT_CONFIGSYSTEM_LEGACY
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index 38c32bf27..71e85a84f 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -23,9 +23,9 @@ U_BOOT_SUFFIX := tar.bz2
> U_BOOT_URL :=
> https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX)
> U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX)
> U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT)
> -U_BOOT_BUILD_DIR := $(U_BOOT_DIR)-build
> +U_BOOT_BUILD_DIR := $(U_BOOT_DIR)$(call ptx/ifdef,
> PTXCONF_U_BOOT_BUILD_OOT,-build)
> U_BOOT_DEVPKG := NO
> -U_BOOT_BUILD_OOT := KEEP
> +U_BOOT_BUILD_OOT := $(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,KEEP,NO)
>
> ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_KCONFIG
> U_BOOT_CONFIG := $(call ptx/in-platformconfigdir, \
> @@ -54,7 +54,9 @@ U_BOOT_WRAPPER_BLACKLIST := \
>
> U_BOOT_CONF_OPT := \
> -C $(U_BOOT_DIR) \
> +ifdef PTXCONF_U_BOOT_BUILD_OOT
> O=$(U_BOOT_BUILD_DIR) \
> +endif
This does not work. As I said, use ptx/ifdef:
$(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,O=$(U_BOOT_BUILD_DIR)) \
Michael
> V=$(PTXDIST_VERBOSE) \
> $(call remove_quotes,$(PTXCONF_U_BOOT_CUSTOM_MAKE_OPTS))
>
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
> To unsubscribe, send a mail with subject "unsubscribe" to
> [email protected]
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
