From d668f9283460091929951764764347af11b69909 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Thu, 14 Feb 2013 18:52:05 +0100 Subject: [PATCH] meta-digi-arm: Use master for linux-imx and linux-libc-headers-imx. The agonzal/yocto kernel branch has now been merged to the master. Signed-off-by: Alex Gonzalez --- .../linux-libc-headers-imx_2.6.35.3.bbappend | 6 +++--- .../recipes-kernel/linux/linux-imx_2.6.35.3.bbappend | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend index 7aee1d901..2a0126fa5 100644 --- a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend +++ b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend @@ -1,7 +1,7 @@ # Copyright (C) 2012 Digi International PR_append = "+del.r0" -# Machine override would be: SRCREV_ccimx53js_mx5 = "agonzal/yocto" -SRCREV_mxs = "agonzal/yocto" -SRCREV_mx5 = "agonzal/yocto" +# Machine override would be: SRCREV_ccimx53js_mx5 = "master" +SRCREV_mxs = "master" +SRCREV_mx5 = "master" SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend index c894ce2a9..3ad0c261f 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend @@ -3,11 +3,11 @@ PR_append = "+del.r0" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}_${PV}" -SRCREV_mxs = "agonzal/yocto" -LOCALVERSION_mxs = "mxs+agonzal_yocto" +SRCREV_mxs = "master" +LOCALVERSION_mxs = "mxs+master" -SRCREV_mx5 = "agonzal/yocto" -LOCALVERSION_mx5 = "mx5+agonzal_yocto" +SRCREV_mx5 = "master" +LOCALVERSION_mx5 = "mx5+master" SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git \ file://defconfig \