OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 9... Line 9...
9 # Substituted by SDK, do not remove 9 # Substituted by SDK, do not remove
10 # REVISION:=x 10 # REVISION:=x
11 # SOURCE_DATE_EPOCH:=x 11 # SOURCE_DATE_EPOCH:=x
Line 12... Line 12...
12   12  
13 PKG_CONFIG_DEPENDS += \ -  
14 CONFIG_VERSION_HOME_URL \ 13 PKG_CONFIG_DEPENDS += \
15 CONFIG_VERSION_BUG_URL \ 14 CONFIG_VERSION_BUG_URL \
16 CONFIG_VERSION_NUMBER \ 15 CONFIG_VERSION_NUMBER \
17 CONFIG_VERSION_CODE \ 16 CONFIG_VERSION_CODE \
18 CONFIG_VERSION_REPO \ 17 CONFIG_VERSION_REPO \
Line 24... Line 23...
24 CONFIG_VERSION_HWREV \ 23 CONFIG_VERSION_HWREV \
Line 25... Line 24...
25   24  
Line 26... Line 25...
26 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1)))) 25 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
27   26  
Line 28... Line 27...
28 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER)) 27 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
29 VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT) 28 VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-SNAPSHOT)
Line 30... Line 29...
30   29  
31 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) 30 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
Line 32... Line 31...
32 VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) 31 VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
33   32  
34 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) 33 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
Line 45... Line 44...
45 VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://openwrt.org/) 44 VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://openwrt.org/)
Line 46... Line 45...
46   45  
47 VERSION_BUG_URL:=$(call qstrip,$(CONFIG_VERSION_BUG_URL)) 46 VERSION_BUG_URL:=$(call qstrip,$(CONFIG_VERSION_BUG_URL))
Line 48... Line -...
48 VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/) -  
49   -  
50 VERSION_HOME_URL:=$(call qstrip,$(CONFIG_VERSION_HOME_URL)) -  
51 VERSION_HOME_URL:=$(if $(VERSION_HOME_URL),$(VERSION_HOME_URL),http://openwrt.org/) 47 VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/)
52   48  
Line 53... Line 49...
53 VERSION_SUPPORT_URL:=$(call qstrip,$(CONFIG_VERSION_SUPPORT_URL)) 49 VERSION_SUPPORT_URL:=$(call qstrip,$(CONFIG_VERSION_SUPPORT_URL))
54 VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/) 50 VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
Line 102... Line 98...
102 -e 's,%A,$(call sed_escape,$(ARCH_PACKAGES)),g' \ 98 -e 's,%A,$(call sed_escape,$(ARCH_PACKAGES)),g' \
103 -e 's,%t,$(call sed_escape,$(VERSION_TAINTS)),g' \ 99 -e 's,%t,$(call sed_escape,$(VERSION_TAINTS)),g' \
104 -e 's,%M,$(call sed_escape,$(VERSION_MANUFACTURER)),g' \ 100 -e 's,%M,$(call sed_escape,$(VERSION_MANUFACTURER)),g' \
105 -e 's,%m,$(call sed_escape,$(VERSION_MANUFACTURER_URL)),g' \ 101 -e 's,%m,$(call sed_escape,$(VERSION_MANUFACTURER_URL)),g' \
106 -e 's,%b,$(call sed_escape,$(VERSION_BUG_URL)),g' \ 102 -e 's,%b,$(call sed_escape,$(VERSION_BUG_URL)),g' \
107 -e 's,%u,$(call sed_escape,$(VERSION_HOME_URL)),g' \ -  
108 -e 's,%s,$(call sed_escape,$(VERSION_SUPPORT_URL)),g' \ 103 -e 's,%s,$(call sed_escape,$(VERSION_SUPPORT_URL)),g' \
109 -e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \ 104 -e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \
110 -e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g' 105 -e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g'