From 08b3a282ce75a9972694f0c4379179505b9ec91f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 24 Jan 2013 00:30:31 -0500 Subject: kernel-yocto/linux-yocto-custom: support low bandwidth options To support configurations where active development is not being done within the oe/bitbake build environment and restricted bandwidth situations, this commit allows the SRC_URI to point to a kernel tgz instead of a full git repository. Outside of the upstream tgz instead of a kernel git repository, the restrictions, config and patch process is the same as any linux-yocto-custom recipe. An example linux-yocto-custom based recipe would have a configuration like this to build the 3.7 kernel, using an externally supplied config, from the 3.7 tgz: SRC_URI = "http://kernel.org/pub/linux/kernel/v3.0/linux-3.7.tar.bz2" PV = "3.7" S = "${WORKDIR}/linux-3.7" SRC_URI[md5sum] = "5323f3faadd051e83af605a63be5ea2e" SRC_URI[sha256sum] = "dc08d87a579fe2918362e6666e503a95a76296419195cb499aa9dd4dbe171a9e" [YOCTO #2686] Signed-off-by: Bruce Ashfield Signed-off-by: Saul Wold --- meta/classes/kernel-yocto.bbclass | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 92ede6a3aa..8494c16787 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -158,22 +158,10 @@ do_kernel_checkout() { mkdir -p ${S} # We can fix up the kernel repository even if it wasn't a bare clone. - # If KMETA is defined, the branch must exist, but a machine branch - # can be missing since it may be created later by the tools. mv ${WORKDIR}/git/.git ${S} rm -rf ${WORKDIR}/git/ cd ${S} - if [ -n "${KMETA}" ]; then - git branch -a | grep -q ${KMETA} - if [ $? -ne 0 ]; then - echo "ERROR. The branch '${KMETA}' is required and was not" - echo "found. Ensure that the SRC_URI points to a valid linux-yocto" - echo "kernel repository" - exit 1 - fi - fi - fi - if [ -d "${WORKDIR}/git/" ] && [ ! -d "${WORKDIR}/git/.git" ]; then + elif [ -d "${WORKDIR}/git/" ] && [ ! -d "${WORKDIR}/git/.git" ]; then # we build out of {S}, so ensure that ${S} is clean and present rm -rf ${S} mkdir -p ${S}/.git @@ -182,9 +170,29 @@ do_kernel_checkout() { rm -rf ${WORKDIR}/git/ cd ${S} git config core.bare false + else + # We have no git repository at all. To support low bandwidth options + # for building the kernel, we'll just convert the tree to a git repo + # and let the rest of the process work unchanged + cd ${S} + git init + git add . + git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" fi # end debare + # If KMETA is defined, the branch must exist, but a machine branch + # can be missing since it may be created later by the tools. + if [ -n "${KMETA}" ]; then + git branch -a | grep -q ${KMETA} + if [ $? -ne 0 ]; then + echo "ERROR. The branch '${KMETA}' is required and was not" + echo "found. Ensure that the SRC_URI points to a valid linux-yocto" + echo "kernel repository" + exit 1 + fi + fi + # convert any remote branches to local tracking ones for i in `git branch -a | grep remotes | grep -v HEAD`; do b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`; -- cgit v1.2.3