summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-12-13 12:20:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-13 14:50:58 +0000
commit79e2bbdac0487cb419b3efaeb27c9ed3fc4384b2 (patch)
tree6e25cbaf7ca1bbf2e2322cd56eefb98a213884e6 /meta-yocto/conf
parentd4327cbbdafda84f4ae00029b5882dd3d0a1d036 (diff)
downloadpoky-79e2bbdac0487cb419b3efaeb27c9ed3fc4384b2.tar.gz
local.conf.sample.extended: restore some edits
Poky commit ba8506ee342a1a579ceb309f3f50285eaad84f25 reverted some previous changes that hadn't been applied in the OE-Core version of this file. This patch restores them and tweaks a couple of sentences so that they make sense. (From meta-yocto rev: 38afe2938a54b59231598be8e8646564457f4d97) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r--meta-yocto/conf/local.conf.sample.extended53
1 files changed, 29 insertions, 24 deletions
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index 9585432bc6..c7c4f40515 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -15,7 +15,7 @@
15 15
16#DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}" 16#DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}"
17 17
18# If you want to get an image based on gtk+directfb without x11, Please copy this variable to build/conf/local.conf 18# If you want to get an image based on directfb without x11, Please copy this variable to build/conf/local.conf
19#DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC}" 19#DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC}"
20 20
21# ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale 21# ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale
@@ -188,33 +188,38 @@
188# when the disk space reduces 50M (or the amount of inode reduces 5k). 188# when the disk space reduces 50M (or the amount of inode reduces 5k).
189#BB_DISKMON_WARNINTERVAL = "50M,5K" 189#BB_DISKMON_WARNINTERVAL = "50M,5K"
190 190
191# Archiving source code configuration 191# Archiving source code, configure what kind of sources will be archived
192# 192# and the output format. The output files will be put in
193# The following variables control which files to archive and the type to archive to generate. 193# ${DEPLOY_DIR}/sources/.
194# There are three basic class defintions of common operations that might be desired and these 194#
195# can be enabled by uncommenting one of the following lines: 195# You can add the following 3 lines to the conf file to get a quick
196# 196# usage:
197# INHERIT += "archive-original-source" 197#ARCHIVER_MODE ?= "original"
198# INHERIT += "archive-patched-source" 198#ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE != 'none' else ''}"
199#INHERIT =+ "archive-configured-source" 199#INHERIT += "${ARCHIVER_CLASS}"
200# 200#
201# Type of archive: 201# Detailed configuration:
202# SOURCE_ARCHIVE_PACKAGE_TYPE = 'srpm' 202# What kind of sources will be archived, the ARCHIVER_MODE could be:
203#SOURCE_ARCHIVE_PACKAGE_TYPE ?= 'tar' 203# original: the ${S} after do_unpack
204# 204# patched : the ${S} after do_patch
205# Whether to include WORKDIR/temp, .bb and .inc files: 205# configured: the ${S} after do_configure
206# 'logs_with_scripts' include WORKDIR/temp directory and .bb and .inc files
207# 'logs' only include WORKDIR/temp
208# ARCHIVER_MODE[log_type] = "logs logs_with_scripts"
209# There are three basic class defintions of common operations
210# that might be desired and these can be enabled by
211# uncommenting five of the following lines:
212# ARCHIVER_MODE[filter] ?= "yes no"
213# Filter packages according to license
214#ARCHIVER_MODE ?= "original" 206#ARCHIVER_MODE ?= "original"
207#
208# The output format type, tar or srpm, the default is "tar".
215#ARCHIVER_MODE[type] ?= "tar" 209#ARCHIVER_MODE[type] ?= "tar"
210#
211# Whether include the log file under ${T} and the recipe (.bb and .inc),
212# the default is "logs_with_scripts".
216#ARCHIVER_MODE[log_type] ?= "logs_with_scripts" 213#ARCHIVER_MODE[log_type] ?= "logs_with_scripts"
214#
215# license filter:
216# yes: Only the COPYLEFT_LICENSE_INCLUDE recipe will be archived
217# no: All kinds of license will be archived
218# The default is "no"
217#ARCHIVER_MODE[filter] ?= "no" 219#ARCHIVER_MODE[filter] ?= "no"
220#
221# The following lines should be added to your conf file verbatim
222# (uncommented though of course):
218#ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE != 'none' else ''}" 223#ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE != 'none' else ''}"
219#INHERIT += "${ARCHIVER_CLASS}" 224#INHERIT += "${ARCHIVER_CLASS}"
220 225