diff options
| author | Mathias Kresin <dev@kresin.me> | 2017-11-02 08:21:57 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-06-27 08:40:34 +0200 |
| commit | 52a9edb1bfaf51c250a33303beacba95dd1dbc05 (patch) | |
| tree | 4055047f5a351367729c26959be3d5f219063c58 | |
| parent | 75ab064d2b38e70746af1718ed7cdbafb906249e (diff) | |
| download | upstream-52a9edb1bfaf51c250a33303beacba95dd1dbc05.tar.gz upstream-52a9edb1bfaf51c250a33303beacba95dd1dbc05.tar.bz2 upstream-52a9edb1bfaf51c250a33303beacba95dd1dbc05.zip | |
base-files: add menuconfig option for HOME_URL
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>
| -rw-r--r-- | include/version.mk | 5 | ||||
| -rw-r--r-- | package/base-files/files/usr/lib/os-release | 2 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/include/version.mk b/include/version.mk index 2b3723bc69..4f6e50cf70 100644 --- a/include/version.mk +++ b/include/version.mk @@ -11,6 +11,7 @@ # SOURCE_DATE_EPOCH:=x PKG_CONFIG_DEPENDS += \ + CONFIG_VERSION_HOME_URL \ CONFIG_VERSION_BUG_URL \ CONFIG_VERSION_NUMBER \ 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:=$(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:=$(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_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,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \ -e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g' diff --git a/package/base-files/files/usr/lib/os-release b/package/base-files/files/usr/lib/os-release index 82ade59406..121041256a 100644 --- a/package/base-files/files/usr/lib/os-release +++ b/package/base-files/files/usr/lib/os-release @@ -4,7 +4,7 @@ ID="%d" ID_LIKE="lede openwrt" PRETTY_NAME="%D %V" VERSION_ID="%v" -HOME_URL="%m" +HOME_URL="%u" BUG_URL="%b" SUPPORT_URL="%s" BUILD_ID="%R" diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index dbbd60b152..ffa12cd3ec 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -202,6 +202,12 @@ if VERSIONOPT %P .. Product name or "Generic" %h .. Hardware revision or "v0" + config VERSION_HOME_URL + string + prompt "Release Homepage" + help + This is the release version homepage + config VERSION_MANUFACTURER string prompt "Manufacturer name" |