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>

diff --git a/include/version.mk b/include/version.mk
index 2b3723bc6900d96fd16bf7d6379dba603e182640..4f6e50cf708e8c9ed790150dc23a43f40a7ce52e 100644 (file)
--- 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 82ade5940639bb5201757be29b4af81a1b9d809d..121041256a3b3aa989311169143fda756128c8ff 100644 (file)
--- 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 dbbd60b1527cdb77d3ffd221b33ea09f5d60fb9e..ffa12cd3ecc4df3c95c2333d975d406a2c030cc0 100644 (file)
--- 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"