Author: blogic Date: 2015-10-05 12:28:53 +0200 (Mon, 05 Oct 2015) New Revision: 47135
Modified: trunk/include/version.mk trunk/package/base-files/files/etc/device_info trunk/package/base-files/image-config.in Log: 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 <[email protected]> Modified: trunk/include/version.mk =================================================================== --- trunk/include/version.mk 2015-10-05 10:28:47 UTC (rev 47134) +++ trunk/include/version.mk 2015-10-05 10:28:53 UTC (rev 47135) @@ -14,6 +14,7 @@ CONFIG_VERSION_REPO \ CONFIG_VERSION_DIST \ CONFIG_VERSION_MANUFACTURER \ + CONFIG_VERSION_MANUFACTURER_URL \ CONFIG_VERSION_PRODUCT \ CONFIG_VERSION_HWREV \ @@ -38,6 +39,9 @@ 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 @@ -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' Modified: trunk/package/base-files/files/etc/device_info =================================================================== --- trunk/package/base-files/files/etc/device_info 2015-10-05 10:28:47 UTC (rev 47134) +++ trunk/package/base-files/files/etc/device_info 2015-10-05 10:28:53 UTC (rev 47135) @@ -1,3 +1,4 @@ DEVICE_MANUFACTURER='%M' +DEVICE_MANUFACTURER_URL='%m' DEVICE_PRODUCT='%P' DEVICE_REVISION='%h' Modified: trunk/package/base-files/image-config.in =================================================================== --- trunk/package/base-files/image-config.in 2015-10-05 10:28:47 UTC (rev 47134) +++ trunk/package/base-files/image-config.in 2015-10-05 10:28:53 UTC (rev 47135) @@ -197,6 +197,13 @@ 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" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
