Author: nbd Date: 2016-01-03 15:44:48 +0100 (Sun, 03 Jan 2016) New Revision: 48082
Modified: trunk/include/image.mk Log: images: use configured distribution name for output image names We allow to configure the version distribution name; let's also use it for the final image filenames. Signed-off-by: Daniel Dickinson <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2016-01-03 14:44:42 UTC (rev 48081) +++ trunk/include/image.mk 2016-01-03 14:44:48 UTC (rev 48082) @@ -18,8 +18,22 @@ KDIR_TMP=$(KDIR)/tmp DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts -IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) +define toupper +$(shell echo $(1) | tr '[:lower:]' '[:upper:]') +endef +define tolower +$(shell echo $(1) | tr '[:upper:]' '[:lower:]') +endef + +define sanitize +$(shell echo $(call tolower,$(1)) | sed 's/_/-/g') +endef + +DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST)) + +IMG_PREFIX:=$(DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) + MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt ifneq ($(CONFIG_BIG_ENDIAN),) @@ -85,18 +99,6 @@ echo -ne '\xde\xad\xc0\xde' >> $(1) endef -define toupper -$(shell echo $(1) | tr '[:lower:]' '[:upper:]') -endef - -define tolower -$(shell echo $(1) | tr '[:upper:]' '[:lower:]') -endef - -define sanitize -$(shell echo $(call tolower,$(1)) | sed 's/_/-/g') -endef - PROFILE_SANITIZED := $(call sanitize,$(PROFILE)) define split_args _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
