Skip to content

Commit

Permalink
Remove firmware compilation date
Browse files Browse the repository at this point in the history
  • Loading branch information
openwrtdiy committed Sep 6, 2024
1 parent cc37dac commit 6788786
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion include/image.mk
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-
IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-)
IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-)

IMG_PREFIX:=$(shell date +%Y%m%d%H%M%S)-$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
IMG_ROOTFS:=$(IMG_PREFIX)-rootfs
IMG_COMBINED:=$(IMG_PREFIX)-combined
ifeq ($(DUMP),)
Expand Down
7 changes: 1 addition & 6 deletions include/version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ PKG_CONFIG_DEPENDS += \
CONFIG_VERSION_PRODUCT \
CONFIG_VERSION_SUPPORT_URL \
CONFIG_VERSION_HWREV \
CONFIG_VERSION_BUILT_DATE \

sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))

Expand Down Expand Up @@ -57,9 +56,6 @@ VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
VERSION_HWREV:=$(call qstrip,$(CONFIG_VERSION_HWREV))
VERSION_HWREV:=$(if $(VERSION_HWREV),$(VERSION_HWREV),v0)

VERSION_BUILT_DATE:=$(call qstrip,$(shell date +%Y-%m-%d"_"%H:%M:%S))
VERSION_BUILT_DATE:=$(if $(VERSION_BUILT_DATE),$(VERSION_BUILT_DATE),v0)

define taint2sym
$(CONFIG_$(firstword $(subst :, ,$(subst +,,$(subst -,,$(1))))))
endef
Expand Down Expand Up @@ -108,6 +104,5 @@ VERSION_SED_SCRIPT:=$(SED) 's,%U,$(call sed_escape,$(VERSION_REPO)),g' \
-e 's,%u,$(call sed_escape,$(VERSION_HOME_URL)),g' \
-e 's,%s,$(call sed_escape,$(VERSION_SUPPORT_URL)),g' \
-e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \
-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g' \
-e 's,%B,$(call sed_escape,$(VERSION_BUILT_DATE)),g'
-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g'

1 change: 0 additions & 1 deletion package/base-files/files/etc/openwrt_release
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
DISTRIB_ID='%D'
DISTRIB_RELEASE='%V'
DISTRIB_REVISION='%R'
DISTRIB_COMPILE='%B'
DISTRIB_TARGET='%S'
DISTRIB_ARCH='%A'
DISTRIB_DESCRIPTION='%D %V %C'
Expand Down
1 change: 0 additions & 1 deletion package/base-files/files/usr/lib/os-release
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ OPENWRT_DEVICE_MANUFACTURER="%M"
OPENWRT_DEVICE_MANUFACTURER_URL="%m"
OPENWRT_DEVICE_PRODUCT="%P"
OPENWRT_DEVICE_REVISION="%h"
OPENWRT_DEVICE_COMPILE="%B"
OPENWRT_RELEASE="%D %V %C"

0 comments on commit 6788786

Please sign in to comment.