temporary: substitute of rimage PR #16 and #17 merge

To delete after merge of listed PRs

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>

Author: ktrzcinx

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "rimage"]
 	path = rimage
 	url = https://github.com/thesofproject/rimage.git
-	branch = master
+	branch = ext-man-uuid

CMakeLists.txt

@@ -58,6 +58,7 @@ set(CMAKE_ASM_FLAGS -DASSEMBLY)
 add_library(sof_public_headers INTERFACE)
 
 target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/include)
+target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/rimage/src/include)
 target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/rimage/src/include/sof)
 
 # interface library that is used only as container for sof binary options

src/include/kernel/ext_manifest.h

@@ -30,7 +30,7 @@
 #include <ipc/info.h>
 #include <sof/compiler_attributes.h>
 #include <stdint.h>
-#include <rimage/src/include/sof/kernel/ext_manifest.h>
+#include <sof/kernel/ext_manifest.h>
 
 /* FW version */
 struct ext_man_fw_version {