diff options
| author | Daniel Dickinson <lede@daniel.thecshore.com> | 2016-05-18 09:07:30 -0400 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-06-24 13:52:53 +0200 |
| commit | f954f4337b85bd8d8ad6a589bc63edf48f777ee6 (patch) | |
| tree | 8158e3d8584d80f4960da16be581503c6ca07d54 /include | |
| parent | 59e98b27c93d282edb62fad756fd1c1e587c067f (diff) | |
| download | master-31e0f0ae-f954f4337b85bd8d8ad6a589bc63edf48f777ee6.tar.gz master-31e0f0ae-f954f4337b85bd8d8ad6a589bc63edf48f777ee6.tar.bz2 master-31e0f0ae-f954f4337b85bd8d8ad6a589bc63edf48f777ee6.zip | |
base-files: Add standard os-release file
/etc/os-release is the standard distribution release information
file, therefore add it (and image configuration options for
fields not previously present in LEDE). Once it is deemed
reasonable the non-standard openwrt_release, openwrt_version,
and device_info files could be removed (that is with this patch
we consider them deprecated in favour of the standard file).
Signed-off-by: Daniel Dickinson <lede@daniel.thecshore.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/version.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/version.mk b/include/version.mk index 88d6245fcd..b54eaab485 100644 --- a/include/version.mk +++ b/include/version.mk @@ -12,6 +12,7 @@ RELEASE:=Reboot PKG_CONFIG_DEPENDS += \ + CONFIG_VERSION_BUG_URL \ CONFIG_VERSION_NUMBER \ CONFIG_VERSION_NICK \ CONFIG_VERSION_REPO \ @@ -19,6 +20,7 @@ PKG_CONFIG_DEPENDS += \ CONFIG_VERSION_MANUFACTURER \ CONFIG_VERSION_MANUFACTURER_URL \ CONFIG_VERSION_PRODUCT \ + CONFIG_VERSION_SUPPORT_URL \ CONFIG_VERSION_HWREV \ qstrip_escape=$(subst ','\'',$(call qstrip,$(1))) @@ -48,6 +50,12 @@ VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE) VERSION_MANUFACTURER_URL:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL)) VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://www.lede-project.org/) +VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL)) +VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),https://www.lede-project.org/development.html) + +VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL)) +VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://lists.infradead.org/mailman/listinfo/lede-dev) + VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT)) VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic) @@ -94,6 +102,8 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ -e 's,%t,$(VERSION_TAINTS),g' \ -e 's,%M,$(VERSION_MANUFACTURER),g' \ -e 's,%m,$(VERSION_MANUFACTURER_URL),g' \ + -e 's,%b,$(VERSION_BUG_URL),g' \ + -e 's,%s,$(VERSION_SUPPORT_URL),g' \ -e 's,%P,$(VERSION_PRODUCT),g' \ -e 's,%h,$(VERSION_HWREV),g' |