linux-wrs: Enable tracking of the secondary wrs_meta branch in PV

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index d3747669b3ab55a16f25ff8baca9beefa79e4591..40c47607aa3655c6784d6080454e7f421172cc84 100644 (file)
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -68,11 +68,12 @@ SRCREV_pn-libxext-nativesdk ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
 SRCREV_pn-libxi ??= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e"
 SRCREV_pn-linux-openmoko ??= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
 SRCREV_pn-linux-omap3-pm ??= "totallybroken"
-SRCREV_pn-linux-wrs_qemuarm ??= "caf3b232f003ac136f0fc99143cac027863af74b"
-SRCREV_pn-linux-wrs_qemumips ??= "5a7c9d5a35cd43308a2afd212824b670553179af"
-SRCREV_pn-linux-wrs_qemuppc ??= "bc33a1f5b5703df9ac169835161dc963abc55f6b"
-SRCREV_pn-linux-wrs_qemux86 ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
-SRCREV_pn-linux-wrs_qemux86-64 ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
+SRCREV_pn-linux-wrs_machine_qemuarm ??= "caf3b232f003ac136f0fc99143cac027863af74b"
+SRCREV_pn-linux-wrs_machine_qemumips ??= "5a7c9d5a35cd43308a2afd212824b670553179af"
+SRCREV_pn-linux-wrs_machine_qemuppc ??= "bc33a1f5b5703df9ac169835161dc963abc55f6b"
+SRCREV_pn-linux-wrs_machine_qemux86 ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
+SRCREV_pn-linux-wrs_machine_qemux86-64 ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
+SRCREV_pn-linux-wrs_meta ??= "a7fd16db16aa37296d5cef8db9707cacc084131d"
 SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
 SRCREV_pn-matchbox-config-gtk ??= "2081"
 SRCREV_pn-matchbox-desktop-sato ??= "76"

diff --git a/meta/packages/linux/linux-wrs_git.bb b/meta/packages/linux/linux-wrs_git.bb
index d201994fd28b02ae1a42587542f146f02ff28a65..60248f931c8d0658370279ed954fd7fd56a74b12 100644 (file)
--- a/meta/packages/linux/linux-wrs_git.bb
+++ b/meta/packages/linux/linux-wrs_git.bb
@@ -5,12 +5,14 @@ LICENSE = "GPL"
 # Set this to 'preempt_rt' in the local.conf if you want a real time kernel
 LINUX_KERNEL_TYPE ?= standard
 DEPENDS = "kern-tools-native"
+SRCREV_FORMAT = "meta_machine"
 PV = "2.6.34+git${SRCPV}"
 
 # To use a staged, on-disk bare clone of a Wind River Kernel, use a 
 # variant of the below
 # SRC_URI = "git://///path/to/kernel/default_kernel.git;fullclone=1"
-SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${WRMACHINE}-${LINUX_KERNEL_TYPE}"
+SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${WRMACHINE}-${LINUX_KERNEL_TYPE};name=machine \
+           git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"
 
 
 WRMACHINE = "${MACHINE}"