kernel: video: add fbcon support

[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 66134aad3c546476effb9fb222f2c38d6942be01..3dfbedcfe590f15a0faa7766eb4af03429ec1534 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 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.
+               the same behaviour as seen in previous version of OpenWrt.
 
 config TARGET_PREINIT_TIMEOUT
        int
@@ -99,7 +99,7 @@ menuconfig INITOPT
        config TARGET_INIT_PATH
                string
                prompt "PATH for regular boot" if INITOPT
-               default "/bin:/sbin:/usr/bin:/usr/sbin"
+               default "/usr/sbin:/usr/bin:/sbin:/bin"
                help
                        Default PATH used during normal operation
 
@@ -128,7 +128,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 OpenWrt.  Removing this does nothing if
                        stderr is suppressed during preinit (which is the default).
 
 
@@ -170,7 +170,7 @@ if VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository"
-               default "http://downloads.openwrt.org/snapshots/trunk/%T/packages"
+               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:
@@ -185,6 +185,10 @@ if VERSIONOPT
                         %d .. Distribution name or "openwrt", lowercase
                         %T .. Target name
                         %S .. Target/Subtarget name
+                        %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
@@ -193,6 +197,13 @@ if VERSIONOPT
                        This is the manufacturer name embedded in /etc/device_info
                        Useful for OEMs building OpenWrt based firmware
 
+       config VERSION_MANUFACTURER_URL
+               string
+               prompt "Manufacturer URL"
+               help
+                       This is an URL to the manufacturer's website embedded in /etc/device_info
+                       Useful for OEMs building OpenWrt based firmware
+
        config VERSION_PRODUCT
                string
                prompt "Product name"
@@ -206,8 +217,41 @@ if VERSIONOPT
                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