mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 09:32:14 +02:00
linux-yocto: allow configuration of arbitrary branches
When building an external tree or bootstrapping a BSP the external branch may not have been checked out. The tools now ensure that the tree is ready for configuration, so we no longer need to force the checkout of the external branch. This change is coupled with some kern tools tweaks as follows: 40d9bab updateme: allow the location of board descriptions based on defines 59859ca createme: use branch name when creating meta data 91b4275 configme: determine meta branch based on directories, not branch naming f5a915c kgit-meta: make branch creation and renaming more robust (From OE-Core rev: 02c82bf5255b09bb27a0a4509861a3d2bd84b09f) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b0f12a1612
commit
5e4a6bd7e2
@@ -28,7 +28,8 @@ do_patch() {
|
||||
addon_features="$addon_features --feature $feat"
|
||||
done
|
||||
fi
|
||||
updateme --branch ${kbranch} ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
|
||||
updateme --branch ${kbranch} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
|
||||
${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR. Could not update ${kbranch}"
|
||||
exit 1
|
||||
@@ -86,17 +87,8 @@ addtask kernel_checkout before do_patch after do_unpack
|
||||
do_kernel_configme() {
|
||||
echo "[INFO] doing kernel configme"
|
||||
|
||||
kbranch=${KBRANCH}
|
||||
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
|
||||
|
||||
configme --reconfig --output ${B} ${kbranch} ${MACHINE}
|
||||
cd ${S}
|
||||
configme --reconfig --output ${B} ${KBRANCH} ${KMACHINE}
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
|
||||
exit 1
|
||||
|
||||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
|
||||
|
||||
DEPENDS = "git-native guilt-native"
|
||||
|
||||
SRCREV = "f5a915c277a37ba5949b4c0778356189e7dd9ec0"
|
||||
SRCREV = "40d9bab24bde4c2f94a0cece153663aa93e0f9a4"
|
||||
PR = r10
|
||||
PV = "0.1+git${SRCPV}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user