From 077d32eb5281be65fa5656c1faa32a3881edf2fd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 22 Jan 2016 20:45:03 +0000 Subject: local.conf.sample: Remove trailing whitespaces (From meta-yocto rev: 93c7a1a72cb485fabd5f247e6245ec44b4cb26bf) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta-yocto/conf/local.conf.sample | 25 ++++++++++++------------- meta-yocto/conf/local.conf.sample.extended | 10 +++++----- 2 files changed, 17 insertions(+), 18 deletions(-) (limited to 'meta-yocto') 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 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended +# be set in this file. More adventurous users can look at local.conf.extended # which contains other examples of configuration which can be placed in this file # but new users likely won't need any of them initially. # -# Lines starting with the '#' character are commented out and in some cases the +# Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling # the option is a question of removing the # character and making any change to the # variable as required. @@ -96,8 +96,8 @@ DISTRO ?= "poky" # # Package Management configuration # -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used # to generate the root filesystems. # Options are: # - 'package_deb' for debian style deb files @@ -111,7 +111,7 @@ PACKAGE_CLASSES ?= "package_rpm" # SDK/ADT target architecture # # This variable specifies the architecture to build SDK/ADT items for and means -# you can build the SDK packages for architectures other than the machine you are +# you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" @@ -119,7 +119,7 @@ PACKAGE_CLASSES ?= "package_rpm" # # Extra image configuration defaults # -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated # images. Some of these options are added to certain image types automatically. The # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages @@ -144,7 +144,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # Additional image features # # The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable +# enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics # - 'image-mklibs' to reduce shared library files size for an image @@ -165,8 +165,8 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink" # # Interactive shell configuration # -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is # multithreaded and needs to be able to handle the case where more than one parallel # process may require the user's attention. The default is iterate over the available # terminal types to find one that works. @@ -204,13 +204,13 @@ BB_DISKMON_DIRS = "\ # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # # This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the # cache locations to check for the shared objects. # NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH # 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" PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" - # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # 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 @@ # The following are used to control options related to debugging. # -# Uncomment this to change the optimization to make debugging easer, at the +# Uncomment this to change the optimization to make debugging easer, at the # possible cost of performance. # DEBUG_BUILD = "1" # @@ -131,9 +131,9 @@ # build both the 32-bit and 64-bit wrapper libraries on a 64-bit build system. # # Pseudo will attempt to determine if a 32-bit wrapper is necessary, but -# it doesn't always guess properly. If you have 32-bit executables on -# your 64-bit build system, you likely want to set this to "0", -# otherwise you could end up with incorrect file attributes on the +# it doesn't always guess properly. If you have 32-bit executables on +# your 64-bit build system, you likely want to set this to "0", +# otherwise you could end up with incorrect file attributes on the # target filesystem. # # Default is to not build 32 bit libs on 64 bit systems, uncomment this @@ -270,7 +270,7 @@ # # GCC/LD FLAGS to enable more secure code generation -# +# # By including the security_flags include file you enable flags # to the compiler and linker that cause them to generate more secure # code, this is enabled by default in the poky-lsb distro. -- cgit v1.2.3-54-g00ecf