From patchwork Sun Jan 3 06:02:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Dickinson X-Patchwork-Id: 562144 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2806614031D for ; Sun, 3 Jan 2016 17:32:15 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2BE5128C1B6; Sun, 3 Jan 2016 07:29:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3FACB28C1B4 for ; Sun, 3 Jan 2016 07:28:59 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -8.5 Received: from s1.neomailbox.net (s1.neomailbox.net [5.148.176.57]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 3 Jan 2016 07:28:59 +0100 (CET) From: openwrt@daniel.thecshore.com To: openwrt-devel@lists.openwrt.org Date: Sun, 3 Jan 2016 01:02:50 -0500 Message-Id: <1451800982-112057-3-git-send-email-openwrt@daniel.thecshore.com> In-Reply-To: <1451800982-112057-1-git-send-email-openwrt@daniel.thecshore.com> References: <1451800982-112057-1-git-send-email-openwrt@daniel.thecshore.com> Subject: [OpenWrt-Devel] [PATCH 02/14] targets: Use configured distribution name for SDK, IB, and Toolchain tarball names X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" From: Daniel Dickinson 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 --- 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 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 \