summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-03 14:44:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-03 14:44:42 +0000
commitd69efa4e1538b3667a684c8520dfd8d11662b258 (patch)
treefeb748e2bcb2f9f4707c2e10283f40c8305a03c5 /target
parent2274fbc8dbb996887f26c61d58176b3ea645e310 (diff)
downloadmtk-20170518-d69efa4e1538b3667a684c8520dfd8d11662b258.zip
mtk-20170518-d69efa4e1538b3667a684c8520dfd8d11662b258.tar.gz
mtk-20170518-d69efa4e1538b3667a684c8520dfd8d11662b258.tar.bz2
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 <openwrt@daniel.thecshore.com> SVN-Revision: 48081
Diffstat (limited to 'target')
-rw-r--r--target/imagebuilder/Makefile2
-rw-r--r--target/sdk/Makefile2
-rw-r--r--target/toolchain/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 7f48ed8..106ca3d 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 d81c237..28739bb 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 ebc7e25..08e7166 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 \