Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-arm: remove linux-dey-rev files 

The Linux kernel revision was splitted from main bitbake recipe to its
own linux-dey-rev file so that file could be used for linux-headers
recipe to build the toolchain using custom kernel headers (from our
repository).

That is not the recommended way to build a toolchain:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=babbf7a46acaefd9b36031483cafce053f607e66

and we are not using our kernel headers to build the toolchain anymore,
so just melt the linux-dey-rev files into the linux-dey bitbake recipes
for cleanness and easier maintenance.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-11-18 16:28:07 +01:00
parent 29ad4a521d
commit 05052c72d5
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc
View File

@ -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)}"

9
meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
View File

@ -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)}"

11
meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb
View File

@ -1,17 +1,24 @@
# Copyright (C) 2012 Digi International # Copyright (C) 2012 Digi International
include linux-dey.inc include linux-dey.inc
include linux-dey-rev_${PV}.inc
PR = "${DISTRO}.${INC_PR}.0" 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_mx5 = "mx5"
LOCALVERSION_mxs = "mxs" 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 \ file://defconfig \
${KERNEL_CFG_FRAGS} \ ${KERNEL_CFG_FRAGS} \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
KERNEL_CFG_FRAGS ?= "" KERNEL_CFG_FRAGS ?= ""

10
meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
View File

@ -5,17 +5,23 @@ UBOOT_ENTRYPOINT = "0x40008000"
require recipes-kernel/linux/linux-dtb.inc require recipes-kernel/linux/linux-dtb.inc
include linux-dey.inc include linux-dey.inc
include linux-dey-rev_${PV}.inc
PR = "${DISTRO}.${INC_PR}.0" 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" LOCALVERSION_mxs = "mxs"
# Kernel configuration fragments # Kernel configuration fragments
KERNEL_CFG_FRAGS ?= "" KERNEL_CFG_FRAGS ?= ""
KERNEL_CFG_FRAGS_append = " ${@base_conditional('HAVE_EXAMPLE', '1' , 'file://config-spidev.cfg', '', d)}" 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 \ file://defconfig \
${KERNEL_CFG_FRAGS} \ ${KERNEL_CFG_FRAGS} \
" "