Author: nbd Date: 2016-01-03 15:44:42 +0100 (Sun, 03 Jan 2016) New Revision: 48081
Modified: trunk/target/imagebuilder/Makefile trunk/target/sdk/Makefile trunk/target/toolchain/Makefile Log: 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 <[email protected]> Modified: trunk/target/imagebuilder/Makefile =================================================================== --- trunk/target/imagebuilder/Makefile 2016-01-03 14:44:36 UTC (rev 48080) +++ trunk/target/imagebuilder/Makefile 2016-01-03 14:44:42 UTC (rev 48081) @@ -13,7 +13,7 @@ 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)) Modified: trunk/target/sdk/Makefile =================================================================== --- trunk/target/sdk/Makefile 2016-01-03 14:44:36 UTC (rev 48080) +++ trunk/target/sdk/Makefile 2016-01-03 14:44:42 UTC (rev 48081) @@ -12,7 +12,7 @@ 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 Modified: trunk/target/toolchain/Makefile =================================================================== --- trunk/target/toolchain/Makefile 2016-01-03 14:44:36 UTC (rev 48080) +++ trunk/target/toolchain/Makefile 2016-01-03 14:44:42 UTC (rev 48081) @@ -14,7 +14,7 @@ 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 \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
