base-files: fix duplicate wifi radio sections when using phy renaming

[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 b43d7c78cd115169df6503560d77ccb43958c3fb..2de2130b8490d9f18fa0b0189fa1ed7432e9528a 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -5,6 +5,13 @@
 # See /LICENSE for more information.
 #
 
 # See /LICENSE for more information.
 #
 

+config TARGET_DEFAULT_LAN_IP_FROM_PREINIT
+       bool "Use preinit IP configuration as default LAN IP" if IMAGEOPT
+       default n
+       help
+               Enabling this will set the default LAN IP address and netmask
+               to the preinit values set in the image config.
+

 menuconfig PREINITOPT
        bool "Preinit configuration options" if IMAGEOPT
        default n
 menuconfig PREINITOPT
        bool "Preinit configuration options" if IMAGEOPT
        default n


@@ -119,7 +126,7 @@ menuconfig INITOPT
                prompt "Environment variables to set when starting init (start with none)" if INITOPT
                default ""
                help
                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
+                       Should be a space separated 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).
                        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).


@@ -158,18 +165,11 @@ if VERSIONOPT
        config VERSION_DIST
                string
                prompt "Release distribution"
        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.
 
                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"
        config VERSION_NUMBER
                string
                prompt "Release version number"


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

-               default "http://downloads.lede-project.org/snapshots"
+               default "https://downloads.openwrt.org/snapshots"

                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:


@@ -199,18 +199,22 @@ 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
                         %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"
                         %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"
 
                         %P .. Product name or "Generic"
                         %h .. Hardware revision or "v0"
 

+       config VERSION_HOME_URL
+               string
+               prompt "Release Homepage"
+               help
+                       This is the release version homepage
+

        config VERSION_MANUFACTURER
                string
                prompt "Manufacturer name"
        config VERSION_MANUFACTURER
                string
                prompt "Manufacturer name"


@@ -277,18 +281,4 @@ menuconfig PER_FEED_REPO
                If set, a separate repository is generated within bin/*/packages/
                for the core packages and each enabled feed.
 
                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"
 source "tmp/.config-feeds.in"