Thanks, applied as fc696d8342ba8ac7b49428df87ede30e4ad64c7d. Michael
[sent from post-receive hook] On Sun, 30 Jan 2022 16:49:28 +0100, Christian Melki <[email protected]> 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]> > Message-Id: <[email protected]> > Acked-by: Alexander Dahl <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index d5410e4a16df..6589a1940659 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 38c32bf2701f..38faf190ce57 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,7 @@ U_BOOT_WRAPPER_BLACKLIST := \ > > U_BOOT_CONF_OPT := \ > -C $(U_BOOT_DIR) \ > - O=$(U_BOOT_BUILD_DIR) \ > + $(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,O=$(U_BOOT_BUILD_DIR)) \ > V=$(PTXDIST_VERBOSE) \ > $(call remove_quotes,$(PTXCONF_U_BOOT_CUSTOM_MAKE_OPTS)) > _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
