build: add buildbot specific config option for setting defaults

[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 a8d82d3e0cfb9560d227e29a4671a8ecc9f68b13..87d2ac6c5462f915b12607c0e0c46f349f948180 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -158,7 +158,7 @@ if VERSIONOPT
        config VERSION_DIST
                string
                prompt "Release distribution"
        config VERSION_DIST
                string
                prompt "Release distribution"

-               default "Lede"
+               default "LEDE"

                help
                        This is the name of the release distribution.
                        If unspecified, it defaults to OpenWrt.
                help
                        This is the name of the release distribution.
                        If unspecified, it defaults to OpenWrt.


@@ -286,48 +286,9 @@ menuconfig PER_FEED_REPO
 
        config PER_FEED_REPO_ADD_COMMENTED
                bool "Comment out not enabled feeds"
 
        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"
                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.