hostapd: fix maclist processing with netifd

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

-               default "OpenWrt"
+               default "OpenWrt" if VERSIONOPT

                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.


@@ -168,7 +168,7 @@ menuconfig VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository" if VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository" if VERSIONOPT

-               default "http://downloads.openwrt.org/snapshots/trunk/%T/packages"
+               default "http://downloads.openwrt.org/snapshots/trunk/%T/packages" if VERSIONOPT

                help
                        This is the repository address embedded in the image, it defaults
                        to the trunk snapshot repo; the url may contain the following placeholders:
                help
                        This is the repository address embedded in the image, it defaults
                        to the trunk snapshot repo; the url may contain the following placeholders:


@@ -183,3 +183,41 @@ menuconfig VERSIONOPT
                         %d .. Distribution name or "openwrt", lowercase
                         %T .. Target name
                         %S .. Target/Subtarget name
                         %d .. Distribution name or "openwrt", lowercase
                         %T .. Target name
                         %S .. Target/Subtarget name

+
+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.