Explorar o código

IB/SDK/toolchain: use VERSION_DIST_SANITIZED instead of VERSION_DIST

VERSION_DIST can contains spaces which produces problems when used as file name

Signed-off-by: Alexander Couzens <[email protected]>
Alexander Couzens %!s(int64=9) %!d(string=hai) anos
pai
achega
4a7c653400
Modificáronse 3 ficheiros con 3 adicións e 3 borrados
  1. 1 1
      target/imagebuilder/Makefile
  2. 1 1
      target/sdk/Makefile
  3. 1 1
      target/toolchain/Makefile

+ 1 - 1
target/imagebuilder/Makefile

@@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/feeds.mk
 
 
 override MAKEFLAGS=
 override MAKEFLAGS=
 
 
-IB_NAME:=$(VERSION_DIST)-ImageBuilder-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)).$(HOST_OS)-$(HOST_ARCH)
+IB_NAME:=$(VERSION_DIST_SANITIZED)-ImageBuilder-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)).$(HOST_OS)-$(HOST_ARCH)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
 IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR))
 IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR))
 IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))
 IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))

+ 1 - 1
target/sdk/Makefile

@@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/version.mk
 
 
 override MAKEFLAGS=
 override MAKEFLAGS=
 
 
-SDK_NAME:=$(VERSION_DIST)-SDK-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))$(if $(GCCV),_gcc-$(GCCV))$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
+SDK_NAME:=$(VERSION_DIST_SANITIZED)-SDK-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))$(if $(GCCV),_gcc-$(GCCV))$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 
 
 STAGING_SUBDIR_HOST := staging_dir/host
 STAGING_SUBDIR_HOST := staging_dir/host

+ 1 - 1
target/toolchain/Makefile

@@ -14,7 +14,7 @@ include $(INCLUDE_DIR)/version.mk
 
 
 override MAKEFLAGS=
 override MAKEFLAGS=
 
 
-TOOLCHAIN_NAME:=$(VERSION_DIST)-Toolchain-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))_gcc-$(GCCV)$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
+TOOLCHAIN_NAME:=$(VERSION_DIST_SANITIZED)-Toolchain-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))_gcc-$(GCCV)$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
 TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)
 TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)
 EXCLUDE_DIRS:=*/ccache \
 EXCLUDE_DIRS:=*/ccache \
 	*/initial \
 	*/initial \