Changeset 21324 for branches/backfire


Ignore:
Timestamp:
2010-05-03T02:07:17+02:00 (6 years ago)
Author:
nico
Message:

[backfire] merge r21242

Location:
branches/backfire
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/include/package-version-override.mk

    r16227 r21324  
    44# in case that another version is provided, overwrite the original 
    55ifeq ($(CONFIG_$(PKG_NAME)_USE_CUSTOM_VERSION),y) 
    6 PKG_VERSION:= $(strip $(subst ",, $(CONFIG_$(PKG_NAME)_CUSTOM_VERSION))) 
     6PKG_VERSION:=$(call qstrip,$(CONFIG_$(PKG_NAME)_CUSTOM_VERSION)) 
    77PKG_SOURCE:=$(subst $(PKG_VERSION_ORGINAL),$(PKG_VERSION),$(PKG_SOURCE)) 
    88PKG_MD5SUM:= 
     
    2727# in case that an customer source path is provided, set the acc. default variable 
    2828ifeq ($(CONFIG_$(PKG_NAME)_USE_CUSTOM_SOURCE_DIR),y) 
    29 PKG_DEFAULT_CUSTOM_SOURCE_DIR:= $(strip $(subst ",, $(CONFIG_$(PKG_NAME)_CUSTOM_SOURCE_DIR))) 
     29PKG_DEFAULT_CUSTOM_SOURCE_DIR:= $(call qstrip,$(CONFIG_$(PKG_NAME)_CUSTOM_SOURCE_DIR)) 
    3030endif 
    3131 
  • branches/backfire/target/linux/avr32/image/u-boot/Makefile

    r14702 r21324  
    2121include $(INCLUDE_DIR)/package.mk 
    2222 
    23 UBOOT_CONFIG=$(strip $(subst ",, $(CONFIG_AVR32_UBOOT_TARGET))) 
     23UBOOT_CONFIG=$(call qstrip,$(CONFIG_AVR32_UBOOT_TARGET)) 
    2424 
    2525define Build/Compile 
  • branches/backfire/target/linux/x86/image/Makefile

    r21208 r21324  
    1111 
    1212ifneq ($(CONFIG_TARGET_x86_olpc),y) 
    13 BOOTOPTS=$(strip $(subst ",, $(CONFIG_X86_GRUB_BOOTOPTS))) 
    14 ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART))) 
    15 #"))")) # fix vim's broken syntax highlighting 
     13BOOTOPTS=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS)) 
     14ROOTPART=$(call qstrip,$(CONFIG_X86_GRUB_ROOTPART)) 
    1615endif 
    1716 
    1817ifeq ($(CONFIG_TARGET_x86_olpc),y) 
    19 ROOTPART=$(strip $(subst ",, $(CONFIG_OLPC_BOOTSCRIPT_ROOTPART))) 
    20 endif 
    21 #"))")) # fix vim's broken syntax highlighting 
     18ROOTPART=$(call qstrip,$(CONFIG_OLPC_BOOTSCRIPT_ROOTPART)) 
     19endif 
    2220 
    2321GRUB_TERMINALS = 
     
    3230 
    3331ifneq ($(CONFIG_X86_GRUB_SERIAL),) 
    34 GRUB_CONSOLE_CMDLINE += console=$(strip $(subst ",, $(CONFIG_X86_GRUB_SERIAL))),$(CONFIG_X86_GRUB_BAUDRATE)n8 
     32GRUB_CONSOLE_CMDLINE += console=$(call qstrip,$(CONFIG_X86_GRUB_SERIAL)),$(CONFIG_X86_GRUB_BAUDRATE)n8 
    3533GRUB_SERIAL_CONFIG = serial --unit=0 --speed=$(CONFIG_X86_GRUB_BAUDRATE) --word=8 --parity=no --stop=1 
    3634GRUB_TERMINALS += serial 
Note: See TracChangeset for help on using the changeset viewer.