X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fbase-files%2Fimage-config.in;h=193ea08930a49f04623f578d80609c983a6b6bf7;hp=497b092d263055c9061067e0d4fff459681c9059;hb=3f26960a5c8db5b7cbdf120ddcd7feaadca51c8f;hpb=a43ae30e1bebe4d502ff1da4e715dd4cabcde83c diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 497b092d26..193ea08930 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -6,32 +6,32 @@ # menuconfig PREINITOPT - bool "Preinit configuration options" if IMAGEOPT - default n - help - These options are used to control the environment used to initialize - the system before running init (which typically mean /sbin/init which - switches to multiuser mode). + bool "Preinit configuration options" if IMAGEOPT + default n + help + These options are used to control the environment used to initialize + the system before running init (which typically mean /sbin/init which + switches to multiuser mode). config TARGET_PREINIT_SUPPRESS_STDERR - bool "Suppress stderr messages during preinit" if PREINITOPT - default y - help - Sends stderr to null during preinit. This is the default behaviour - 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. + bool "Suppress stderr messages during preinit" if PREINITOPT + default y + help + Sends stderr to null during preinit. This is the default behaviour + 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. config TARGET_PREINIT_TIMEOUT - int - prompt "Failsafe wait timeout" if PREINITOPT - default 2 - help + int + prompt "Failsafe wait timeout" if PREINITOPT + default 2 + help How long to wait for failsafe mode to be entered before continuing with a regular boot if failsafe not selected. - + config TARGET_PREINIT_SHOW_NETMSG bool prompt "Show all preinit network messages" if PREINITOPT @@ -42,7 +42,7 @@ config TARGET_PREINIT_SHOW_NETMSG if the architecture doesn't define an interface, and there is no 'Preinit network interface' defined, then no messages will be emitted, even if this is set. - + config TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG bool prompt "Suppress network message indicating failsafe" if PREINITOPT @@ -54,97 +54,99 @@ config TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG (via netmsg). config TARGET_PREINIT_IFNAME - string - prompt "Preinit network interface" if PREINITOPT - default "" - help + string + prompt "Preinit network interface" if PREINITOPT + default "" + help Interface for sending preinit messages to network, and any other default networking in failsafe or preinit. If empty uses $ifname (if defined in /etc/preinit.arch). config TARGET_PREINIT_IP - string - prompt "IP address for preinit network messages" if PREINITOPT - default "192.168.1.1" - help - IP address used to configure interface for preinit network - messages, including failsafe messages + string + prompt "IP address for preinit network messages" if PREINITOPT + default "192.168.1.1" + help + IP address used to configure interface for preinit network + messages, including failsafe messages config TARGET_PREINIT_NETMASK - string - prompt "Netmask for preinit network messages" if PREINITOPT - default "255.255.255.0" - help - Netmask used to configure interface for preinit network + string + prompt "Netmask for preinit network messages" if PREINITOPT + default "255.255.255.0" + help + Netmask used to configure interface for preinit network messages, including failsafes messages config TARGET_PREINIT_BROADCAST - string - prompt "Broadcast address for preinit network messages" if PREINITOPT - default "192.168.1.255" - help + string + prompt "Broadcast address for preinit network messages" if PREINITOPT + default "192.168.1.255" + help Broadcast address to which to send preinit network messages, as as failsafe messages menuconfig INITOPT - bool "Init configuration options" if IMAGEOPT - default n - help - These option choose the command that will run as the 'init' command - (that is which is responsible for controlling the system once preinit - transfers control to it) as well as some options controlling its - behaviour. Normally init is /sbin/init. - - config TARGET_INIT_PATH - string - prompt "PATH for regular boot" if INITOPT - default "/bin:/sbin:/usr/bin:/usr/sbin" - help - Default PATH used during normal operation - - config TARGET_INIT_ENV - string - prompt "Environment variables to set when starting init (start with none)" if INITOPT - default "" - help - Should be a space seperated list of variable assignments. These - variables will be present in the environment. Spaces may not be - present (including through expansion) even in a quoted string - (env doesn't understanding quoting). - - config TARGET_INIT_CMD - string - prompt "Init command" if INITOPT - default "/sbin/init" - help - The executable to run as the init process. Is 'exec'd by - preinit (which is the init that the kernel launches on boot). - - config TARGET_INIT_SUPPRESS_STDERR - bool - prompt "Suppress stderr messages of init" if INITOPT - default y + bool "Init configuration options" if IMAGEOPT + default n 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 - stderr is suppressed during preinit (which is the default). + These option choose the command that will run as the 'init' command + (that is which is responsible for controlling the system once preinit + transfers control to it) as well as some options controlling its + behaviour. Normally init is /sbin/init. + + config TARGET_INIT_PATH + string + prompt "PATH for regular boot" if INITOPT + default "/bin:/sbin:/usr/bin:/usr/sbin" + help + Default PATH used during normal operation + + config TARGET_INIT_ENV + string + prompt "Environment variables to set when starting init (start with none)" if INITOPT + default "" + help + Should be a space seperated list of variable assignments. These + variables will be present in the environment. Spaces may not be + present (including through expansion) even in a quoted string + (env doesn't understanding quoting). + + config TARGET_INIT_CMD + string + prompt "Init command" if INITOPT + default "/sbin/init" + help + The executable to run as the init process. Is 'exec'd by + preinit (which is the init that the kernel launches on boot). + + config TARGET_INIT_SUPPRESS_STDERR + bool + prompt "Suppress stderr messages of init" if INITOPT + default y + 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 + stderr is suppressed during preinit (which is the default). menuconfig VERSIONOPT - bool "Version configuration options" if IMAGEOPT - default n - help + bool "Version configuration options" if IMAGEOPT + default n + help These options allow to override the version information embedded in - the /etc/openwrt_version, /etc/openwrt_release, /etc/banner and + the /etc/openwrt_version, /etc/openwrt_release, /etc/banner and /etc/opkg.conf files. Usually there is no need to set these, but they're useful for release builds or custom OpenWrt redistributions that should carry custom version tags. +if VERSIONOPT + config VERSION_DIST string - prompt "Release distribution" if VERSIONOPT + prompt "Release distribution" default "OpenWrt" help This is the name of the release distribution. @@ -152,14 +154,14 @@ menuconfig VERSIONOPT config VERSION_NICK string - prompt "Release version nickname" if VERSIONOPT + 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" if VERSIONOPT + config VERSION_NUMBER + string + prompt "Release version number" help This is the release version number embedded in the image. If unspecified, it defaults to the svn or git-svn revision @@ -167,8 +169,8 @@ menuconfig VERSIONOPT config VERSION_REPO string - prompt "Release repository" if VERSIONOPT - default "http://downloads.openwrt.org/snapshots/trunk/%T/packages" + prompt "Release repository" + default "http://downloads.openwrt.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: @@ -183,3 +185,101 @@ menuconfig VERSIONOPT %d .. Distribution name or "openwrt", lowercase %T .. Target name %S .. Target/Subtarget name + %s .. Target/Subtarget name in dotted notation, e.g. "ar71xx" or "ar71xx.nand" + %t .. Build taint flags, e.g. "no-all busybox" + %M .. Manufacturer name or "OpenWrt" + %P .. Product name or "Generic" + %h .. Hardware revision or "v0" + + config VERSION_MANUFACTURER + string + prompt "Manufacturer name" + help + This is the manufacturer name embedded in /etc/device_info + Useful for OEMs building OpenWrt based firmware + + config VERSION_PRODUCT + string + prompt "Product name" + help + This is the product name embedded in /etc/device_info + Useful for OEMs building OpenWrt based firmware + + config VERSION_HWREV + string + prompt "Hardware revision" + 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 + + +menuconfig PER_FEED_REPO + bool "Separate feed repositories" if IMAGEOPT + default y + help + If set, a separate repository is generated within bin/*/packages/ + for the core packages and each enabled feed. + + config PER_FEED_REPO_ADD_DISABLED + bool "Add available but not enabled feeds to opkg.conf" + default y + depends on PER_FEED_REPO + help + Add not installed or disabled feeds from feeds.conf to opkg.conf. + + config PER_FEED_REPO_ADD_COMMENTED + bool "Comment out not enabled feeds" + default y + 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.