spec/build/*.yml: Add contrib/.../uuid and contrib/.../utf8proc

This addition is needed to account for utf8proc and uuid moving
from cpukit/include to contrib. Both include directories need
to stay globally available.

spec/build/cpukit/librtemscpu.yml

@@ -8,9 +8,7 @@ cppflags: []
 cxxflags:
 - ${COVERAGE_COMPILER_FLAGS}
 enabled-by: true
-includes:
-- contrib/cpukit/uuid/
-- contrib/cpukit/utf8proc/
+includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}
   source:

spec/build/cpukit/objshell.yml

@@ -6,8 +6,7 @@ copyrights:
 cppflags: []
 cxxflags: []
 enabled-by: true
-includes:
-- contrib/cpukit/uuid/
+includes: []
 install: []
 links: []
 source:

spec/build/cpukit/objutf8.yml

@@ -6,8 +6,7 @@ copyrights:
 cppflags: []
 cxxflags: []
 enabled-by: true
-includes:
-- contrib/cpukit/utf8proc/
+includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}/
   source:

spec/build/cpukit/optincludes.yml

@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
-- set-value: cpukit/include cpukit/score/cpu/${ARCH}/include contrib/cpukit/fastlz/ contrib/cpukit/zlib/ contrib/cpukit/xz-embedded/userspace/
+- set-value: cpukit/include cpukit/score/cpu/${ARCH}/include contrib/cpukit/fastlz/ contrib/cpukit/utf8proc/ contrib/cpukit/uuid/ contrib/cpukit/zlib/ contrib/cpukit/xz-embedded/userspace/
 - substitute: null
 - env-assign: null
 build-type: option

spec/build/testsuites/fstests/fsbdpart01.yml

@@ -7,8 +7,7 @@ cppflags: []
 cxxflags: []
 enabled-by: true
 features: c cprogram
-includes:
-- contrib/cpukit/uuid/
+includes: []
 ldflags: []
 links: []
 source:

spec/build/testsuites/libtests/utf8proc01.yml

@@ -7,8 +7,7 @@ cppflags: []
 cxxflags: []
 enabled-by: true
 features: c cprogram
-includes:
-- contrib/cpukit/utf8proc/
+includes: []
 ldflags: []
 links: []
 source:

spec/build/testsuites/samples/fileio.yml

@@ -7,8 +7,7 @@ cppflags: []
 cxxflags: []
 enabled-by: true
 features: c cprogram
-includes:
-- contrib/cpukit/uuid/
+includes: []
 ldflags: []
 links: []
 source: