[meta-mentor] [PATCH 1/1] Added a few commented out build options, such as BB_NO_NETWORK and r/o root FS. Also added a mklibs section from the meta-yocto local.conf.extended, since we don't supply that file as part of our build.

[Michael Brown]

Signed-off-by: Michael Brown <mw_brown at mentor.com>
---
 conf/local.conf.in |   32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/conf/local.conf.in b/conf/local.conf.in
index b2691b3..0741e22 100644
--- a/conf/local.conf.in
+++ b/conf/local.conf.in
@@ -139,9 +139,18 @@ SSTATE_DIR ?= "${MELDIR}/cached-binaries"
 #   - 'image-prelink' in order to prelink the filesystem image
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
-# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+# NOTE: mklibs also needs to be explicitly enabled for a given image, see next section below
 USER_CLASSES ?= "image-mklibs image-prelink"
 
+# mklibs library size optimization is more useful to smaller images,
+# and less useful for bigger images. Also mklibs library optimization
+# can break the ABI compatibility, so should not be applied to the
+# images which are to be extended or upgraded later.
+#This enabled mklibs library size optimization just for the specified image.
+#MKLIBS_OPTIMIZED_IMAGES ?= "core-image-minimal"
+#This enable mklibs library size optimization will be for all the images.
+#MKLIBS_OPTIMIZED_IMAGES ?= "all"
+
 # Interactive shell configuration
 #
 # Under certain circumstances the system may need input from you and to do this it
@@ -186,3 +195,24 @@ USER_CLASSES ?= "image-mklibs image-prelink"
 # track the version of this file when it was generated. This can safely be ignored if
 # this doesn't mean anything to you.
 CONF_VERSION = "1"
+
+# Uncomment the following lines to enable building and adding of the bad, ugly, and 
+# otherwise risky gstreamer plugins
+#IMAGE_INSTALL_append += " packagegroup-multimedia-risky"
+#LICENSE_FLAGS_WHITELIST += " commercial_gst-ffmpeg commercial_gst-plugin-asf commercial_gst-plugins-ugly commercial_gst-plugins-bad"
+#LICENSE_FLAGS_WHITELIST += " commercial_mpeg2dec commercial_lame commercial_gst-fluendo-mp3 commercial_gst-fluendo-mpegdemux"
+#LICENSE_FLAGS_WHITELIST += " commercial_gst-openmax commercial_libomxil"
+
+# When building for mx6q, uncomment the following line to accept the EULA-protected
+# FSL proprietary components.  If any FSL proprietary components are required for the
+# build, the build will fail if this is not set.
+#ACCEPT_FSL_EULA = "1"
+
+# Uncomment this line to enable the Read Only root file system
+#IMAGE_FEATURES_append = " read-only-rootfs "
+
+# Uncomment this line to disable network access during the build.  This can be used to
+# simulate a build in an environment without network access.
+#BB_NO_NETWORK = "1"
+
+
-- 
1.7.9.5