diff options
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 7718f9ab1b..e672a0e3a5 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
| @@ -288,12 +288,14 @@ do_validate_branches() { | |||
| 288 | # check and we can exit early | 288 | # check and we can exit early |
| 289 | if [ "${machine_srcrev}" = "AUTOINC" ]; then | 289 | if [ "${machine_srcrev}" = "AUTOINC" ]; then |
| 290 | bbnote "SRCREV validation is not required for AUTOREV" | 290 | bbnote "SRCREV validation is not required for AUTOREV" |
| 291 | elif [ "${machine_srcrev}" = "" ] && [ "${SRCREV}" != "AUTOINC" ]; then | 291 | elif [ "${machine_srcrev}" = "" ]; then |
| 292 | # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe | 292 | if [ "${SRCREV}" != "AUTOINC" ]; then |
| 293 | # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In | 293 | # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe |
| 294 | # this case, we need to reset to the give SRCREV before heading to patching | 294 | # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In |
| 295 | bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}" | 295 | # this case, we need to reset to the give SRCREV before heading to patching |
| 296 | force_srcrev="${SRCREV}" | 296 | bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}" |
| 297 | force_srcrev="${SRCREV}" | ||
| 298 | fi | ||
| 297 | else | 299 | else |
| 298 | git cat-file -t ${machine_srcrev} > /dev/null | 300 | git cat-file -t ${machine_srcrev} > /dev/null |
| 299 | if [ $? -ne 0 ]; then | 301 | if [ $? -ne 0 ]; then |