From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 1 Mar 2023 22:00:49 +0000 (-0500)
Subject: kuksa-val: Add patch to fix intermittent build failures
X-Git-Tag: 15.0.1~8
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=6330463b0e01999087490e4d47c6aee30838e633;p=AGL%2Fmeta-agl-demo.git

kuksa-val: Add patch to fix intermittent build failures

Add a patch to KUKSA.val to add a missing dependency in its CMake
files to hopefully fix a build race that is seen on the AGL CI
builders.

Bug-AGL: SPEC-4717

Change-Id: I74f71236729e60ad0601fb1244b50279b2fc43e7
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---

diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0005-kuksa-val-server-Add-missing-check_git-dependency.patch b/recipes-connectivity/kuksa-val/kuksa-val/0005-kuksa-val-server-Add-missing-check_git-dependency.patch
new file mode 100644
index 000000000..ea866a6e0
--- /dev/null
+++ b/recipes-connectivity/kuksa-val/kuksa-val/0005-kuksa-val-server-Add-missing-check_git-dependency.patch
@@ -0,0 +1,32 @@
+From 4c232caca95606fe4be6f84fe437c4bb506c885e Mon Sep 17 00:00:00 2001
+From: Scott Murray <scott.murray@konsulko.com>
+Date: Wed, 1 Mar 2023 16:25:38 -0500
+Subject: [PATCH] kuksa-val-server: Add missing check_git dependency
+
+There was no explicit dependency on the check_git target in
+kuksa-val-server/src/CMakeLists.txt, so there was a race with
+creating buildinfo.h when building parallel, leading to
+intermittent build failures on the AGL CI builders.  Add the
+dependency to improve build robustness.
+
+Upstream-Status: Pending
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+---
+ kuksa-val-server/src/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kuksa-val-server/src/CMakeLists.txt b/kuksa-val-server/src/CMakeLists.txt
+index 9428306..afc570e 100644
+--- a/kuksa-val-server/src/CMakeLists.txt
++++ b/kuksa-val-server/src/CMakeLists.txt
+@@ -142,6 +142,7 @@ endif()
+ if(BUILD_EXE)
+   add_executable(${SERVER_EXE_NAME} main.cpp
+   )
++  add_dependencies(${SERVER_EXE_NAME} check_git)
+ 
+   if (ENABLE_COVERAGE)
+     add_coverage(${SERVER_EXE_NAME})
+-- 
+2.39.2
+
diff --git a/recipes-connectivity/kuksa-val/kuksa-val_git.bb b/recipes-connectivity/kuksa-val/kuksa-val_git.bb
index cd1bb18d7..04f6f4f64 100644
--- a/recipes-connectivity/kuksa-val/kuksa-val_git.bb
+++ b/recipes-connectivity/kuksa-val/kuksa-val_git.bb
@@ -18,10 +18,12 @@ SRC_URI += "file://kuksa-val.service \
             file://0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch;striplevel=2 \
             file://0003-Make-install-locations-configurable.patch;striplevel=2 \
             file://0004-Disable-default-fetch-and-build-of-googletest.patch;striplevel=2 \
+            file://0005-kuksa-val-server-Add-missing-check_git-dependency.patch;striplevel=2 \
             file://Server.key \
             file://Server.pem \
 "
-#            file://0001-genCerts.sh-add-Subject-Alt-Name-extension-to-server.patch;striplevel=? \
+# NOTE: Ideally this would be applied, but our S definition makes it problematic:
+#   file://0001-genCerts.sh-add-Subject-Alt-Name-extension-to-server.patch;striplevel=?
 #
 
 S = "${WORKDIR}/git/kuksa-val-server"