From 1cc0fddc449ff31022b8194e39997e228fbb8e53 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 9 Jul 2013 16:36:00 +0200 Subject: [PATCH] meta-digi-arm: Set 2.6.35.14 as linux preferred version. Also, make arrangements so support more than one kernel version. Signed-off-by: Alex Gonzalez --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 1 + .../linux/{linux-dey-rev.inc => linux-dey-rev_2.6.35.14.inc} | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename meta-digi-arm/recipes-kernel/linux/{linux-dey-rev.inc => linux-dey-rev_2.6.35.14.inc} (77%) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 34d5a016e..9f7f56f48 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -3,6 +3,7 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-dey" PREFERRED_VERSION_linux-libc-headers-dey ?= "2.6.35.14" PREFERRED_PROVIDER_u-boot ?= "u-boot-dey" PREFERRED_PROVIDER_virtual/kernel ?= "linux-dey" +PREFERRED_VERSION_linux-dey = "2.6.35.14" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/libx11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11', '', d)}" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc similarity index 77% rename from meta-digi-arm/recipes-kernel/linux/linux-dey-rev.inc rename to meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc index 5c93f0508..2b8fccf79 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc @@ -2,7 +2,7 @@ SRCREV_external = "a138d8f6602b33ae6021df890ba2f292a405e09a" SRCREV_internal = "feec20411f1ee6c507bf50d12268cd8c05fe6820" -SRCREV_forcevariable = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" +SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git" SRC_URI_internal = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb index 102d5b4b8..c0481a6f4 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb @@ -1,7 +1,7 @@ # Copyright (C) 2012 Digi International include linux-dey.inc -include linux-dey-rev.inc +include linux-dey-rev_${PV}.inc PR = "${DISTRO}.${INC_PR}.0"