From a8bb90bd2f07fa5da756c11911c64af1c855ee3d Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 8 Jan 2015 11:02:00 +0000 Subject: build: add version number to filenames This commit introduces a new option CONFIG_VERSION_FILENAMES which causes OpenWrt to embed the version number in generated image files, SDK- and ImageBuilder archives. The option is enabled by default if CONFIG_VERSIONOPT is set. Signed-off-by: Jo-Philipp Wich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43869 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/imagebuilder/Makefile | 2 +- target/sdk/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'target') diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 1a7cbbf9fe..82fdab40d8 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -15,7 +15,7 @@ override MAKEFLAGS= PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) -IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))-for-$(PKG_OS)-$(PKG_CPU) +IB_NAME:=OpenWrt-ImageBuilder-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))-for-$(PKG_OS)-$(PKG_CPU) 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 cdfb2c8c45..9e8749b080 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/host.mk +include $(INCLUDE_DIR)/version.mk override MAKEFLAGS= PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) -SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)-gcc-$(GCCV)_$(LIBC)-$(LIBCV) +SDK_NAME:=OpenWrt-SDK-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)-gcc-$(GCCV)_$(LIBC)-$(LIBCV) SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME) STAGING_SUBDIR_HOST := staging_dir/host -- cgit v1.2.3