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>

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 @@
 
 #DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}"
 
-# If you want to get an image based on gtk+directfb without x11, Please copy this variable to build/conf/local.conf
+# If you want to get an image based on directfb without x11, Please copy this variable to build/conf/local.conf
 #DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC}"
 
 # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale
@@ -188,33 +188,38 @@
 # when the disk space reduces 50M (or the amount of inode reduces 5k).
 #BB_DISKMON_WARNINTERVAL = "50M,5K"
 
-# Archiving source code configuration
-#
-# The following variables control which files to archive and the type to archive to generate.
-# There are three basic class defintions of common operations that might be desired and these
-# can be enabled by uncommenting one of the following lines:
-#
-# INHERIT += "archive-original-source"
-# INHERIT += "archive-patched-source"
-#INHERIT =+ "archive-configured-source"
-#
-# Type of archive:
-# SOURCE_ARCHIVE_PACKAGE_TYPE = 'srpm'
-#SOURCE_ARCHIVE_PACKAGE_TYPE ?= 'tar'
-#
-# Whether to include WORKDIR/temp, .bb and .inc files:
-# 'logs_with_scripts' include WORKDIR/temp directory and .bb and .inc files
-# 'logs' only include WORKDIR/temp
-# ARCHIVER_MODE[log_type] = "logs logs_with_scripts"
-# There are three basic class defintions of common operations 
-# that might be desired and these can be enabled by 
-# uncommenting five of the following lines:
-# ARCHIVER_MODE[filter] ?= "yes no"
-# Filter packages according to license
+# Archiving source code, configure what kind of sources will be archived
+# and the output format. The output files will be put in
+# ${DEPLOY_DIR}/sources/.
+#
+# You can add the following 3 lines to the conf file to get a quick
+# usage:
+#ARCHIVER_MODE ?= "original"
+#ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE != 'none' else ''}"
+#INHERIT += "${ARCHIVER_CLASS}"
+#
+# Detailed configuration:
+# What kind of sources will be archived, the ARCHIVER_MODE could be:
+# original: the ${S} after do_unpack
+# patched : the ${S} after do_patch
+# configured: the ${S} after do_configure
 #ARCHIVER_MODE ?= "original"
+#
+# The output format type, tar or srpm, the default is "tar".
 #ARCHIVER_MODE[type] ?= "tar"
+#
+# Whether include the log file under ${T} and the recipe (.bb and .inc),
+# the default is "logs_with_scripts".
 #ARCHIVER_MODE[log_type] ?= "logs_with_scripts"
+#
+# license filter:
+# yes: Only the COPYLEFT_LICENSE_INCLUDE recipe will be archived
+# no: All kinds of license will be archived
+# The default is "no"
 #ARCHIVER_MODE[filter] ?= "no"
+#
+# The following lines should be added to your conf file verbatim
+# (uncommented though of course):
 #ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE != 'none' else ''}"
 #INHERIT += "${ARCHIVER_CLASS}"