From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Seiderer Date: Fri, 7 Apr 2017 21:46:50 +0200 Subject: [Buildroot] [PATCH 1/2] uboot: qstrip BR2_TARGET_UBOOT_CUSTOM_DTS_PATH In-Reply-To: <20170407100323.6871-1-michael@amarulasolutions.com> References: <20170407100323.6871-1-michael@amarulasolutions.com> Message-ID: <20170407214650.73cdc0dc@gmx.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hello Michael, On Fri, 7 Apr 2017 12:03:22 +0200, Michael Trimarchi wrote: > We need to avoid failing of copy of custom dts using > cp -f <> command. Just strip in the beginning as done > for other configuration variable > > Signed-off-by: Michael Trimarchi > --- > boot/uboot/uboot.mk | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 1d464d967..f0f39f3bd 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -6,6 +6,7 @@ > > UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION)) > UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) > +UBOOT_CUSTOM_DTS_PATH=$(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH)) > > UBOOT_LICENSE = GPL-2.0+ > UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt > @@ -195,8 +196,8 @@ endef > endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY > > define UBOOT_BUILD_CMDS > - $(if $(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH), > - cp -f $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH)) $(@D)/arch/$(UBOOT_ARCH)/dts/ > + $(if $(UBOOT_CUSTOM_DTS_PATH), > + cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/ > ) > $(TARGET_CONFIGURE_OPTS) \ > $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ Tested-by: Peter Seiderer Regards, Peter