diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-08 11:02:00 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-08 11:02:00 +0000 |
| commit | 15d8db1f8c467763ed437184a80e9da6c02e69f2 (patch) | |
| tree | 680b9db45681b9616ec843d1ce3ac7a5ee75facd | |
| parent | 3e0817d606199bcdd089bb8c3318b3ea109c3f2d (diff) | |
| download | master-31e0f0ae-15d8db1f8c467763ed437184a80e9da6c02e69f2.tar.gz master-31e0f0ae-15d8db1f8c467763ed437184a80e9da6c02e69f2.tar.bz2 master-31e0f0ae-15d8db1f8c467763ed437184a80e9da6c02e69f2.zip | |
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 <jow@openwrt.org>
SVN-Revision: 43869
| -rw-r--r-- | include/image.mk | 3 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 8 | ||||
| -rw-r--r-- | target/imagebuilder/Makefile | 2 | ||||
| -rw-r--r-- | target/sdk/Makefile | 3 |
4 files changed, 13 insertions, 3 deletions
diff --git a/include/image.mk b/include/image.mk index 7375bf563f..94e4438312 100644 --- a/include/image.mk +++ b/include/image.mk @@ -9,6 +9,7 @@ override TARGET_BUILD= include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/host.mk +include $(INCLUDE_DIR)/version.mk override MAKE:=$(_SINGLE)$(SUBMAKE) override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE) @@ -16,7 +17,7 @@ override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE) KDIR=$(KERNEL_BUILD_DIR) DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/ -IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) +IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 8859eb6f6a..1f0b2c86ea 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -206,6 +206,14 @@ if VERSIONOPT help This is the hardware revision string embedded in /etc/device_info Useful for OEMs building OpenWrt based firmware + + config VERSION_FILENAMES + bool + prompt "Version number in filenames" + default y + help + Enable this to include the version number in firmware image, SDK- + and Image Builder archive file names endif 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 |