Commit 79c213fb authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

target: use qstrip 



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 5c4555d1

target/Makefile.in

+8 −14
Original line number Diff line number Diff line 
BR2_PACKAGE_LINUX_FORMAT:=$(strip $(subst ",,$(BR2_PACKAGE_LINUX_FORMAT)))

#"))

BR2_PACKAGE_LINUX_KCONFIG:=$(strip $(subst ",,$(BR2_PACKAGE_LINUX_KCONFIG)))

#"))

BR2_PACKAGE_LINUX_FORMAT:=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))

BR2_PACKAGE_LINUX_KCONFIG:=$(call qstrip,$(BR2_PACKAGE_LINUX_KCONFIG))





# COPY_FILE absolute_path_to_file, target_directory, filename

ifneq ($(strip $(subst ",,$(BUILDROOT_COPYTO))),)	# Use shell definition

#"))

ifneq ($(call qstrip,$(BUILDROOT_COPYTO)),)	# Use shell definition

define COPY_FILE

	@echo "BUILDROOT_COPYTO: Copy to $(BUILDROOT_COPYTO)/$(strip $(3))" ; \

	mkdir -p $(BINARIES_DIR) || echo "Could not create $(BINARIES_DIR)" ; \
@@ -18,25 +15,23 @@ define COPY_FILE 
		cp $(1) $(BUILDROOT_COPYTO)/$(strip $(3)) || echo "Could not copy $(3)" ;  \

	fi

endef

COPYTO=$(strip $(subst ",,$(BUILDROOT_COPYTO)))

COPYTO=$(call qstrip,$(BUILDROOT_COPYTO))

else

ifneq ($(strip $(subst ",,$(BR2_COPYTO))),)	# Global override

#"))

ifneq ($(call qstrip,$(BR2_COPYTO)),)	# Global override

define COPY_FILE

	@echo "BR2_COPYTO: Copy to $(BR2_COPYTO)/$(strip $(3))" ; \

	mkdir -p $(BINARIES_DIR) || echo "Could not create $(BINARIES_DIR)" ; \

	if [ -w $(BINARIES_DIR) -o -w $(BINARIES_DIR)  ] ; then \

		cp $(1) $(BINARIES_DIR)/$(strip $(3)) || echo "Could not copy $(3)" ;  \

	fi ; \

	if [ "$(strip $(subst ",,$(BR2_COPYTO)))X" != "X" ] ; then \

	if [ "$(call qstrip,$(BR2_COPYTO))X" != "X" ] ; then \

		mkdir -p $(BR2_COPYTO)  || echo "Could not create $(BR2_COPYTO)" ; \

		if [ -d $(BR2_COPYTO) -o -w $(BR2_COPYTO) ] ; then \

			cp $(1) $(BR2_COPYTO)/$(strip $(3)) || echo "Could not copy $(3)" ;  \

		fi ; \

	fi

endef

#"))

COPYTO=$(strip $(subst ",,$(BR2_COPYTO)))

COPYTO=$(call qstrip,$(BR2_COPYTO))

else	# Package specific copyto, or empty

define COPY_FILE

	@echo "Copy to $(2)/$(strip $(3))" ; \
@@ -44,14 +39,13 @@ define COPY_FILE 
	if [ -w $(BINARIES_DIR) -o -w $(BINARIES_DIR)  ] ; then \

		cp $(1) $(BINARIES_DIR)/$(strip $(3)) || echo "Could not copy $(3)" ;  \

	fi ; \

	if [ "$(strip $(subst ",,$(2)))X" != "X" ] ; then \

	if [ "$(call qstrip,$(2))X" != "X" ] ; then \

		mkdir -p $(2) || echo "Could not create $(2)" ; \

		if [ -d $(2) -o  -w $(2) ] ; then \

			cp $(1) $(2)/$(strip $(3)) || echo "Could not copy $(3)" ;  \

		fi ; \

	fi

endef

#"))

endif

endif

target/cpio/cpioroot.mk

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ else 
CPIO_TARGET := $(CPIO_BASE)

endif



ROOTFS_CPIO_COPYTO:=$(strip $(subst ",,$(BR2_TARGET_ROOTFS_CPIO_COPYTO)))

# "))

ROOTFS_CPIO_COPYTO:=$(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_COPYTO))

#



cpioroot-init:

target/cramfs/cramfs.mk

+1 −2
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 
#############################################################

CRAMFS_DIR=$(BUILD_DIR)/cramfs-1.1

CRAMFS_SOURCE=cramfs-1.1.tar.gz

ifeq ($(strip $(subst ",,$(BR2_SOURCEFORGE_MIRROR))),unc)

# "))

ifeq ($(call qstrip,$(BR2_SOURCEFORGE_MIRROR)),unc)

# UNC does not seem to have cramfs

CRAMFS_SITE=http://internap.dl.sourceforge.net/sourceforge/cramfs

else

target/device/ARMLTD/Makefile.in

+2 −4
Original line number Diff line number Diff line 
ifeq ($(BR2_TARGET_ARMLTD),y)

BOARD_NAME=$(strip $(subst ",,$(BR2_BOARD_NAME)))

#"))

BOARD_PATH=$(strip $(subst ",,$(BR2_BOARD_PATH)))

#"))

BOARD_NAME=$(call qstrip,$(BR2_BOARD_NAME))

BOARD_PATH=$(call qstrip,$(BR2_BOARD_PATH))





# pin some settings

target/device/Atmel/DataFlashBoot/DataflashBoot.mk

+1 −2
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 
#############################################################

DATAFLASHBOOT_VERSION:=1.05

DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION)

ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR)))

# "))

ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))

DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)

DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2

DATAFLASHBOOT_DIR:=$(PROJECT_BUILD_DIR)/$(DATAFLASHBOOT_NAME)