From 8348627e8ad5ec2a2ac0002f35528fdeacced6f3 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 3 May 2010 00:07:17 +0000 Subject: [PATCH] [backfire] merge r21242 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21324 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package-version-override.mk | 4 ++-- target/linux/avr32/image/u-boot/Makefile | 2 +- target/linux/x86/image/Makefile | 10 ++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/package-version-override.mk b/include/package-version-override.mk index f18ecd7bf..eaaa3520f 100644 --- a/include/package-version-override.mk +++ b/include/package-version-override.mk @@ -3,7 +3,7 @@ PKG_VERSION_ORGINAL:=$(PKG_VERSION) # in case that another version is provided, overwrite the original ifeq ($(CONFIG_$(PKG_NAME)_USE_CUSTOM_VERSION),y) -PKG_VERSION:= $(strip $(subst ",, $(CONFIG_$(PKG_NAME)_CUSTOM_VERSION))) +PKG_VERSION:=$(call qstrip,$(CONFIG_$(PKG_NAME)_CUSTOM_VERSION)) PKG_SOURCE:=$(subst $(PKG_VERSION_ORGINAL),$(PKG_VERSION),$(PKG_SOURCE)) PKG_MD5SUM:= endif @@ -26,7 +26,7 @@ endef # in case that an customer source path is provided, set the acc. default variable ifeq ($(CONFIG_$(PKG_NAME)_USE_CUSTOM_SOURCE_DIR),y) -PKG_DEFAULT_CUSTOM_SOURCE_DIR:= $(strip $(subst ",, $(CONFIG_$(PKG_NAME)_CUSTOM_SOURCE_DIR))) +PKG_DEFAULT_CUSTOM_SOURCE_DIR:= $(call qstrip,$(CONFIG_$(PKG_NAME)_CUSTOM_SOURCE_DIR)) endif # package specific configuration diff --git a/target/linux/avr32/image/u-boot/Makefile b/target/linux/avr32/image/u-boot/Makefile index 2d95b8769..79bdb9f6e 100644 --- a/target/linux/avr32/image/u-boot/Makefile +++ b/target/linux/avr32/image/u-boot/Makefile @@ -20,7 +20,7 @@ PKG_CAT:=bzcat include $(INCLUDE_DIR)/package.mk -UBOOT_CONFIG=$(strip $(subst ",, $(CONFIG_AVR32_UBOOT_TARGET))) +UBOOT_CONFIG=$(call qstrip,$(CONFIG_AVR32_UBOOT_TARGET)) define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIG)_config diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 2a6a2e336..a4399a2b4 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -10,15 +10,13 @@ include $(INCLUDE_DIR)/image.mk export PATH=$(TARGET_PATH):/sbin ifneq ($(CONFIG_TARGET_x86_olpc),y) -BOOTOPTS=$(strip $(subst ",, $(CONFIG_X86_GRUB_BOOTOPTS))) -ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART))) -#"))")) # fix vim's broken syntax highlighting +BOOTOPTS=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS)) +ROOTPART=$(call qstrip,$(CONFIG_X86_GRUB_ROOTPART)) endif ifeq ($(CONFIG_TARGET_x86_olpc),y) -ROOTPART=$(strip $(subst ",, $(CONFIG_OLPC_BOOTSCRIPT_ROOTPART))) +ROOTPART=$(call qstrip,$(CONFIG_OLPC_BOOTSCRIPT_ROOTPART)) endif -#"))")) # fix vim's broken syntax highlighting GRUB_TERMINALS = GRUB_SERIAL_CONFIG = @@ -31,7 +29,7 @@ GRUB_TERMINALS += console endif ifneq ($(CONFIG_X86_GRUB_SERIAL),) -GRUB_CONSOLE_CMDLINE += console=$(strip $(subst ",, $(CONFIG_X86_GRUB_SERIAL))),$(CONFIG_X86_GRUB_BAUDRATE)n8 +GRUB_CONSOLE_CMDLINE += console=$(call qstrip,$(CONFIG_X86_GRUB_SERIAL)),$(CONFIG_X86_GRUB_BAUDRATE)n8 GRUB_SERIAL_CONFIG = serial --unit=0 --speed=$(CONFIG_X86_GRUB_BAUDRATE) --word=8 --parity=no --stop=1 GRUB_TERMINALS += serial endif -- 2.35.1