Thanks, applied as a007a9d11d1c2f6522d878d77ad744b221d146d1. Michael
[sent from post-receive hook] On Fri, 28 Oct 2022 16:44:10 +0200, Ladislav Michl <[email protected]> wrote: > Signed-off-by: Ladislav Michl <[email protected]> > Message-Id: <Y06ml9831pYia09P@lenoch> > [mol: update TF_A_BUILDDIR user as well] > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/db.make b/rules/db.make > index 1fce58623c66..2872a1c0230d 100644 > --- a/rules/db.make > +++ b/rules/db.make > @@ -25,7 +25,7 @@ DB_URL := > http://download.oracle.com/berkeley-db/$(DB).$(DB_SUFFIX) > DB_SOURCE := $(SRCDIR)/$(DB).$(DB_SUFFIX) > DB_DIR := $(BUILDDIR)/$(DB) > DB_SUBDIR := dist > -DB_BUILDDIR := $(DB_DIR)/build_unix > +DB_BUILD_DIR := $(DB_DIR)/build_unix > DB_LICENCE := Sleepycat > > # > ---------------------------------------------------------------------------- > @@ -35,7 +35,7 @@ DB_LICENCE := Sleepycat > # > # autoconf > # > -DB_CONF_TOOL := autoconf > +DB_CONF_TOOL := autoconf > DB_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-smallbuild \ > diff --git a/rules/tf-a.make b/rules/tf-a.make > index 561af0d390af..ac1bff0322b4 100644 > --- a/rules/tf-a.make > +++ b/rules/tf-a.make > @@ -22,7 +22,7 @@ TF_A_SUFFIX := tar.gz > TF_A_URL := $(call remove_quotes, > $(PTXCONF_TF_A_URL))/$(TF_A_VERSION).$(TF_A_SUFFIX) > TF_A_SOURCE := $(SRCDIR)/$(TF_A).$(TF_A_SUFFIX) > TF_A_DIR := $(BUILDDIR)/$(TF_A) > -TF_A_BUILDDIR := $(TF_A_DIR)/build > +TF_A_BUILD_DIR := $(TF_A_DIR)/build > TF_A_BUILD_OOT := YES > TF_A_LICENSE := BSD-3-Clause AND BSD-2-Clause \ > AND (GPL-2.0-or-later OR BSD-2-Clause) \ > @@ -41,7 +41,7 @@ TF_A_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > TF_A_EXTRA_ARGS := $(call > remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS)) > -TF_A_BINDIR = $(TF_A_BUILDDIR)/$(1)/$(if $(filter > DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release) > +TF_A_BINDIR = $(TF_A_BUILD_DIR)/$(1)/$(if $(filter > DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release) > TF_A_MAKE_OPT := \ > -C $(TF_A_DIR) \ > CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
