Merge pull request #45 from vermaete/master

version bump 3.28.1 -> 3.29.1
OpenDDS · Jul 31, 2024 · 21c1da1 · 21c1da1
2 parents 7de0819 + 0be1fc1
commit 21c1da1
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 36 deletions.
diff --git a/README b/README
@@ -37,15 +37,24 @@ II. Misc
 
 The layer contains two recipes for OpenDDS: one versioned and one not.
 
-If PREFERRED_VERSION is not specifed in your local.conf then the OpenDDS 3.28.0 recipe will be
+If PREFERRED_VERSION is not specifed in your local.conf then the OpenDDS 3.29.1 recipe will be
 selected for build by default
 
 The versioned recipe will use the DOC Group ACE/TAO v2 by default.
 To build the versioned recipe with DOC Group ACE/TAO v3 add the following to your local.conf
 
+    PACKAGECONFIG:remove:pn-opendds = " doc-group2"
+    PACKAGECONFIG:remove:pn-opendds-native = " doc-group2"
     PACKAGECONFIG:append:pn-opendds = " doc-group3"
     PACKAGECONFIG:append:pn-opendds-native = " doc-group3"
+
+Or to build with Doc Group ACE/TAO v4:
 
+    PACKAGECONFIG:remove:pn-opendds = " doc-group2"
+    PACKAGECONFIG:remove:pn-opendds-native = " doc-group2"
+    PACKAGECONFIG:append:pn-opendds = " doc-group4"
+    PACKAGECONFIG:append:pn-opendds-native = " doc-group4"
+
 The unversioned recipe is provided to allow clients, via a bbappend, to
 build - for example - the HEAD of the master branch or some other version.
 

diff --git a/conf/layer.conf b/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "opendds-layer"
 BBFILE_PATTERN_opendds-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_opendds-layer = "6"
 
-LAYERSERIES_COMPAT_opendds-layer = "kirkstone nanbield scarthgap"
+LAYERSERIES_COMPAT_opendds-layer = "kirkstone nanbield scarthgap styhead"
 LAYERDEPENDS_opendds-layer = "core"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/kas/README.md b/kas/README.md
@@ -34,6 +34,24 @@ kas build kas/rpi.yaml:kas/opendds.yaml:kas/ishapes.yaml; # iShapes demo
 kas build kas/rpi.yaml:kas/opendds.yaml:kas/ptest.yaml; # OpenDDS with Yocto ptests
 ```
 
+### ACE/TAO
+
+#### doc-group2
+
+is default
+
+#### doc-group3
+
+```
+kas build kas/rpi.yaml:kas/opendds.yaml:kas/docgroup3.yaml; # Just OpenDDS for RPi with doc-group3
+```
+
+#### doc-group4
+
+```
+kas build kas/rpi.yaml:kas/opendds.yaml:kas/docgroup4.yaml; # Just OpenDDS for RPi with doc-group4
+```
+
 ### Qemu
 
 ```

diff --git a/kas/docgroup3.yaml b/kas/docgroup3.yaml
@@ -0,0 +1,11 @@
+header:
+    version: 1
+
+local_conf_header:
+    opendds-docgroup: |
+        # remove the default doc-group2 packageconfig
+        PACKAGECONFIG:remove:pn-opendds = " doc-group2"
+        PACKAGECONFIG:remove:pn-opendds-native = " doc-group2"
+        # use doc-group4
+        PACKAGECONFIG:append:pn-opendds = " doc-group3"
+        PACKAGECONFIG:append:pn-opendds-native = " doc-group3"
diff --git a/kas/docgroup4.yaml b/kas/docgroup4.yaml
@@ -0,0 +1,11 @@
+header:
+    version: 1
+
+local_conf_header:
+    opendds-docgroup: |
+        # remove the default doc-group2 packageconfig
+        PACKAGECONFIG:remove:pn-opendds = " doc-group2"
+        PACKAGECONFIG:remove:pn-opendds-native = " doc-group2"
+        # use doc-group4
+        PACKAGECONFIG:append:pn-opendds = " doc-group4"
+        PACKAGECONFIG:append:pn-opendds-native = " doc-group4"
diff --git a/kas/ishapes.yaml b/kas/ishapes.yaml
@@ -5,7 +5,7 @@ repos:
     meta-qt5:
         url: https://github.com/meta-qt5/meta-qt5/
         path: layers/meta-qt5
-        branch: master  # Scartgap release not yet available
+        branch: scarthgap
 
 local_conf_header:
     opendds-ishapes: |

diff --git a/kas/opendds.yaml b/kas/opendds.yaml
@@ -4,6 +4,4 @@ header:
 local_conf_header:
     opendds: |
         IMAGE_INSTALL:append = " opendds"
-        PACKAGECONFIG:append:pn-opendds = " doc-group3"
-        PACKAGECONFIG:append:pn-opendds-native = " doc-group3"
         INHERIT += "cve-check"
diff --git a/kas/rpi.yaml b/kas/rpi.yaml
@@ -12,7 +12,7 @@ repos:
     meta-raspberrypi:
         url: https://github.com/agherzan/meta-raspberrypi
         path: layers/meta-raspberrypi
-        branch: master  # Scartgap release not yet available
+        branch: scarthgap
     poky:
         url: https://git.yoctoproject.org/git/poky
         path: layers/poky

diff --git a/recipes-connectivity/opendds/opendds.inc b/recipes-connectivity/opendds/opendds.inc
@@ -13,11 +13,13 @@ SRC_URI:append = " \
     ${@bb.utils.contains('PACKAGECONFIG', 'tests', 'file://0003-tests-added-dependencies-to-run-all-tests.patch', '', d)} \
     "
 
-PACKAGECONFIG ??= "security ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}"
-PACKAGECONFIG:class-native ??= ""
+PACKAGECONFIG ??= "doc-group2 security ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}"
+PACKAGECONFIG:class-native ??= "doc-group2"
 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,,"
+PACKAGECONFIG[doc-group2] = "--ace-tao=ace6tao2,,,,,doc-group3 doc-group4"
+PACKAGECONFIG[doc-group3] = "--ace-tao=ace7tao3,,,,,doc-group2 doc-group4"
+PACKAGECONFIG[doc-group4] = "--ace-tao=ace8tao4,,,,,doc-group2 doc-group3"
 PACKAGECONFIG[tests] = "--tests --gtest=${WORKDIR}/recipe-sysroot/usr, --no-tests, googletest, perl packagegroup-meta-perl perl-module-tie-array perl-module-english, ,ishapes"
 
 DEPENDS += "\

diff --git a/...nectivity/opendds/opendds/0010-WIP-test-filter-tests-that-should-not-run-on-the-tar.patch b/...nectivity/opendds/opendds/0010-WIP-test-filter-tests-that-should-not-run-on-the-tar.patch
@@ -1,6 +1,6 @@
-From c41ea08127d8cda6b95c828089b8f1df74335a14 Mon Sep 17 00:00:00 2001
+From 9f411a6b193cf5929e076ce98a0c956313dc7301 Mon Sep 17 00:00:00 2001
 From: Jan Vermaete <[email protected]>
-Date: Wed, 24 Apr 2024 20:32:45 +0200
+Date: Sun, 28 Jul 2024 09:05:08 +0200
 Subject: [PATCH 10/10] WIP: test: filter tests that should not run on the
  target
 
@@ -16,7 +16,7 @@ Signed-off-by: Jan Vermaete <[email protected]>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/tests/dcps_tests.lst b/tests/dcps_tests.lst
-index efe998a25..7a0040014 100644
+index 689b51e87c..3eb60fec8b 100644
 --- a/tests/dcps_tests.lst
 +++ b/tests/dcps_tests.lst
 @@ -77,12 +77,12 @@ tests/DCPS/Compiler/is_topic_type/run_test.pl: !DCPS_MIN
@@ -25,8 +25,8 @@ index efe998a25..7a0040014 100644
  tests/DCPS/Compiler/TryConstruct/C++11/run_test.pl: !DCPS_MIN CXX11 !OPENDDS_SAFETY_PROFILE
 -tests/DCPS/Compiler/typeobject_hash_consistency/run_test.pl: !DCPS_MIN !OPENDDS_SAFETY_PROFILE
 +tests/DCPS/Compiler/typeobject_hash_consistency/run_test.pl: !DCPS_MIN !OPENDDS_SAFETY_PROFILE !CROSS_COMPILED
- tests/DCPS/Compiler/xcdr/run_test.pl
- tests/DCPS/Compiler/xcdr/run_test.pl --dynamic: !OPENDDS_SAFETY_PROFILE !DDS_NO_CONTENT_SUBSCRIPTION
+ tests/DCPS/Compiler/xcdr/run_test.pl: CXX11
+ tests/DCPS/Compiler/xcdr/run_test.pl --dynamic: CXX11 !OPENDDS_SAFETY_PROFILE !DDS_NO_CONTENT_SUBSCRIPTION
  tests/DCPS/Compiler/XtypesExtensibility/run_test.pl: !DCPS_MIN
  tests/DCPS/Compiler/typeobject_generator/run_test.pl
 -tests/DCPS/Compiler/keywords/run_test.pl classic: !DCPS_MIN
@@ -39,7 +39,7 @@ index efe998a25..7a0040014 100644
  tests/DCPS/KeyTest/run_test.pl isbounded: !DCPS_MIN
  tests/DCPS/KeyTest/run_test.pl md5: !DCPS_MIN
 -tests/DCPS/KeyTest/run_test.pl compiler: !DCPS_MIN !TARGET !OPENDDS_SAFETY_PROFILE
-+tests/DCPS/KeyTest/run_test.pl compiler: !DCPS_MIN !TARGET !OPENDDS_SAFETY_PROFILE  !CROSS_COMPILED
++tests/DCPS/KeyTest/run_test.pl compiler: !DCPS_MIN !TARGET !OPENDDS_SAFETY_PROFILE !CROSS_COMPILED
  tests/DCPS/CompatibilityTest/run_test.pl: !DCPS_MIN !OPENDDS_SAFETY_PROFILE
  tests/DCPS/CompatibilityTest/run_test.pl rtps_disc: !DCPS_MIN RTPS !GH_ACTIONS_M10
  tests/DCPS/CompatibilityTest/run_test.pl rtps_disc_tcp: !DCPS_MIN RTPS !OPENDDS_SAFETY_PROFILE

diff --git a/recipes-connectivity/opendds/opendds_3.28.1.bb b/recipes-connectivity/opendds/opendds_3.28.1.bb
diff --git a/recipes-connectivity/opendds/opendds_3.29.1.bb b/recipes-connectivity/opendds/opendds_3.29.1.bb
@@ -0,0 +1,24 @@
+DOC_TAO2_VERSION = "6.5.21"
+DOC_TAO3_VERSION = "7.1.3"
+DOC_TAO4_VERSION = "8.0.0"
+
+DOC_TAO2_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE+TAO-${@'${DOC_TAO2_VERSION}'.replace('.','_')}/ACE+TAO-src-${DOC_TAO2_VERSION}.tar.gz"
+DOC_TAO3_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE+TAO-${@'${DOC_TAO3_VERSION}'.replace('.','_')}/ACE+TAO-src-${DOC_TAO3_VERSION}.tar.gz"
+DOC_TAO4_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE+TAO-${@'${DOC_TAO4_VERSION}'.replace('.','_')}/ACE+TAO-src-${DOC_TAO4_VERSION}.tar.gz"
+
+DDS_SRC_BRANCH = "branch-DDS-3.29"
+SRC_URI = "\
+    git://github.com/OpenDDS/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH};name=opendds \
+    ${@bb.utils.contains('PACKAGECONFIG', 'doc-group2', '${DOC_TAO2_URI};name=ace_tao2;unpack=0;subdir=git', '' ,d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'doc-group3', '${DOC_TAO3_URI};name=ace_tao3;unpack=0;subdir=git', '' ,d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'doc-group4', '${DOC_TAO4_URI};name=ace_tao4;unpack=0;subdir=git', '' ,d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'ishapes', 'file://0001-adding-the-ishapes-demo.patch', '', d)} \
+    file://0010-WIP-test-filter-tests-that-should-not-run-on-the-tar.patch \
+"
+
+require opendds.inc
+
+SRCREV = "53414662d60f5e222aad9ca4383da0d856a577df"
+SRC_URI[ace_tao2.sha256sum] = "212a9ab7be08aaca69d209d56e264143733d894d715dcb573eae909c5688e3e1"
+SRC_URI[ace_tao3.sha256sum] = "7d394cfcc71d0e90824fd1399f93640b4c9423016b88974ad3e4694c5301d96a"
+SRC_URI[ace_tao4.sha256sum] = "5767e49101a49a8597e0ba0597200eb72b3100d59217585650ddd171cbf44561"