| Message ID | cc6e05b31a8a34c32591ac3d757fc5ad88e5babc.1464273451.git.lynxis@fe80.eu |
|---|---|
| State | Accepted |
| Delegated to: | Alexander Couzens |
| Headers | show |
On 05/26/2016 04:39 PM, Alexander Couzens wrote: > VERSION_DIST can contains spaces which produces problems when used as file name > > Signed-off-by: Alexander Couzens <lynxis@fe80.eu> Acked-by: Jo-Philipp Wich <jo@mein.io> > --- > target/imagebuilder/Makefile | 2 +- > target/sdk/Makefile | 2 +- > target/toolchain/Makefile | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile > index b49153b..0f45ad3 100644 > --- a/target/imagebuilder/Makefile > +++ b/target/imagebuilder/Makefile > @@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/feeds.mk > > 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) > IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR)) > IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR)) > diff --git a/target/sdk/Makefile b/target/sdk/Makefile > index c0bc062..15c381f 100644 > --- a/target/sdk/Makefile > +++ b/target/sdk/Makefile > @@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/version.mk > > 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) > > STAGING_SUBDIR_HOST := staging_dir/host > diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile > index 08e7166..e8fe4fb 100644 > --- a/target/toolchain/Makefile > +++ b/target/toolchain/Makefile > @@ -14,7 +14,7 @@ include $(INCLUDE_DIR)/version.mk > > 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) > EXCLUDE_DIRS:=*/ccache \ > */initial \ >
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index b49153b..0f45ad3 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/feeds.mk 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) IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR)) IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR)) diff --git a/target/sdk/Makefile b/target/sdk/Makefile index c0bc062..15c381f 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/version.mk 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) STAGING_SUBDIR_HOST := staging_dir/host diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile index 08e7166..e8fe4fb 100644 --- a/target/toolchain/Makefile +++ b/target/toolchain/Makefile @@ -14,7 +14,7 @@ include $(INCLUDE_DIR)/version.mk 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) EXCLUDE_DIRS:=*/ccache \ */initial \
VERSION_DIST can contains spaces which produces problems when used as file name Signed-off-by: Alexander Couzens <lynxis@fe80.eu> --- target/imagebuilder/Makefile | 2 +- target/sdk/Makefile | 2 +- target/toolchain/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)