Author: jow Date: 2015-01-08 12:02:00 +0100 (Thu, 08 Jan 2015) New Revision: 43869
Modified: trunk/include/image.mk trunk/package/base-files/image-config.in trunk/target/imagebuilder/Makefile trunk/target/sdk/Makefile Log: 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 <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2015-01-07 17:10:02 UTC (rev 43868) +++ trunk/include/image.mk 2015-01-08 11:02:00 UTC (rev 43869) @@ -9,6 +9,7 @@ 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 @@ 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 Modified: trunk/package/base-files/image-config.in =================================================================== --- trunk/package/base-files/image-config.in 2015-01-07 17:10:02 UTC (rev 43868) +++ trunk/package/base-files/image-config.in 2015-01-08 11:02:00 UTC (rev 43869) @@ -206,6 +206,14 @@ 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 Modified: trunk/target/imagebuilder/Makefile =================================================================== --- trunk/target/imagebuilder/Makefile 2015-01-07 17:10:02 UTC (rev 43868) +++ trunk/target/imagebuilder/Makefile 2015-01-08 11:02:00 UTC (rev 43869) @@ -15,7 +15,7 @@ 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)) Modified: trunk/target/sdk/Makefile =================================================================== --- trunk/target/sdk/Makefile 2015-01-07 17:10:02 UTC (rev 43868) +++ trunk/target/sdk/Makefile 2015-01-08 11:02:00 UTC (rev 43869) @@ -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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
