From fdf8978e5797f7a9910b816fd23744ba7f95a8ad Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 22 Jul 2016 10:32:00 +0200 Subject: [PATCH] linux, u-boot: configure recipes to use maintenance branches Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 3 +-- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index 1abe6a6ea..4ddc949d0 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -11,8 +11,7 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', PROVIDES += "u-boot" -SRCBRANCH = "v2015.04/master" -SRCBRANCH_ccimx6ul = "v2015.04/master" +SRCBRANCH = "v2015.04/maint" SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 7f2aa8fc5..6819a65b9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -5,7 +5,7 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler -SRCBRANCH = "v3.14/master" +SRCBRANCH = "v3.14/dey-2.0/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 96399f669..6a5ceeccc 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc -SRCBRANCH = "v4.1.15/master" +SRCBRANCH = "v4.1/dey-2.0/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul)"