diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass
index f29f40588f..24f8a3b616 100644
--- a/meta/classes/devtool-source.bbclass
+++ b/meta/classes/devtool-source.bbclass
@@ -52,7 +52,8 @@ python() {
     # Hook in pre/postfuncs
     is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d)
     if is_kernel_yocto:
-        unpacktask = 'do_kernel_checkout'
+        # Record the devtool baseline after the kernel SRCREV is enforced.
+        unpacktask = 'do_validate_branches'
         d.appendVarFlag('do_configure', 'postfuncs', ' devtool_post_configure')
     else:
         unpacktask = 'do_unpack'