diff options
| author | John Crispin <john@openwrt.org> | 2015-10-05 10:28:53 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-10-05 10:28:53 +0000 |
| commit | ce9da6e6afbb2287fa60bdd1772527a405944808 (patch) | |
| tree | a904d92cdac088d595bb5ae8088068128fe9caeb | |
| parent | af2429f1043ed2a1f974205ac0676eceb3d17909 (diff) | |
| download | master-31e0f0ae-ce9da6e6afbb2287fa60bdd1772527a405944808.tar.gz master-31e0f0ae-ce9da6e6afbb2287fa60bdd1772527a405944808.tar.bz2 master-31e0f0ae-ce9da6e6afbb2287fa60bdd1772527a405944808.zip | |
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
| -rw-r--r-- | include/version.mk | 5 | ||||
| -rw-r--r-- | package/base-files/files/etc/device_info | 1 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 7 |
3 files changed, 13 insertions, 0 deletions
diff --git a/include/version.mk b/include/version.mk index 69141ff696..4bce0965ca 100644 --- 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 2962cd7fd5..4045e9e027 100644 --- 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 fd0ead6236..c1c0924f20 100644 --- 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" |