From 9e0796058424e7b4491fa174a7d2f1b258c8e30b Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Fri, 27 Oct 2023 11:36:51 -0700 Subject: [PATCH] CMakeLists.txt: mention cherry-pick across repos in build error too This was meant to be part of previous commit b38fef772bf5 ("README.md: show how to git cherry-pick across sof.git and rimage.git") but I forgot it. Signed-off-by: Marc Herbert --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 557d35c..59d7ed4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,8 @@ message(FATAL_ERROR "The rimage 'main' branch has been moved to: https://github.com/thesofproject/sof/tree/main/tools/rimage Please use another branch. +Note you can `git cherry-pick -x` commits across the different \ +sof and rimage git repositories, see example in the README.md here. For more see https://github.com/thesofproject/sof/issues/8178") endif()