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
master
John Crispin 9 years ago
parent af2429f104
commit ce9da6e6af
  1. 5
      include/version.mk
  2. 1
      package/base-files/files/etc/device_info
  3. 7
      package/base-files/image-config.in

@ -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'

@ -1,3 +1,4 @@
DEVICE_MANUFACTURER='%M'
DEVICE_MANUFACTURER_URL='%m'
DEVICE_PRODUCT='%P'
DEVICE_REVISION='%h'

@ -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"

Loading…
Cancel
Save