github CI/CD update

.github/scripts/yocto-check-layer.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -xe
+
 export DEFAULT_YOCTO_BRANCH="master"
 
 if [[ -z "${YOCTO_RELEASE}" ]]; then
@@ -11,5 +13,5 @@ git clone --depth 1 --branch $YOCTO_RELEASE https://git.yoctoproject.org/git/pok
 cd poky
 git clone --depth 1 --branch $YOCTO_RELEASE git://git.openembedded.org/meta-openembedded
 . ./oe-init-build-env build
-bitbake-layers add-layer ../meta-openembedded/meta-oe 
+bitbake-layers add-layer ../meta-openembedded/meta-oe
 yocto-check-layer --with-software-layer-signature-check --debug "$GITHUB_WORKSPACE"

.github/workflows/yocto-layer-check.yml

@@ -1,28 +1,28 @@
 name: Run Yocto Check Layer
-on: 
+on:
   pull_request:
     types: [opened, reopened]
   workflow_dispatch:
 
 env:
-  YOCTO_RELEASE: kirkstone
+  YOCTO_RELEASE: scarthgap
 
 jobs:
   yocto-check-layer:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Install yocto build dependancies
         run: |
-          sudo apt-get update
-          sudo apt-get install gawk wget git diffstat unzip texinfo gcc \
+          sudo apt update
+          sudo apt install gawk wget git diffstat unzip texinfo gcc \
           build-essential chrpath socat cpio python3 python3-pip python3-pexpect \
           xz-utils debianutils iputils-ping python3-git python3-jinja2 \
-          libegl1-mesa libsdl1.2-dev pylint3 xterm python3-subunit \
-          mesa-common-dev zstd liblz4-tool
-
+          libegl1-mesa libsdl1.2-dev python3-subunit \
+          mesa-common-dev zstd liblz4-tool file locales libacl1
+          sudo locale-gen en_US.UTF-8
       - name: Check out meta-opendds repo
         uses: actions/checkout@v4
-        
+
       - name: Run yocto check layer script
         run: |
           "${GITHUB_WORKSPACE}/.github/scripts/yocto-check-layer.sh"

recipes-connectivity/opendds/opendds.inc

@@ -7,17 +7,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=11ee76f6fb51f69658b5bb8327c50b11"
 
 inherit autotools
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "security"
 PACKAGECONFIG:class-native ??= ""
+PACKAGECONFIG[security] = "--security, , openssl xerces-c, "
 PACKAGECONFIG[ishapes] = "--qt=${STAGING_DIR_NATIVE}${prefix_native} --qt-include=${STAGING_INCDIR},,qtbase qtbase-native"
 PACKAGECONFIG[doc-group3] = "--doc-group3,,"
 
 DEPENDS += "\
     cmake-native \
     opendds-native \
-    openssl \
     perl-native \
-    xerces-c \
 "
 
 RDEPENDS:${PN}-dev += "\
@@ -59,23 +58,20 @@ OECONF:append = "\
     --verbose \
     --no-tests \
     --no-rapidjson \
-    --security \
-    --openssl=${WORKDIR}/recipe-sysroot/usr \
-    --xerces3=${WORKDIR}/recipe-sysroot/usr \
     ${PACKAGECONFIG_CONFARGS} \
 "
 
 OECONF:append:class-target = "\
     --host-tools=${STAGING_BINDIR_NATIVE}/DDS_HOST_ROOT \
     --target=linux-cross \
     --target-compiler=${S}/${HOST_PREFIX}g++ \
+    ${@bb.utils.contains('PACKAGECONFIG', 'security', '--openssl=${WORKDIR}/recipe-sysroot/usr', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'security', '--xerces3=${WORKDIR}/recipe-sysroot/usr', '', d)} \
 "
 OECONF:append:class-native = "\
     --target=linux \
     --host-tools-only \
-    --security \
-    --openssl=${WORKDIR}/recipe-sysroot-native/usr \
-    --xerces3=${WORKDIR}/recipe-sysroot-native/usr \
+    --no-security \
 "
 OECONF:append:class-nativesdk = "\
     --compiler=${S}/${HOST_PREFIX}g++ \

recipes-connectivity/opendds/opendds/0001-adding-the-ishapes-demo.patch

@@ -7,6 +7,8 @@ Without having to use the --tests during configuration.
 This would include all tests.  And depends on gtests, what
 not part of common openembedded/Yocto layers.
 
+Upstream-Status: Inappropriate [should be fixed when going to cmake https://github.com/OpenDDS/OpenDDS/pull/4374]
+
 Signed-off-by: Jan Vermaete<[email protected]>
 ---
  DDS_TAOv2.mwc | 1 +