From d69efa4e1538b3667a684c8520dfd8d11662b258 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 3 Jan 2016 14:44:42 +0000 Subject: [PATCH] targets: Use configured distribution name for SDK, IB, and Toolchain tarball names We allow to configure the version distribution name; let's also use it for the tarballs (SDK, ImageBuilder, and SDK). Signed-off-by: Daniel Dickinson SVN-Revision: 48081 --- 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 7f48ed885f..106ca3d6f2 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/feeds.mk override MAKEFLAGS= -IB_NAME:=OpenWrt-ImageBuilder-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)).$(HOST_OS)-$(HOST_ARCH) +IB_NAME:=$(VERSION_DIST)-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 d81c2375e0..28739bbca9 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk override MAKEFLAGS= -SDK_NAME:=OpenWrt-SDK-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))_gcc-$(GCCV)$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH) +SDK_NAME:=$(VERSION_DIST)-SDK-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))_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 ebc7e25c9b..08e716660b 100644 --- a/target/toolchain/Makefile +++ b/target/toolchain/Makefile @@ -14,7 +14,7 @@ include $(INCLUDE_DIR)/version.mk override MAKEFLAGS= -TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))_gcc-$(GCCV)$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH) +TOOLCHAIN_NAME:=$(VERSION_DIST)-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 \ -- 2.30.2