[ptxdist] [PATCH] at91bootstrap2: make targetinstall v4.x compatible

[ptxdist] [PATCH] at91bootstrap2: make targetinstall v4.x compatible

[Ahmad Fatoum]

The binaries directory, where artifacts were previously written to is
now beneath build/ by default[1]:

  BUILDDIR ?= ./build
  BINDIR:=$(BUILDDIR)/binaries

Supply BUILDDIR=. after the make command to return to the old directory
scheme. This should have no effect on AT91Bootstrap v3.x and older
as BUILDDIR was first added in v4.0.0[1].

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 rules/at91bootstrap2.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/at91bootstrap2.make b/rules/at91bootstrap2.make
index dcb1157b17f1..c36e30305a92 100644
--- a/rules/at91bootstrap2.make
+++ b/rules/at91bootstrap2.make
@@ -35,7 +35,7 @@ AT91BOOTSTRAP2_WRAPPER_BLACKLIST := \
 AT91BOOTSTRAP2_MAKE_ENV := \
 	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
 	HOSTCC=$(HOSTCC)
-AT91BOOTSTRAP2_MAKE_OPT := V=$(PTXDIST_VERBOSE)
+AT91BOOTSTRAP2_MAKE_OPT := V=$(PTXDIST_VERBOSE) BUILDDIR=.
 
 ifdef PTXCONF_AT91BOOTSTRAP2
 $(AT91BOOTSTRAP2_CONFIG):
-- 
2.39.2

Re: [ptxdist] [PATCH] at91bootstrap2: make targetinstall v4.x compatible

[Ahmad Fatoum]

On 17.04.23 13:51, Ahmad Fatoum wrote:
> The binaries directory, where artifacts were previously written to is
> now beneath build/ by default[1]:
> 
>   BUILDDIR ?= ./build
>   BINDIR:=$(BUILDDIR)/binaries
> 
> Supply BUILDDIR=. after the make command to return to the old directory
> scheme. This should have no effect on AT91Bootstrap v3.x and older
> as BUILDDIR was first added in v4.0.0[1].

[1]: https://github.com/linux4sam/at91bootstrap/commit/814f3bdab515287fbb0d972d89d228748613ae91

is what I meant to reference. Please let me know if I should resend.

Thanks,
Ahmad

> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  rules/at91bootstrap2.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/at91bootstrap2.make b/rules/at91bootstrap2.make
> index dcb1157b17f1..c36e30305a92 100644
> --- a/rules/at91bootstrap2.make
> +++ b/rules/at91bootstrap2.make
> @@ -35,7 +35,7 @@ AT91BOOTSTRAP2_WRAPPER_BLACKLIST := \
>  AT91BOOTSTRAP2_MAKE_ENV := \
>  	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
>  	HOSTCC=$(HOSTCC)
> -AT91BOOTSTRAP2_MAKE_OPT := V=$(PTXDIST_VERBOSE)
> +AT91BOOTSTRAP2_MAKE_OPT := V=$(PTXDIST_VERBOSE) BUILDDIR=.
>  
>  ifdef PTXCONF_AT91BOOTSTRAP2
>  $(AT91BOOTSTRAP2_CONFIG):

-- 
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 |

Re: [ptxdist] [APPLIED] at91bootstrap2: make targetinstall v4.x compatible

[Michael Olbrich]

Thanks, applied as f1a5e7f131c308d613e6aaf00d07a117c0c03ee9.

Michael

[sent from post-receive hook]

On Tue, 02 May 2023 09:05:53 +0200, Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
> The binaries directory, where artifacts were previously written to is
> now beneath build/ by default[1]:
> 
>   BUILDDIR ?= ./build
>   BINDIR:=$(BUILDDIR)/binaries
> 
> Supply BUILDDIR=. after the make command to return to the old directory
> scheme. This should have no effect on AT91Bootstrap v3.x and older
> as BUILDDIR was first added in v4.0.0[1].
> 
> [1] https://github.com/linux4sam/at91bootstrap/commit/814f3bdab515287fbb0d972d89d228748613ae91
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> Message-Id: <20230417115146.745019-1-a.fatoum@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/at91bootstrap2.make b/rules/at91bootstrap2.make
> index dcb1157b17f1..c36e30305a92 100644
> --- a/rules/at91bootstrap2.make
> +++ b/rules/at91bootstrap2.make
> @@ -35,7 +35,7 @@ AT91BOOTSTRAP2_WRAPPER_BLACKLIST := \
>  AT91BOOTSTRAP2_MAKE_ENV := \
>  	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
>  	HOSTCC=$(HOSTCC)
> -AT91BOOTSTRAP2_MAKE_OPT := V=$(PTXDIST_VERBOSE)
> +AT91BOOTSTRAP2_MAKE_OPT := V=$(PTXDIST_VERBOSE) BUILDDIR=.
>  
>  ifdef PTXCONF_AT91BOOTSTRAP2
>  $(AT91BOOTSTRAP2_CONFIG):