X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fmkresin.git;a=blobdiff_plain;f=package%2Fbase-files%2Fimage-config.in;h=5f84d115e53f7a02f8944e0fb19b5eba7b2157b6;hp=c679a5b33a9f4fe8d3390458cf5128e4847c370a;hb=fa69553900516944fc43cf7b377105ea1f6d3db0;hpb=4f73613c2698346102741b27a8524076eb66c20c

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index c679a5b33a..5f84d115e5 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -18,11 +18,11 @@ config TARGET_PREINIT_SUPPRESS_STDERR
 	default y
 	help
 		Sends stderr to null during preinit.  This is the default behaviour
-		in previous versions of OpenWRT.  This also prevents init process
+		in previous versions of OpenWrt.  This also prevents init process
 		itself from displaying stderr, however processes launched by init
 		in multiuser through inittab will use the current terminal (e.g.
 		the ash shell launched by inittab will display stderr).  That's
-		the same behaviour as seen in previous version of OpenWRT.
+		the same behaviour as seen in previous version of OpenWrt.
 
 config TARGET_PREINIT_TIMEOUT
 	int
@@ -99,7 +99,7 @@ menuconfig INITOPT
 	config TARGET_INIT_PATH
 		string
 		prompt "PATH for regular boot" if INITOPT
-		default "/bin:/sbin:/usr/bin:/usr/sbin"
+		default "/usr/sbin:/usr/bin:/sbin:/bin"
 		help
 			Default PATH used during normal operation
 
@@ -128,7 +128,7 @@ menuconfig INITOPT
 		help
 			Prevents showing stderr messages for init command if not already
 			suppressed during preinit.  This is the default behaviour in
-			previous versions of OpenWRT.  Removing this does nothing if
+			previous versions of OpenWrt.  Removing this does nothing if
 			stderr is suppressed during preinit (which is the default).
 
 
@@ -147,7 +147,7 @@ if VERSIONOPT
 	config VERSION_DIST
 		string
 		prompt "Release distribution"
-		default "OpenWrt"
+		default "Lede"
 		help
 			This is the name of the release distribution.
 			If unspecified, it defaults to OpenWrt.
@@ -170,21 +170,25 @@ if VERSIONOPT
 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "http://downloads.openwrt.org/snapshots/trunk/%T/packages"
+		default "http://downloads.lede-project.org/snapshots/trunk/%S/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:
 			 %R .. Revision number
 			 %V .. Release version or revision number, uppercase
 			 %v .. Release version or revision number, lowercase
-			 %C .. Release version or "Bleeding Edge", uppercase
-			 %c .. Release version or "bleeding_edge", lowercase
+			 %C .. Release version or "HEAD", uppercase
+			 %c .. Release version or "head", lowercase
 			 %N .. Release name, uppercase
 			 %n .. Release name, lowercase
-			 %D .. Distribution name or "OpenWrt", uppercase
-			 %d .. Distribution name or "openwrt", lowercase
+			 %D .. Distribution name or "Lede", uppercase
+			 %d .. Distribution name or "lede", lowercase
 			 %T .. Target name
 			 %S .. Target/Subtarget name
+			 %t .. Build taint flags, e.g. "no-all busybox"
+			 %M .. Manufacturer name or "Lede"
+			 %P .. Product name or "Generic"
+			 %h .. Hardware revision or "v0"
 
 	config VERSION_MANUFACTURER
 		string
@@ -193,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"
@@ -206,6 +217,14 @@ if VERSIONOPT
 		help
 			This is the hardware revision string embedded in /etc/device_info
 			Useful for OEMs building OpenWrt based firmware
+
+	config VERSION_FILENAMES
+		bool
+		prompt "Version number in filenames"
+		default y
+		help
+			Enable this to include the version number in firmware image, SDK-
+			and Image Builder archive file names
 endif