diff options
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 7 | ||||
-rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 818a07e219..536434fdf1 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -136,6 +136,13 @@ do_validate_branches() { | |||
136 | return | 136 | return |
137 | fi | 137 | fi |
138 | 138 | ||
139 | # nothing to do if SRCREV=${AUTOREV} | ||
140 | if [ "${SRCREV_machine}" = "AUTOINC" ]; then | ||
141 | # restore the branch for builds | ||
142 | git checkout -f ${KBRANCH} | ||
143 | return | ||
144 | fi | ||
145 | |||
139 | branch_head=`git show-ref -s --heads ${KBRANCH}` | 146 | branch_head=`git show-ref -s --heads ${KBRANCH}` |
140 | meta_head=`git show-ref -s --heads ${KMETA}` | 147 | meta_head=`git show-ref -s --heads ${KMETA}` |
141 | target_branch_head="${SRCREV_machine}" | 148 | target_branch_head="${SRCREV_machine}" |
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 829d105d2c..f7600ca5b6 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8 | |||
4 | 4 | ||
5 | DEPENDS = "git-native guilt-native" | 5 | DEPENDS = "git-native guilt-native" |
6 | 6 | ||
7 | SRCREV = "ecbdf3cdf6705a63dcb3c50bb24c311046f0b35c" | 7 | SRCREV = "f8eb067b023d590b6cd8deddf6f96d6a820997af" |
8 | PR = r10 | 8 | PR = r10 |
9 | PV = "0.1+git${SRCPV}" | 9 | PV = "0.1+git${SRCPV}" |
10 | 10 | ||