diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-01-22 20:45:03 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-05 00:22:30 +0000 |
commit | 077d32eb5281be65fa5656c1faa32a3881edf2fd (patch) | |
tree | 2a3e190b338b4ad54afef9c26f6027501cc0c427 | |
parent | 6ae662acdc145c541c3206717876beca1e563095 (diff) | |
download | poky-077d32eb5281be65fa5656c1faa32a3881edf2fd.tar.gz |
local.conf.sample: Remove trailing whitespaces
(From meta-yocto rev: 93c7a1a72cb485fabd5f247e6245ec44b4cb26bf)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-yocto/conf/local.conf.sample | 25 | ||||
-rw-r--r-- | meta-yocto/conf/local.conf.sample.extended | 10 |
2 files changed, 17 insertions, 18 deletions
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample index 8297a2dd4e..c0a9ac2a71 100644 --- a/meta-yocto/conf/local.conf.sample +++ b/meta-yocto/conf/local.conf.sample | |||
@@ -2,11 +2,11 @@ | |||
2 | # This file is your local configuration file and is where all local user settings | 2 | # This file is your local configuration file and is where all local user settings |
3 | # are placed. The comments in this file give some guide to the options a new user | 3 | # are placed. The comments in this file give some guide to the options a new user |
4 | # to the system might want to change but pretty much any configuration option can | 4 | # to the system might want to change but pretty much any configuration option can |
5 | # be set in this file. More adventurous users can look at local.conf.extended | 5 | # be set in this file. More adventurous users can look at local.conf.extended |
6 | # which contains other examples of configuration which can be placed in this file | 6 | # which contains other examples of configuration which can be placed in this file |
7 | # but new users likely won't need any of them initially. | 7 | # but new users likely won't need any of them initially. |
8 | # | 8 | # |
9 | # Lines starting with the '#' character are commented out and in some cases the | 9 | # Lines starting with the '#' character are commented out and in some cases the |
10 | # default values are provided as comments to show people example syntax. Enabling | 10 | # default values are provided as comments to show people example syntax. Enabling |
11 | # the option is a question of removing the # character and making any change to the | 11 | # the option is a question of removing the # character and making any change to the |
12 | # variable as required. | 12 | # variable as required. |
@@ -96,8 +96,8 @@ DISTRO ?= "poky" | |||
96 | # | 96 | # |
97 | # Package Management configuration | 97 | # Package Management configuration |
98 | # | 98 | # |
99 | # This variable lists which packaging formats to enable. Multiple package backends | 99 | # This variable lists which packaging formats to enable. Multiple package backends |
100 | # can be enabled at once and the first item listed in the variable will be used | 100 | # can be enabled at once and the first item listed in the variable will be used |
101 | # to generate the root filesystems. | 101 | # to generate the root filesystems. |
102 | # Options are: | 102 | # Options are: |
103 | # - 'package_deb' for debian style deb files | 103 | # - 'package_deb' for debian style deb files |
@@ -111,7 +111,7 @@ PACKAGE_CLASSES ?= "package_rpm" | |||
111 | # SDK/ADT target architecture | 111 | # SDK/ADT target architecture |
112 | # | 112 | # |
113 | # This variable specifies the architecture to build SDK/ADT items for and means | 113 | # This variable specifies the architecture to build SDK/ADT items for and means |
114 | # you can build the SDK packages for architectures other than the machine you are | 114 | # you can build the SDK packages for architectures other than the machine you are |
115 | # running the build on (i.e. building i686 packages on an x86_64 host). | 115 | # running the build on (i.e. building i686 packages on an x86_64 host). |
116 | # Supported values are i686 and x86_64 | 116 | # Supported values are i686 and x86_64 |
117 | #SDKMACHINE ?= "i686" | 117 | #SDKMACHINE ?= "i686" |
@@ -119,7 +119,7 @@ PACKAGE_CLASSES ?= "package_rpm" | |||
119 | # | 119 | # |
120 | # Extra image configuration defaults | 120 | # Extra image configuration defaults |
121 | # | 121 | # |
122 | # The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated | 122 | # The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated |
123 | # images. Some of these options are added to certain image types automatically. The | 123 | # images. Some of these options are added to certain image types automatically. The |
124 | # variable can contain the following options: | 124 | # variable can contain the following options: |
125 | # "dbg-pkgs" - add -dbg packages for all installed packages | 125 | # "dbg-pkgs" - add -dbg packages for all installed packages |
@@ -144,7 +144,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" | |||
144 | # Additional image features | 144 | # Additional image features |
145 | # | 145 | # |
146 | # The following is a list of additional classes to use when building images which | 146 | # The following is a list of additional classes to use when building images which |
147 | # enable extra features. Some available options which can be included in this variable | 147 | # enable extra features. Some available options which can be included in this variable |
148 | # are: | 148 | # are: |
149 | # - 'buildstats' collect build statistics | 149 | # - 'buildstats' collect build statistics |
150 | # - 'image-mklibs' to reduce shared library files size for an image | 150 | # - 'image-mklibs' to reduce shared library files size for an image |
@@ -165,8 +165,8 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink" | |||
165 | # | 165 | # |
166 | # Interactive shell configuration | 166 | # Interactive shell configuration |
167 | # | 167 | # |
168 | # Under certain circumstances the system may need input from you and to do this it | 168 | # Under certain circumstances the system may need input from you and to do this it |
169 | # can launch an interactive shell. It needs to do this since the build is | 169 | # can launch an interactive shell. It needs to do this since the build is |
170 | # multithreaded and needs to be able to handle the case where more than one parallel | 170 | # multithreaded and needs to be able to handle the case where more than one parallel |
171 | # process may require the user's attention. The default is iterate over the available | 171 | # process may require the user's attention. The default is iterate over the available |
172 | # terminal types to find one that works. | 172 | # terminal types to find one that works. |
@@ -204,13 +204,13 @@ BB_DISKMON_DIRS = "\ | |||
204 | # | 204 | # |
205 | # Shared-state files from other locations | 205 | # Shared-state files from other locations |
206 | # | 206 | # |
207 | # As mentioned above, shared state files are prebuilt cache data objects which can | 207 | # As mentioned above, shared state files are prebuilt cache data objects which can |
208 | # used to accelerate build time. This variable can be used to configure the system | 208 | # used to accelerate build time. This variable can be used to configure the system |
209 | # to search other mirror locations for these objects before it builds the data itself. | 209 | # to search other mirror locations for these objects before it builds the data itself. |
210 | # | 210 | # |
211 | # This can be a filesystem directory, or a remote url such as http or ftp. These | 211 | # This can be a filesystem directory, or a remote url such as http or ftp. These |
212 | # would contain the sstate-cache results from previous builds (possibly from other | 212 | # would contain the sstate-cache results from previous builds (possibly from other |
213 | # machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the | 213 | # machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the |
214 | # cache locations to check for the shared objects. | 214 | # cache locations to check for the shared objects. |
215 | # NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH | 215 | # NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH |
216 | # at the end as shown in the examples below. This will be substituted with the | 216 | # at the end as shown in the examples below. This will be substituted with the |
@@ -231,7 +231,6 @@ PACKAGECONFIG_append_pn-qemu-native = " sdl" | |||
231 | PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" | 231 | PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" |
232 | #ASSUME_PROVIDED += "libsdl-native" | 232 | #ASSUME_PROVIDED += "libsdl-native" |
233 | 233 | ||
234 | |||
235 | # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to | 234 | # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to |
236 | # track the version of this file when it was generated. This can safely be ignored if | 235 | # track the version of this file when it was generated. This can safely be ignored if |
237 | # this doesn't mean anything to you. | 236 | # this doesn't mean anything to you. |
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended index 521cdcbb78..4e5dc8f38f 100644 --- a/meta-yocto/conf/local.conf.sample.extended +++ b/meta-yocto/conf/local.conf.sample.extended | |||
@@ -57,7 +57,7 @@ | |||
57 | 57 | ||
58 | # The following are used to control options related to debugging. | 58 | # The following are used to control options related to debugging. |
59 | # | 59 | # |
60 | # Uncomment this to change the optimization to make debugging easer, at the | 60 | # Uncomment this to change the optimization to make debugging easer, at the |
61 | # possible cost of performance. | 61 | # possible cost of performance. |
62 | # DEBUG_BUILD = "1" | 62 | # DEBUG_BUILD = "1" |
63 | # | 63 | # |
@@ -131,9 +131,9 @@ | |||
131 | # build both the 32-bit and 64-bit wrapper libraries on a 64-bit build system. | 131 | # build both the 32-bit and 64-bit wrapper libraries on a 64-bit build system. |
132 | # | 132 | # |
133 | # Pseudo will attempt to determine if a 32-bit wrapper is necessary, but | 133 | # Pseudo will attempt to determine if a 32-bit wrapper is necessary, but |
134 | # it doesn't always guess properly. If you have 32-bit executables on | 134 | # it doesn't always guess properly. If you have 32-bit executables on |
135 | # your 64-bit build system, you likely want to set this to "0", | 135 | # your 64-bit build system, you likely want to set this to "0", |
136 | # otherwise you could end up with incorrect file attributes on the | 136 | # otherwise you could end up with incorrect file attributes on the |
137 | # target filesystem. | 137 | # target filesystem. |
138 | # | 138 | # |
139 | # Default is to not build 32 bit libs on 64 bit systems, uncomment this | 139 | # Default is to not build 32 bit libs on 64 bit systems, uncomment this |
@@ -270,7 +270,7 @@ | |||
270 | 270 | ||
271 | # | 271 | # |
272 | # GCC/LD FLAGS to enable more secure code generation | 272 | # GCC/LD FLAGS to enable more secure code generation |
273 | # | 273 | # |
274 | # By including the security_flags include file you enable flags | 274 | # By including the security_flags include file you enable flags |
275 | # to the compiler and linker that cause them to generate more secure | 275 | # to the compiler and linker that cause them to generate more secure |
276 | # code, this is enabled by default in the poky-lsb distro. | 276 | # code, this is enabled by default in the poky-lsb distro. |