Merge pull request ostroproject#13 from otcshare/master-next

master next

meta-ostro-xt/conf/layer.conf

@@ -23,7 +23,7 @@ BBFILE_PRIORITY_ostro-xt = "10"
 #
 # When making additional changes to the copied files that are specific
 # to Ostro OS XT, just bump OSTRO_OS_XT_LOCALCONF/LAYER_CONF_VERSION.
-EXPECTED_OSTRO_OS_LOCALCONF_VERSION = "3"
+EXPECTED_OSTRO_OS_LOCALCONF_VERSION = "4"
 EXPECTED_OSTRO_OS_LAYER_CONF_VERSION = "9"
 OSTRO_OS_XT_LOCALCONF_VERSION = "1"
 OSTRO_OS_XT_LAYER_CONF_VERSION = "2"

meta-ostro-xt/conf/local.conf.sample

@@ -247,7 +247,7 @@ BB_DISKMON_DIRS = "\
 SSTATE_MIRRORS ?= "file://.* http://ostro-gt.ostc.intel.com/download/bb-cache/sstate/PATH"
 
 # This value must match the value of LOCALCONF_VERSION in meta-ostro-xt/conf/layer.conf.
-CONF_VERSION = "301"
+CONF_VERSION = "401"
 
 #
 # ISAFW: https://github.com/01org/isafw
@@ -263,7 +263,7 @@ CONF_VERSION = "301"
 # By default, only recipes explicitly declared to be okay for building Ostro OS
 # are allowed to be built. Adding or depending on anything else triggers a
 # message saying "The following unsupported recipes are required for the build"
-# and aborts. See building-images.rst for more information.
+# and aborts. See doc/howtows/building-images.rst for more information.
 SUPPORTED_RECIPES_CHECK = "fatal"
 
 # Uncomment the following line to disable the check:
@@ -272,6 +272,15 @@ SUPPORTED_RECIPES_CHECK = "fatal"
 # Alternatively, uncomment the following line to make it a non-fatal warning:
 #SUPPORTED_RECIPES_CHECK = "warn"
 
+# Ostro OS does not package source code in dbg packages because our
+# images include valgrind, and valgrind depends on the glibc dbg
+# package. Including source code in dbg packages would therefore make
+# the images larger than they normally need to be.
+#
+# If you need source code packaged and installed on images, comment out
+# the following line.
+PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
+
 # An explicit choice must be made between building Ostro OS
 # development images and production images. See
 # doc/howtows/building-images.rst for further instructions.
@@ -288,6 +297,21 @@ SUPPORTED_RECIPES_CHECK = "fatal"
 #
 #require conf/distro/include/ostro-os-production.inc
 
+# systemd-bootchart is a useful tool to analyze and optimize a system
+# boot time. The tool is available in Ostro and needs to be activated
+# by a kernel command-line parameter which requires to build a new
+# image. This tool also requires some kernel configurations to be active,
+# specifically CONFIG_DEBUG_KERNEL and CONFIG_SCHEDSTATS.
+#
+# To use systemd-bootchart with the intel-corei7-64 or intel-quark machine
+# uncomment the two lines below. Other MACHINEs that use u-boot (such as
+# edison and beaglebone) use a different mechanism to modify the kernel
+# command-line parameter, this is not covered here. The bootchart graphs
+# will be available in /run/log/.
+#
+#APPEND_append = " init=/lib/systemd/systemd-bootchart"
+#SRC_URI_append_pn-linux-yocto = " file://bootchart.cfg"
+
 #
 # Misc configuration
 #

meta-ostro-xt/recipes-kernel/linux/linux-yocto_4.4.bbappend

@@ -5,4 +5,4 @@ SRC_URI_append_intel-corei7-64 = " file://disable-iwlwifi-upstream.cfg"
 
 LINUX_VERSION_INTEL_COMMON_forcevariable = "4.4.14"
 KBRANCH_corei7-64-intel-common_forcevariable = "standard/intel/bxt-rebase;rebaseable=1"
-SRCREV_machine_corei7-64-intel-common = "256385e1e85055afb8432ecf0aeee65e2590d142"
+SRCREV_machine_corei7-64-intel-common = "027c17a3adb851fd330667210073e587fdedcdad"