mt76: update to the latest version

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

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 448fc1cd9ff269f32e058dbb8995bfc109df430d..dbbd60b1527cdb77d3ffd221b33ea09f5d60fb9e 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -158,18 +158,11 @@ if VERSIONOPT
        config VERSION_DIST
                string
                prompt "Release distribution"
-               default "LEDE"
+               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"
-               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 "Lede", uppercase
-                        %d .. Distribution name or "lede", 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 "Lede"
+                        %M .. Manufacturer name or "OpenWrt"
                         %P .. Product name or "Generic"
                         %h .. Hardware revision or "v0"
 
@@ -286,48 +277,9 @@ menuconfig PER_FEED_REPO
 
        config PER_FEED_REPO_ADD_COMMENTED
                bool "Comment out not enabled feeds"
-               default y
+               default !BUILDBOT
                depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED
                help
                  Add not enabled feeds as commented out source lines to opkg.conf.
 
 source "tmp/.config-feeds.in"
-
-
-menuconfig SMIMEOPT
-       bool "Package signing options" if IMAGEOPT
-        default n
-       help
-               These options configure the signing key and certificate to
-               be used for signing and verifying packages.
-
-       config OPKGSMIME_CERT
-               string
-               prompt "Path to certificate (PEM certificate format)" if SMIMEOPT
-               help
-                 Path to the certificate to use for signature verification
-
-       config OPKGSMIME_KEY
-               string
-               prompt "Path to signing key (PEM private key format)" if SMIMEOPT
-               help
-                 Path to the key to use for signing packages
-
-       config OPKGSMIME_PASSPHRASE
-               bool
-               default y
-               prompt "Wait for a passphrase when signing packages?" if SMIMEOPT
-               help
-                 If this value is set, then the build will pause and request a passphrase
-                  from the command line when signing packages. This SHOULD NOT be used with
-                  automatic builds. If this value is not set, a file can be specified from
-                  which the passphrase will be read.
-
-       config OPKGSMIME_PASSFILE
-               string
-               prompt "Path to a file containing the passphrase" if SMIMEOPT
-                depends on !OPKGSMIME_PASSPHRASE
-               help
-                 Path to a file containing the passphrase for the signing key.
-                  If the signing key is not encrypted and does not require a passphrase,
-                  this option may be left blank.