* [ptxdist] [PATCH v5] U-Boot: Add option to disable OOT builds
@ 2022-01-25 14:57 Christian Melki
2022-01-26 8:18 ` Alexander Dahl
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 2 replies; 3+ messages in thread
From: Christian Melki @ 2022-01-25 14:57 UTC (permalink / raw)
To: ptxdist
This option sometimes breaks builds with various external dependencies.
Especially vendor trees that have sourcedir path references.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
platforms/u-boot.in | 10 ++++++++++
rules/u-boot.make | 6 +++---
2 files changed, 13 insertions(+), 3 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..38faf190c 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))
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH v5] U-Boot: Add option to disable OOT builds
2022-01-25 14:57 [ptxdist] [PATCH v5] U-Boot: Add option to disable OOT builds Christian Melki
@ 2022-01-26 8:18 ` Alexander Dahl
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Dahl @ 2022-01-26 8:18 UTC (permalink / raw)
To: ptxdist
Hello Christian,
Am Tue, Jan 25, 2022 at 03:57:27PM +0100 schrieb Christian Melki:
> This option sometimes breaks builds with various external dependencies.
> Especially vendor trees that have sourcedir path references.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> platforms/u-boot.in | 10 ++++++++++
> rules/u-boot.make | 6 +++---
> 2 files changed, 13 insertions(+), 3 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..38faf190c 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))
Acked-by: Alexander Dahl <ada@thorsis.com>
Greets
Alex
>
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [APPLIED] U-Boot: Add option to disable OOT builds
2022-01-25 14:57 [ptxdist] [PATCH v5] U-Boot: Add option to disable OOT builds Christian Melki
2022-01-26 8:18 ` Alexander Dahl
@ 2022-01-30 15:49 ` Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2022-01-30 15:49 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as fc696d8342ba8ac7b49428df87ede30e4ad64c7d.
Michael
[sent from post-receive hook]
On Sun, 30 Jan 2022 16:49:28 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> This option sometimes breaks builds with various external dependencies.
> Especially vendor trees that have sourcedir path references.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220125145727.6095-1-christian.melki@t2data.com>
> Acked-by: Alexander Dahl <ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-30 15:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-25 14:57 [ptxdist] [PATCH v5] U-Boot: Add option to disable OOT builds Christian Melki
2022-01-26 8:18 ` Alexander Dahl
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox