From 34831fe690b40ecaec9718e85e63e9d07112dee7 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 11 Feb 2013 18:54:57 +0100 Subject: [PATCH] Revert "del-6.0.1-sprint4: Change SRCREV to sprint tags." This reverts commit 5afd7a29d4af293dc297cc7294296e44ea3b7a09. Development will continue on branches. --- .../recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb | 2 +- .../recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend | 2 +- .../kernel-module-atheros/kernel-module-atheros_git.bb | 2 +- .../kernel-module-redpine/kernel-module-redpine_git.bb | 2 +- .../linux-libc-headers-imx_2.6.35.3.bbappend | 6 +++--- .../recipes-kernel/linux/linux-imx_2.6.35.3.bbappend | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb b/meta-digi-arm/recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb index cc6ae2f83..687e75667 100644 --- a/meta-digi-arm/recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb +++ b/meta-digi-arm/recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80 PR = "r0" -SRCREV="del-6.0.1-sprint4" +SRCREV="master" SRC_URI = "${DIGI_MTK_GIT}del/imx-bootlets.git;" S = "${WORKDIR}/git" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend b/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend index bae1aa125..58cd878bd 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend @@ -4,7 +4,7 @@ DESCRIPTION = "bootloader for Digi platforms" PR_append = "+del.r0" -SRC_URI = "${DIGI_LOG_GIT}u-boot-denx.git;tag=del-6.0.1-sprint4" +SRC_URI = "${DIGI_LOG_GIT}u-boot-denx.git;tag=hpalacio/del-6.x" DEPENDS_mxs_ccardxmx28js += "elftosb-native imx-bootlets-del" diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros_git.bb b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros_git.bb index 3686876ef..25c24a747 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros_git.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros_git.bb @@ -7,7 +7,7 @@ inherit module PR = "r0" FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRCREV = "del-6.0.1-sprint4" +SRCREV = "del-5.9.3.1" SRC_URI = "${DIGI_LOG_GIT}linux-modules/atheros.git;protocol=git \ file://atheros \ " diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb index 415dfeb27..4c071518b 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb @@ -7,7 +7,7 @@ inherit module PR = "r0" FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRCREV = "del-6.0.1-sprint4" +SRCREV = "agonzal/yocto" SRC_URI = "${DIGI_LOG_GIT}linux-modules/redpine.git;protocol=git \ file://0001-redpine-allow-to-build-with-gcc-4.7.patch \ file://redpine" 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 502967ce1..05de22937 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_ccxmx53js_mx5 = "${GIT_TAG}" -SRCREV_mxs = "del-6.0.1-sprint4" -SRCREV_mx5 = "del-6.0.1-sprint4" +# Machine override would be: SRCREV_ccxmx53js_mx5 = "agonzal/yocto" +SRCREV_mxs = "agonzal/yocto" +SRCREV_mx5 = "agonzal/yocto" 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 7ce8d73d1..adb983c62 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 = "del-6.0.1-sprint4" -LOCALVERSION_mxs = "mxs+del-6.0.1-sprint4" +SRCREV_mxs = "agonzal/yocto" +LOCALVERSION_mxs = "mxs+agonzal_yocto" -SRCREV_mx5 = "del-6.0.1-sprint4" -LOCALVERSION_mx5 = "mx5+del-6.0.1-sprint4" +SRCREV_mx5 = "agonzal/yocto" +LOCALVERSION_mx5 = "mx5+agonzal_yocto" SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git \ file://defconfig \