Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to latest yocto release + version bump of opendds #34

Merged
merged 7 commits into from
Jan 8, 2024
Merged

update to latest yocto release + version bump of opendds #34

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
45c5fe1
layer.conf: update of the compatible layers.
vermaete Dec 27, 2023
8525f98
opendds: version bump 3.24 -> 3.26.1
vermaete Dec 27, 2023
04114cc
opendds: oelint fixes
vermaete Dec 27, 2023
e98c1c0
Merge branch 'OpenDDS:master' into master
vermaete Dec 29, 2023
d8f4bfd
README: update the version number of OpenDDS
vermaete Dec 29, 2023
0923477
opendds.inc: set BUGTRACKER
vermaete Jan 1, 2024
3cebcae
opendds: added upstreamed patch to fix gcc issue.
vermaete Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conf/layer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "opendds-layer"
BBFILE_PATTERN_opendds-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_opendds-layer = "6"

LAYERSERIES_COMPAT_opendds-layer = "honister kirkstone"
LAYERSERIES_COMPAT_opendds-layer = "kirkstone nanbield"
LAYERDEPENDS_opendds-layer = "core"

LICENSE_PATH += "${LAYERDIR}/licenses"
13 changes: 9 additions & 4 deletions recipes-connectivity/opendds/opendds.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=11ee76f6fb51f69658b5bb8327c50b11"

inherit autotools

DEPENDS += " \
perl-native \
DEPENDS += "\
cmake-native \
opendds-native \
openssl \
xerces-c \
perl-native \
xerces-c \
"

RDEPENDS:${PN}-dev += " coreutils perl bash make"
RDEPENDS:${PN}-dev += "\
bash \
coreutils \
make \
perl \
"

S = "${WORKDIR}/git"

Expand Down
16 changes: 8 additions & 8 deletions recipes-connectivity/opendds/opendds_3.24.bb → ...es-connectivity/opendds/opendds_3.26.1.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Specify SHA-1 for the release to avoid constantly checking the upstream repo.

SRCREV = "9ededb80594119d8d54b1622cc68f4666b1479a5"
DDS_SRC_BRANCH = "branch-DDS-3.24"
SRCREV = "3d7f89e8243fbf382ce6374f900489e76894d4f9"
DDS_SRC_BRANCH = "branch-DDS-3.26"
SRC_URI = "git://github.com/OpenDDS/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH};name=opendds"

require opendds.inc

DOC_TAO2_VERSION = "6.5.19"
DOC_TAO3_VERSION = "7.1.0"
DOC_TAO2_VERSION = "6.5.20"
DOC_TAO3_VERSION = "7.1.1"

DOC_TAO2_SHA256SUM = "e0d5faf9ec6fa457747776293eab2c71502109b6655de0e62f30dace04af809c"
DOC_TAO3_SHA256SUM = "6ad3d87dcafd8b60d35bc3b483d2aa010ceacdc89e426af5d98933839f22fbea"
DOC_TAO2_SHA256SUM = "7546d11785dc7e03b578c82f39cc9ddb8b574685453e8479ac8765827e9936ad"
DOC_TAO3_SHA256SUM = "69ec3a8afffc16694a65550776b6fa8fc60846c5e3530bb7d74191bf4a43c711"

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"

ACE_TAO_OPTION ??= ""
ACE_TAO_URI ??= "${DOC_TAO2_URI}"
ACE_TAO_SHA256SUM ??= "${DOC_TAO2_SHA256SUM}"
ACE_TAO_URI ??= "${DOC_TAO2_URI}"
ACE_TAO_SHA256SUM ??= "${DOC_TAO2_SHA256SUM}"

python () {
if d.getVar('ACE_TAO_OPTION') == '--doc-group3':
Expand Down
2 changes: 1 addition & 1 deletion recipes-connectivity/opendds/opendds_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PV = "1.0+git${SRCPV}"
DDS_SRC_BRANCH ??= "master"
SRC_URI = "git://github.com/objectcomputing/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH}"

OECONF = " \
OECONF = "\
--ace-github-latest \
"

Expand Down