diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc deleted file mode 100644 index 4104a9a92..000000000 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2012 Digi International - -SRCREV_external = "" -SRCREV_internal = "020eb0cd048911e2d6a6f987af6ecdbffb804627" -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_GIT}linux-2.6.git;protocol=git" -SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc deleted file mode 100644 index 7b02fe59b..000000000 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2012 Digi International - -SRCREV_external = "" -SRCREV_internal = "c2334ce9dde8e7313dc762d021200496a7fa3cf5" -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_GIT}linux-2.6.git;protocol=git" -SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}" 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 378143b94..4250e25dd 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,17 +1,24 @@ # Copyright (C) 2012 Digi International include linux-dey.inc -include linux-dey-rev_${PV}.inc PR = "${DISTRO}.${INC_PR}.0" +SRCREV_external = "" +SRCREV_internal = "020eb0cd048911e2d6a6f987af6ecdbffb804627" +SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" + LOCALVERSION_mx5 = "mx5" LOCALVERSION_mxs = "mxs" -SRC_URI += " \ +SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git" +SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git" +SRC_URI = " \ + ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \ file://defconfig \ ${KERNEL_CFG_FRAGS} \ " + S = "${WORKDIR}/git" KERNEL_CFG_FRAGS ?= "" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index bf186ca15..bd3d85b77 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -5,17 +5,23 @@ UBOOT_ENTRYPOINT = "0x40008000" require recipes-kernel/linux/linux-dtb.inc include linux-dey.inc -include linux-dey-rev_${PV}.inc PR = "${DISTRO}.${INC_PR}.0" +SRCREV_external = "" +SRCREV_internal = "c2334ce9dde8e7313dc762d021200496a7fa3cf5" +SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" + LOCALVERSION_mxs = "mxs" # Kernel configuration fragments KERNEL_CFG_FRAGS ?= "" KERNEL_CFG_FRAGS_append = " ${@base_conditional('HAVE_EXAMPLE', '1' , 'file://config-spidev.cfg', '', d)}" -SRC_URI += " \ +SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git" +SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git" +SRC_URI = " \ + ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \ file://defconfig \ ${KERNEL_CFG_FRAGS} \ "