From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 08 Dec 2021 08:24:20 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1murJM-0002NI-0n for lore@lore.pengutronix.de; Wed, 08 Dec 2021 08:24:20 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1murJL-0006zN-Od; Wed, 08 Dec 2021 08:24:19 +0100 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1murJ9-0006zD-8U; Wed, 08 Dec 2021 08:24:07 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1murJ8-0001PU-Sq; Wed, 08 Dec 2021 08:24:06 +0100 Date: Wed, 8 Dec 2021 08:24:06 +0100 From: Michael Olbrich To: Christian Melki Message-ID: <20211208072406.GC15196@pengutronix.de> Mail-Followup-To: Christian Melki , ptxdist@pengutronix.de References: <20211130103926.618168-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211130103926.618168-1-christian.melki@t2data.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 08:18:19 up 293 days, 10:42, 132 users, load average: 0.02, 0.10, 0.14 User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [ptxdist] [PATCH v3] U-Boot: Add option to disable OOT builds X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Tue, Nov 30, 2021 at 11:39:26AM +0100, Christian Melki wrote: > This option sometimes breaks builds with various external dependencies. > Especially vendor trees that have sourcedir path references. Hmmm, I don't really like this, but I do understand why it can be necessary :-/. > Signed-off-by: Christian Melki > --- > platforms/u-boot.in | 10 ++++++++++ > rules/u-boot.make | 12 ++++++++++-- > 2 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 410391fe8..0d8213f45 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. > + This is mostly 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..2c6a1ada4 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -23,9 +23,14 @@ 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_DEVPKG := NO > +ifdef PTXCONF_U_BOOT_BUILD_OOT > +U_BOOT_BUILD_DIR := $(U_BOOT_DIR)-build > U_BOOT_BUILD_OOT := KEEP > +else > +U_BOOT_BUILD_DIR := $(U_BOOT_DIR) > +U_BOOT_BUILD_OOT := NO I prefere: U_BOOT_BUILD_DIR := $(U_BOOT_DIR)$(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,-build) U_BOOT_BUILD_OOT := $(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,KEEP,NO) to keep it more compact. > +endif > > ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_KCONFIG > U_BOOT_CONFIG := $(call ptx/in-platformconfigdir, \ > @@ -54,10 +59,13 @@ U_BOOT_WRAPPER_BLACKLIST := \ > > U_BOOT_CONF_OPT := \ > -C $(U_BOOT_DIR) \ > - O=$(U_BOOT_BUILD_DIR) \ Right. In theory it should still work if O= is used unconditionally. Because U_BOOT_BUILD_DIR points to the source tree in the non-OOT case. But who knowns what happens in broken vendor trees. But wrap it with ptx/ifdef instead to keep it here. Michael > V=$(PTXDIST_VERBOSE) \ > $(call remove_quotes,$(PTXCONF_U_BOOT_CUSTOM_MAKE_OPTS)) > > +ifdef PTXCONF_U_BOOT_BUILD_OOT > +U_BOOT_CONF_OPT += O=$(U_BOOT_BUILD_DIR) > +endif > + > U_BOOT_MAKE_ENV := \ > CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ > HOSTCC=$(HOSTCC) > -- > 2.30.2 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > -- 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 ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de