KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: add menuconfig option for HOME_URL

Browse source 
Add a menuconfig option to set the HOME_URL exposed in
/usr/lib/os-release independent from the
LEDE_DEVICE_MANUFACTURER_URL.

Fixes: FS#1123

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2017-11-02 08:21:57 +01:00
parent 75ab064d2b
commit 52a9edb1bf
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/version.mk
View file

@ -11,6 +11,7 @@
# SOURCE_DATE_EPOCH:=x # SOURCE_DATE_EPOCH:=x
PKG_CONFIG_DEPENDS += \ PKG_CONFIG_DEPENDS += \
CONFIG_VERSION_HOME_URL \
CONFIG_VERSION_BUG_URL \ CONFIG_VERSION_BUG_URL \
CONFIG_VERSION_NUMBER \ CONFIG_VERSION_NUMBER \
CONFIG_VERSION_CODE \ CONFIG_VERSION_CODE \
@ -46,6 +47,9 @@ VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURE
VERSION_BUG_URL:=$(call qstrip,$(CONFIG_VERSION_BUG_URL)) VERSION_BUG_URL:=$(call qstrip,$(CONFIG_VERSION_BUG_URL))
VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/) VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/)
VERSION_HOME_URL:=$(call qstrip,$(CONFIG_VERSION_HOME_URL))
VERSION_HOME_URL:=$(if $(VERSION_HOME_URL),$(VERSION_HOME_URL),http://openwrt.org/)
VERSION_SUPPORT_URL:=$(call qstrip,$(CONFIG_VERSION_SUPPORT_URL)) VERSION_SUPPORT_URL:=$(call qstrip,$(CONFIG_VERSION_SUPPORT_URL))
VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/) VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
@ -100,6 +104,7 @@ VERSION_SED_SCRIPT:=$(SED) 's,%U,$(call sed_escape,$(VERSION_REPO)),g' \
-e 's,%M,$(call sed_escape,$(VERSION_MANUFACTURER)),g' \ -e 's,%M,$(call sed_escape,$(VERSION_MANUFACTURER)),g' \
-e 's,%m,$(call sed_escape,$(VERSION_MANUFACTURER_URL)),g' \ -e 's,%m,$(call sed_escape,$(VERSION_MANUFACTURER_URL)),g' \
-e 's,%b,$(call sed_escape,$(VERSION_BUG_URL)),g' \ -e 's,%b,$(call sed_escape,$(VERSION_BUG_URL)),g' \
-e 's,%b,$(call sed_escape,$(VERSION_HOME_URL)),g' \
-e 's,%s,$(call sed_escape,$(VERSION_SUPPORT_URL)),g' \ -e 's,%s,$(call sed_escape,$(VERSION_SUPPORT_URL)),g' \
-e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \ -e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \
-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g' -e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g'

2
package/base-files/files/usr/lib/os-release
View file

@ -4,7 +4,7 @@ ID="%d"
ID_LIKE="lede openwrt" ID_LIKE="lede openwrt"
PRETTY_NAME="%D %V" PRETTY_NAME="%D %V"
VERSION_ID="%v" VERSION_ID="%v"
HOME_URL="%m" HOME_URL="%u"
BUG_URL="%b" BUG_URL="%b"
SUPPORT_URL="%s" SUPPORT_URL="%s"
BUILD_ID="%R" BUILD_ID="%R"

6
package/base-files/image-config.in
View file

@ -202,6 +202,12 @@ if VERSIONOPT
%P .. Product name or "Generic" %P .. Product name or "Generic"
%h .. Hardware revision or "v0" %h .. Hardware revision or "v0"
config VERSION_HOME_URL
string
prompt "Release Homepage"
help
This is the release version homepage
config VERSION_MANUFACTURER config VERSION_MANUFACTURER
string string
prompt "Manufacturer name" prompt "Manufacturer name"