From 5fcdeea7c39dc83ed399bc253a68971d3231d6b4 Mon Sep 17 00:00:00 2001 From: Jan Vermaete Date: Sat, 27 Jul 2024 23:02:11 +0200 Subject: [PATCH 1/3] kas: meta-raspberrypi and meta-qt5 at scarthap release Signed-off-by: Jan Vermaete --- kas/ishapes.yaml | 2 +- kas/rpi.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kas/ishapes.yaml b/kas/ishapes.yaml index 0e73f41..d694591 100644 --- 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/rpi.yaml b/kas/rpi.yaml index 85e2ab7..fdc44f3 100644 --- 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 From c38dc8cacda36b013db3a307e9427724343885a0 Mon Sep 17 00:00:00 2001 From: Jan Vermaete Date: Sun, 28 Jul 2024 22:50:30 +0200 Subject: [PATCH 2/3] opendds: version bump 3.28.1 -> 3.29.0 The doc-group4 (ace/tao) is added in this release. Modified the packageconfig options to choose between 2 (default), 3 or 4. Defaulting to 2, as the configure script of OpenDDS is doing. See README for the instruction how to choose between the versionion. Signed-off-by: Jan Vermaete --- README | 11 ++++++++- kas/README.md | 18 ++++++++++++++ kas/docgroup3.yaml | 11 +++++++++ kas/docgroup4.yaml | 11 +++++++++ kas/opendds.yaml | 2 -- recipes-connectivity/opendds/opendds.inc | 8 ++++--- ...tests-that-should-not-run-on-the-tar.patch | 12 +++++----- .../opendds/opendds_3.28.1.bb | 21 ---------------- .../opendds/opendds_3.29.0.bb | 24 +++++++++++++++++++ 9 files changed, 85 insertions(+), 33 deletions(-) create mode 100644 kas/docgroup3.yaml create mode 100644 kas/docgroup4.yaml delete mode 100644 recipes-connectivity/opendds/opendds_3.28.1.bb create mode 100644 recipes-connectivity/opendds/opendds_3.29.0.bb diff --git a/README b/README index 0e469fa..0a3a0fa 100644 --- 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.0 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/kas/README.md b/kas/README.md index 8cdb3c2..a0bec89 100644 --- 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 new file mode 100644 index 0000000..be1195b --- /dev/null +++ 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 new file mode 100644 index 0000000..cb0d5a1 --- /dev/null +++ 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/opendds.yaml b/kas/opendds.yaml index f7f3865..7b7152f 100644 --- 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/recipes-connectivity/opendds/opendds.inc b/recipes-connectivity/opendds/opendds.inc index 64623ba..205e900 100644 --- 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/recipes-connectivity/opendds/opendds/0010-WIP-test-filter-tests-that-should-not-run-on-the-tar.patch b/recipes-connectivity/opendds/opendds/0010-WIP-test-filter-tests-that-should-not-run-on-the-tar.patch index a12227d..dc69e68 100644 --- a/recipes-connectivity/opendds/opendds/0010-WIP-test-filter-tests-that-should-not-run-on-the-tar.patch +++ b/recipes-connectivity/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 -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 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 deleted file mode 100644 index 3cda9f5..0000000 --- a/recipes-connectivity/opendds/opendds_3.28.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -DOC_TAO2_VERSION = "6.5.20" -DOC_TAO3_VERSION = "7.1.3" - -DOC_TAO2_SHA256SUM = "7546d11785dc7e03b578c82f39cc9ddb8b574685453e8479ac8765827e9936ad" -DOC_TAO3_SHA256SUM = "7d394cfcc71d0e90824fd1399f93640b4c9423016b88974ad3e4694c5301d96a" - -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" - -DDS_SRC_BRANCH = "branch-DDS-3.28" -SRC_URI = "\ - git://github.com/OpenDDS/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH};name=opendds \ - ${@bb.utils.contains('PACKAGECONFIG', 'doc-group3', '${DOC_TAO3_URI};name=ace_tao;unpack=0;subdir=git', '${DOC_TAO2_URI};name=ace_tao;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 = "802922c55923db381e0a55f6e435186b60946964" -SRC_URI[ace_tao.sha256sum] = "${@bb.utils.contains('PACKAGECONFIG', 'doc-group3', '${DOC_TAO3_SHA256SUM}', '${DOC_TAO2_SHA256SUM}', d)}" diff --git a/recipes-connectivity/opendds/opendds_3.29.0.bb b/recipes-connectivity/opendds/opendds_3.29.0.bb new file mode 100644 index 0000000..b395af7 --- /dev/null +++ b/recipes-connectivity/opendds/opendds_3.29.0.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 = "6a26f82497aa467fd87b8568830cc17cf42c5bb6" +SRC_URI[ace_tao2.sha256sum] = "212a9ab7be08aaca69d209d56e264143733d894d715dcb573eae909c5688e3e1" +SRC_URI[ace_tao3.sha256sum] = "7d394cfcc71d0e90824fd1399f93640b4c9423016b88974ad3e4694c5301d96a" +SRC_URI[ace_tao4.sha256sum] = "5767e49101a49a8597e0ba0597200eb72b3100d59217585650ddd171cbf44561" From ae928d3c4205161a2214be134828293894f397f1 Mon Sep 17 00:00:00 2001 From: Jan Vermaete Date: Wed, 31 Jul 2024 18:49:19 +0200 Subject: [PATCH 3/3] opendds: version bump 3.29.0 -> 3.29.1 Signed-off-by: Jan Vermaete --- .../opendds/{opendds_3.29.0.bb => opendds_3.29.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename recipes-connectivity/opendds/{opendds_3.29.0.bb => opendds_3.29.1.bb} (96%) diff --git a/recipes-connectivity/opendds/opendds_3.29.0.bb b/recipes-connectivity/opendds/opendds_3.29.1.bb similarity index 96% rename from recipes-connectivity/opendds/opendds_3.29.0.bb rename to recipes-connectivity/opendds/opendds_3.29.1.bb index b395af7..67b41cd 100644 --- a/recipes-connectivity/opendds/opendds_3.29.0.bb +++ b/recipes-connectivity/opendds/opendds_3.29.1.bb @@ -18,7 +18,7 @@ SRC_URI = "\ require opendds.inc -SRCREV = "6a26f82497aa467fd87b8568830cc17cf42c5bb6" +SRCREV = "53414662d60f5e222aad9ca4383da0d856a577df" SRC_URI[ace_tao2.sha256sum] = "212a9ab7be08aaca69d209d56e264143733d894d715dcb573eae909c5688e3e1" SRC_URI[ace_tao3.sha256sum] = "7d394cfcc71d0e90824fd1399f93640b4c9423016b88974ad3e4694c5301d96a" SRC_URI[ace_tao4.sha256sum] = "5767e49101a49a8597e0ba0597200eb72b3100d59217585650ddd171cbf44561"