linux-yocto: safely process unbranched repositories

The BSP bootstrap and -dev use cases can be applied against
unbranched or repos without meta data. To allow the proper
and safe processing of those repositories, slight modifications
to the tools are required to pass the branch on the command
line (rather than detecting it always) and to only checkout
branches that exist.

(From OE-Core rev: ae754be8b43677604a853ec6f62b2490a91d8836)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield 2011-04-08 00:01:35 -04:00 committed by Richard Purdie
parent 1fc3964657
commit 1e54b756e9
2 changed files with 6 additions and 3 deletions

View File

@ -25,7 +25,7 @@ do_patch() {
addon_features="$addon_features --feature $feat"
done
fi
updateme ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR}
updateme --branch ${kbranch} ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR}
if [ $? -ne 0 ]; then
echo "ERROR. Could not update ${kbranch}"
exit 1
@ -87,9 +87,12 @@ do_kernel_configme() {
if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
# switch from a generic to a specific branch
kbranch=${YOCTO_KERNEL_EXTERNAL_BRANCH}
cd ${S}
git checkout ${kbranch}
else
cd ${S}
fi
cd ${S}
configme --reconfig --output ${B} ${kbranch} ${MACHINE}
if [ $? -ne 0 ]; then
echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"

View File

@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
DEPENDS = "git-native guilt-native"
SRCREV = "92b965b02e3ac32badde3ee71a1e7d3a85cedeb8"
SRCREV = "c5896a60acc61f8966cfee3bb241ff564610cea4"
PR = r10
PV = "0.1+git${SRCPV}"