base-files: add URL option for OEM manufacturer info

This URL can be embedded e.g. within UPnP announcements where a link
to the manufacturer's homepage is desired.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
SVN-Revision: 47135

diff --git a/include/version.mk b/include/version.mk
index 69141ff696a1b53eb8ce5839ba5e6296ec1bb65c..4bce0965ca2389753bb83b242c0d942f96b2d5f5 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -14,6 +14,7 @@ PKG_CONFIG_DEPENDS += \
        CONFIG_VERSION_REPO \
        CONFIG_VERSION_DIST \
        CONFIG_VERSION_MANUFACTURER \
+       CONFIG_VERSION_MANUFACTURER_URL \
        CONFIG_VERSION_PRODUCT \
        CONFIG_VERSION_HWREV \
 
@@ -38,6 +39,9 @@ VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
 VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
 VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt)
 
+VERSION_MANUFACTURER_URL:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL))
+VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://www.openwrt.org/)
+
 VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
 VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
 
@@ -82,6 +86,7 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
        -e 's,%S,$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic),g' \
        -e 's,%t,$(VERSION_TAINTS),g' \
        -e 's,%M,$(VERSION_MANUFACTURER),g' \
+       -e 's,%m,$(VERSION_MANUFACTURER_URL),g' \
        -e 's,%P,$(VERSION_PRODUCT),g' \
        -e 's,%h,$(VERSION_HWREV),g'
 

diff --git a/package/base-files/files/etc/device_info b/package/base-files/files/etc/device_info
index 2962cd7fd5f069d1866f6235bb61f85a599a789d..4045e9e027de50a9ff8f84b2177c2b6e9d00a396 100644 (file)
--- a/package/base-files/files/etc/device_info
+++ b/package/base-files/files/etc/device_info
@@ -1,3 +1,4 @@
 DEVICE_MANUFACTURER='%M'
+DEVICE_MANUFACTURER_URL='%m'
 DEVICE_PRODUCT='%P'
 DEVICE_REVISION='%h'

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index fd0ead623650a6de1b07a18fab77209f98b56e54..c1c0924f2049672019ca5128540c3c053d976279 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -197,6 +197,13 @@ if VERSIONOPT
                        This is the manufacturer name embedded in /etc/device_info
                        Useful for OEMs building OpenWrt based firmware
 
+       config VERSION_MANUFACTURER_URL
+               string
+               prompt "Manufacturer URL"
+               help
+                       This is an URL to the manufacturer's website embedded in /etc/device_info
+                       Useful for OEMs building OpenWrt based firmware
+
        config VERSION_PRODUCT
                string
                prompt "Product name"