Merge remote-tracking branch 'origin/master' into master-enea

5 files changed, 94 insertions, 14 deletions

diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.2.bb b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb
index 8d9e4ae7..937f1a15 100644
--- a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.2.bb
+++ b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb
@@ -14,8 +14,8 @@ PR = "r1"
 
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 
-SRC_URI[md5sum] = "f543877db4e260d8b43c7da3095605ed"
-SRC_URI[sha256sum] = "3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c"
+SRC_URI[md5sum] = "cd3db8370caa3e607614ea4e74d4c350"
+SRC_URI[sha256sum] = "48c6690b6751c76f53de64f8dbeaa9d6c62dbcfe890c768fd87167951247d44f"
 
 PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
 PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri"
diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend
index dd05b1f0..01775b76 100644
--- a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -3,18 +3,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 # For NUC
 KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"
 
-LINUX_VERSION_core2-32-intel-common = "3.14.36"
+LINUX_VERSION_core2-32-intel-common = "3.14.39"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
-SRCREV_meta_core2-32-intel-common = "162dfe3bb092c1a792e5ed224fe09672e9814b24"
-SRCREV_machine_core2-32-intel-common = "4434aa71ff7043c570f9eae493df1ccadbda9b85"
+SRCREV_meta_core2-32-intel-common = "a996d95104b72c422a56e7d9bc8615ec4219ac74"
+SRCREV_machine_core2-32-intel-common = "bda175966009d5a94103559e6e6ae51279952f39"
 KMACHINE_core2-32-intel-common = "intel-core2-32"
 KBRANCH_core2-32-intel-common = "standard/base"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
-LINUX_VERSION_corei7-64-intel-common = "3.14.36"
+LINUX_VERSION_corei7-64-intel-common = "3.14.39"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-SRCREV_meta_corei7-64-intel-common = "162dfe3bb092c1a792e5ed224fe09672e9814b24"
-SRCREV_machine_corei7-64-intel-common = "4434aa71ff7043c570f9eae493df1ccadbda9b85"
+SRCREV_meta_corei7-64-intel-common = "a996d95104b72c422a56e7d9bc8615ec4219ac74"
+SRCREV_machine_corei7-64-intel-common = "bda175966009d5a94103559e6e6ae51279952f39"
 KMACHINE_corei7-64-intel-common = "intel-corei7-64"
 KBRANCH_corei7-64-intel-common = "standard/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/common/recipes-kernel/linux/linux-yocto_3.19.bbappend b/common/recipes-kernel/linux/linux-yocto_3.19.bbappend
index da91a782..acdf5efa 100644
--- a/common/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_3.19.bbappend
@@ -3,18 +3,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 # For NUC
 KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"
 
-LINUX_VERSION_core2-32-intel-common = "3.19.2"
+LINUX_VERSION_core2-32-intel-common = "3.19.5"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
-SRCREV_meta_core2-32-intel-common = "e308b2c52519c4ec60fe51f020e711cc12b799ae"
-SRCREV_machine_core2-32-intel-common = "31b35da6a5c8a2b162f6c33202e9b64dd13757d5"
+SRCREV_meta_core2-32-intel-common = "7215fe431391a322c7e39f410e7b8f2a2b507892"
+SRCREV_machine_core2-32-intel-common = "0befa35f40997c90936047e57fbbdd7edbf7e525"
 KMACHINE_core2-32-intel-common = "intel-core2-32"
 KBRANCH_core2-32-intel-common = "standard/base"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
-LINUX_VERSION_corei7-64-intel-common = "3.19.2"
+LINUX_VERSION_corei7-64-intel-common = "3.19.5"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-SRCREV_meta_corei7-64-intel-common = "e308b2c52519c4ec60fe51f020e711cc12b799ae"
-SRCREV_machine_corei7-64-intel-common = "31b35da6a5c8a2b162f6c33202e9b64dd13757d5"
+SRCREV_meta_corei7-64-intel-common = "7215fe431391a322c7e39f410e7b8f2a2b507892"
+SRCREV_machine_corei7-64-intel-common = "0befa35f40997c90936047e57fbbdd7edbf7e525"
 KMACHINE_corei7-64-intel-common = "intel-corei7-64"
 KBRANCH_corei7-64-intel-common = "standard/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
new file mode 100644
index 00000000..ccc6c54f
--- /dev/null
+++ b/common/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
@@ -0,0 +1,71 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+lttng-modules: replace KERNELDIR with KERNEL_SRC
+
+Since lttng-modules uses the default way of module.bbclass to
+build and install lttng-modules, we do this replacement for
+it as-is.
+
+Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
+[sgw - rebased for 2.6.1]
+Signed-off-by: Saul wold <sgw@linux.intel.com>
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -68,19 +68,19 @@ obj-m += lib/
+ endif # CONFIG_TRACEPOINTS
+ 
+ else # KERNELRELEASE
+-       KERNELDIR ?= /lib/modules/$(shell uname -r)/build
+-       PWD := $(shell pwd)
+-       CFLAGS = $(EXTCFLAGS)
+-
++       KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
++       PWD := $(shell pwd)
++       CFLAGS = $(EXTCFLAGS)
++ 
+ default:
+-       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
++       LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
+ 
+ modules_install:
+-       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
++       LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
+ 
+ clean:
+-       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
++       LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
+ 
+ %.i: %.c
+-       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
++       LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@
+ endif # KERNELRELEASE
+Index: git/probes/Makefile
+===================================================================
+--- git.orig/probes/Makefile
++++ git/probes/Makefile
+@@ -267,18 +267,18 @@ endif
+ endif
+ 
+ else
+-       KERNELDIR ?= /lib/modules/$(shell uname -r)/build
++       KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
+        PWD := $(shell pwd)
+        CFLAGS = $(EXTCFLAGS)
+ 
+ default:
+-       $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
++       $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
+ 
+ modules_install:
+-       $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
++       $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
+        /sbin/depmod -a
+ 
+ clean:
+-       $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
++       $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
+ 
+ endif
diff --git a/common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend b/common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend
new file mode 100644
index 00000000..6d88e305
--- /dev/null
+++ b/common/recipes-kernel/lttng/lttng-modules_2.6.%.bbappend
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRCREV = "62080b2248fd8ec4111ffc379d0bc5eaf0a5c16d"
+
+#SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.6 \
+#           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
+#           "
+
+