summaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-07-29 13:30:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-07-29 13:30:12 +0000
commitdbb77e39a07a86b18ecc4ce27bb2841e0a099c9d (patch)
treed7dec07e4fdb62571f0201be644f38483d3fc1ad /package/base-files
parent8d3f839da7387bcd14f809e80f7da20d0a5e6d29 (diff)
downloadmaster-31e0f0ae-dbb77e39a07a86b18ecc4ce27bb2841e0a099c9d.tar.gz
master-31e0f0ae-dbb77e39a07a86b18ecc4ce27bb2841e0a099c9d.tar.bz2
master-31e0f0ae-dbb77e39a07a86b18ecc4ce27bb2841e0a099c9d.zip
base-files: add extra version configuration options for OEM manufacturer info
Creates /etc/device_info which will be used to fill in information for WPS and other protocols that need manufacturer/device information This helps with creating OpenWrt firmware for OEM or rebranded devices. Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 41884
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile3
-rw-r--r--package/base-files/files/etc/device_info3
-rw-r--r--package/base-files/image-config.in36
3 files changed, 35 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5faa439454..76a4dabe0e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -111,7 +111,8 @@ define Package/base-files/install
$(VERSION_SED) \
$(1)/etc/banner \
$(1)/etc/openwrt_version \
- $(1)/etc/openwrt_release
+ $(1)/etc/openwrt_release \
+ $(1)/etc/device_info
mkdir -p $(1)/CONTROL
mkdir -p $(1)/dev
diff --git a/package/base-files/files/etc/device_info b/package/base-files/files/etc/device_info
new file mode 100644
index 0000000000..da2c4a3b9d
--- /dev/null
+++ b/package/base-files/files/etc/device_info
@@ -0,0 +1,3 @@
+DEVICE_MANUFACTURER="%M"
+DEVICE_PRODUCT="%P"
+DEVICE_REVISION="%h"
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index a9eb78c4f9..66134aad3c 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -142,24 +142,26 @@ menuconfig VERSIONOPT
they're useful for release builds or custom OpenWrt redistributions
that should carry custom version tags.
+if VERSIONOPT
+
config VERSION_DIST
string
- prompt "Release distribution" if VERSIONOPT
- default "OpenWrt" if VERSIONOPT
+ prompt "Release distribution"
+ default "OpenWrt"
help
This is the name of the release distribution.
If unspecified, it defaults to OpenWrt.
config VERSION_NICK
string
- prompt "Release version nickname" if VERSIONOPT
+ prompt "Release version nickname"
help
This is the release codename embedded in the image.
If unspecified, it defaults to the name of source branch.
config VERSION_NUMBER
string
- prompt "Release version number" if VERSIONOPT
+ prompt "Release version number"
help
This is the release version number embedded in the image.
If unspecified, it defaults to the svn or git-svn revision
@@ -167,8 +169,8 @@ menuconfig VERSIONOPT
config VERSION_REPO
string
- prompt "Release repository" if VERSIONOPT
- default "http://downloads.openwrt.org/snapshots/trunk/%T/packages" if VERSIONOPT
+ prompt "Release repository"
+ default "http://downloads.openwrt.org/snapshots/trunk/%T/packages"
help
This is the repository address embedded in the image, it defaults
to the trunk snapshot repo; the url may contain the following placeholders:
@@ -184,6 +186,28 @@ menuconfig VERSIONOPT
%T .. Target name
%S .. Target/Subtarget name
+ config VERSION_MANUFACTURER
+ string
+ prompt "Manufacturer name"
+ help
+ This is the manufacturer name embedded in /etc/device_info
+ Useful for OEMs building OpenWrt based firmware
+
+ config VERSION_PRODUCT
+ string
+ prompt "Product name"
+ help
+ This is the product name embedded in /etc/device_info
+ Useful for OEMs building OpenWrt based firmware
+
+ config VERSION_HWREV
+ string
+ prompt "Hardware revision"
+ help
+ This is the hardware revision string embedded in /etc/device_info
+ Useful for OEMs building OpenWrt based firmware
+endif
+
menuconfig SMIMEOPT
bool "Package signing options" if IMAGEOPT
default n