v1.5 branch refresh based upon upstream master @ c8677ca89e53e3be7988d54280fce166cc894a7e

[librecmc/librecmc.git] / package / base-files / image-config.in

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 7724f7b5580454054446ce90e94413f5504c17b3..83a2e89f74384632ddd1b9f4bf06d524eb1436c4 100644 (file)
--- 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 libreCMC.  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 libreCMC.
 
 config TARGET_PREINIT_DISABLE_FAILSAFE
        bool
@@ -139,7 +139,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 libreCMC.  Removing this does nothing if
                        stderr is suppressed during preinit (which is the default).
 
 
@@ -163,13 +163,6 @@ if VERSIONOPT
                        This is the name of the release distribution.
                        If unspecified, it defaults to OpenWrt.
 
-       config VERSION_NICK
-               string
-               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"
@@ -199,15 +192,13 @@ if VERSIONOPT
                         %v .. Configured release version number or "snapshot", lowercase
                         %C .. Configured release revision code or value of %R, uppercase
                         %c .. Configured release revision code or value of %R, lowercase
-                        %N .. Release name, uppercase
-                        %n .. Release name, lowercase
-                        %D .. Distribution name or "libreCMC", uppercase
-                        %d .. Distribution name or "librecmc", lowercase
+                        %D .. Distribution name or "OpenWrt", uppercase
+                        %d .. Distribution name or "openwrt", lowercase
                         %T .. Target name
                         %S .. Target/Subtarget name
                         %A .. Package architecture
                         %t .. Build taint flags, e.g. "no-all busybox"
-                        %M .. Manufacturer name or "libreCMC"
+                        %M .. Manufacturer name or "OpenWrt"
                         %P .. Product name or "Generic"
                         %h .. Hardware revision or "v0"