Skip to content

Commit

Permalink
opendds: so library files fixes
Browse files Browse the repository at this point in the history
* renamed 'FILES:SOLIBSDEV' to 'FILES_SOLIBSDEV'.
  The ':' variant doesn't exist in Yocto
  Fixed a oelint-adv issue
* SOLIBS = ".so*"
  This will add all the versions of the so libraries into the 'opendds'
  package.  What's not the default in Linux/Yocto.  The '*.so' file
  should be in the opendds-dev package.
  But without the ishapes demo isn't working.
* Removed some code in the 'do_configure'
  This was making the '.so.MAJOR' and 'so.MAJOR.MINOR' versions of the
  libraries.  Those are also not part when installing with 'configure, make, make --install'
  e.g.:
    /usr/lib/libTAO.so.3.1 was removed
    /usr/lib/libTAO.so.3 was removed

The buildhistory-diff:
    packages/cortexa72-poky-linux/opendds/opendds-dev: FILELIST:
    removed "/usr/lib/libOpenDDS_Udp.so
             /usr/lib/libTAO_Valuetype.so
             /usr/lib/libOpenDDS_Dcps.so
             /usr/lib/libTAO_ImR_Client.so
             /usr/lib/libTAO_PI.so
             /usr/lib/libACE_XML_Utils.so
             /usr/lib/libTAO_IORManip.so
             /usr/lib/libTAO_CSD_Framework.so
             /usr/lib/libTAO_BiDirGIOP.so
             /usr/lib/libTAO_IORTable.so
             /usr/lib/libOpenDDS_InfoRepoLib.so
             /usr/lib/libTAO_AnyTypeCode.so
             /usr/lib/libOpenDDS_Model.so
             /usr/lib/libTAO_PortableServer.so
             /usr/lib/libOpenDDS_Multicast.so
             /usr/lib/libOpenDDS_monitor.so
             /usr/lib/libOpenDDS_FACE.so
             /usr/lib/libTAO.so
             /usr/lib/libOpenDDS_QOS_XML_XSC_Handler.so
             /usr/lib/libTAO_Svc_Utils.so
             /usr/lib/libOpenDDS_Shmem.so
             /usr/lib/libTAO_DynamicInterface.so
             /usr/lib/libTAO_CSD_ThreadPool.so
             /usr/lib/libTAO_IDL_FE.so
             /usr/lib/libOpenDDS_Tcp.so
             /usr/lib/libTAO_Async_IORTable.so
             /usr/lib/libTAO_Codeset.so
             /usr/lib/libOpenDDS_InfoRepoDiscovery.so
             /usr/lib/libTAO_CodecFactory.so
             /usr/lib/libOpenDDS_InfoRepoServ.so
             /usr/lib/libOpenDDS_Security.so
             /usr/lib/libTAO_Messaging.so
             /usr/lib/libOpenDDS_Rtps_Udp.so
             /usr/lib/libOpenDDS_Rtps.so
             /usr/lib/libACE.so
             /usr/lib/libOpenDDS_Federator.so"
    packages/cortexa72-poky-linux/opendds/opendds-dev: RDEPENDS: removed "opendds"
    packages/cortexa72-poky-linux/opendds/opendds: FILELIST: removed "
             /usr/lib/libTAO_IDL_FE.so.3.1
             /usr/lib/libTAO_IORManip.so.3.1
             /usr/lib/libOpenDDS_InfoRepoLib.so.3
             /usr/lib/libOpenDDS_Rtps.so.3
             /usr/lib/libTAO_CodecFactory.so.3.1
             /usr/lib/libTAO_DynamicInterface.so.3.1
             /usr/lib/libOpenDDS_Multicast.so.3
             /usr/lib/libTAO_PI.so.3.1
             /usr/lib/libTAO_Messaging.so.3
             /usr/lib/libTAO_IDL_FE.so.3
             /usr/lib/libOpenDDS_Federator.so.3.26
             /usr/lib/libTAO_Async_IORTable.so.3
             /usr/lib/libTAO_IORTable.so.3.1
             /usr/lib/libOpenDDS_Shmem.so.3
             /usr/lib/libOpenDDS_Multicast.so.3.26
             /usr/lib/libOpenDDS_Dcps.so.3
             /usr/lib/libACE.so.7
             /usr/lib/libTAO_PI.so.3
             /usr/lib/libOpenDDS_Udp.so.3
             /usr/lib/libOpenDDS_Model.so.3.26
             /usr/lib/libTAO_Codeset.so.3.1
             /usr/lib/libTAO_CSD_Framework.so.3.1
             /usr/lib/libACE_XML_Utils.so.7.1
             /usr/lib/libOpenDDS_Rtps_Udp.so.3.26
             /usr/lib/libOpenDDS_Rtps.so.3.26
             /usr/lib/libTAO_CSD_ThreadPool.so.3
             /usr/lib/libTAO_CSD_ThreadPool.so.3.1
             /usr/lib/libOpenDDS_monitor.so.3.26
             /usr/lib/libOpenDDS_InfoRepoDiscovery.so.3.26
             /usr/lib/libTAO_Valuetype.so.3.1
             /usr/lib/libTAO_CSD_Framework.so.3
             /usr/lib/libOpenDDS_FACE.so.3
             /usr/lib/libOpenDDS_QOS_XML_XSC_Handler.so.3
             /usr/lib/libTAO_BiDirGIOP.so.3.1
             /usr/lib/libOpenDDS_InfoRepoServ.so.3.26
             /usr/lib/libACE_XML_Utils.so.7
             /usr/lib/libTAO_Svc_Utils.so.3.1
             /usr/lib/libOpenDDS_InfoRepoServ.so.3
             /usr/lib/libOpenDDS_Udp.so.3.26
             /usr/lib/libTAO_BiDirGIOP.so.3
             /usr/lib/libOpenDDS_FACE.so.3.26
             /usr/lib/libOpenDDS_Model.so.3
             /usr/lib/libTAO_PortableServer.so.3
             /usr/lib/libTAO.so.3
             /usr/lib/libOpenDDS_Dcps.so.3.26
             /usr/lib/libOpenDDS_monitor.so.3
             /usr/lib/libOpenDDS_Rtps_Udp.so.3
             /usr/lib/libTAO_Codeset.so.3
             /usr/lib/libTAO_AnyTypeCode.so.3.1
             /usr/lib/libOpenDDS_Security.so.3
             /usr/lib/libTAO_Async_IORTable.so.3.1
             /usr/lib/libOpenDDS_Federator.so.3
             /usr/lib/libTAO_ImR_Client.so.3
             /usr/lib/libOpenDDS_Tcp.so.3
             /usr/lib/libTAO.so.3.1
             /usr/lib/libOpenDDS_InfoRepoDiscovery.so.3
             /usr/lib/libOpenDDS_Tcp.so.3.26
             /usr/lib/libACE.so.7.1
             /usr/lib/libTAO_Messaging.so.3.1
             /usr/lib/libTAO_DynamicInterface.so.3
             /usr/lib/libOpenDDS_InfoRepoLib.so.3.26
             /usr/lib/libTAO_IORTable.so.3
             /usr/lib/libTAO_CodecFactory.so.3
             /usr/lib/libTAO_Svc_Utils.so.3
             /usr/lib/libOpenDDS_QOS_XML_XSC_Handler.so.3.26
             /usr/lib/libTAO_ImR_Client.so.3.1
             /usr/lib/libTAO_PortableServer.so.3.1
             /usr/lib/libTAO_IORManip.so.3
             /usr/lib/libTAO_Valuetype.so.3
             /usr/lib/libOpenDDS_Shmem.so.3.26
             /usr/lib/libTAO_AnyTypeCode.so.3
             /usr/lib/libOpenDDS_Security.so.3.26",
    added    "
             /usr/lib/libOpenDDS_Udp.so
             /usr/lib/libTAO_Valuetype.so
             /usr/lib/libOpenDDS_Dcps.so
             /usr/lib/libTAO_ImR_Client.so
             /usr/lib/libTAO_PI.so
             /usr/lib/libACE_XML_Utils.so
             /usr/lib/libTAO_IORManip.so
             /usr/lib/libTAO_CSD_Framework.so
             /usr/lib/libTAO_BiDirGIOP.so
             /usr/lib/libTAO_IORTable.so
             /usr/lib/libOpenDDS_InfoRepoLib.so
             /usr/lib/libTAO_AnyTypeCode.so
             /usr/lib/libOpenDDS_Model.so
             /usr/lib/libTAO_PortableServer.so
             /usr/lib/libOpenDDS_Multicast.so
             /usr/lib/libOpenDDS_monitor.so
             /usr/lib/libOpenDDS_FACE.so
             /usr/lib/libTAO.so
             /usr/lib/libOpenDDS_QOS_XML_XSC_Handler.so
             /usr/lib/libTAO_Svc_Utils.so
             /usr/lib/libOpenDDS_Shmem.so
             /usr/lib/libTAO_CSD_ThreadPool.so
             /usr/lib/libTAO_DynamicInterface.so
             /usr/lib/libTAO_IDL_FE.so
             /usr/lib/libOpenDDS_Tcp.so
             /usr/lib/libTAO_Async_IORTable.so
             /usr/lib/libTAO_Codeset.so
             /usr/lib/libOpenDDS_InfoRepoDiscovery.so
             /usr/lib/libTAO_CodecFactory.so
             /usr/lib/libOpenDDS_InfoRepoServ.so
             /usr/lib/libOpenDDS_Security.so
             /usr/lib/libTAO_Messaging.so
             /usr/lib/libOpenDDS_Rtps_Udp.so
             /usr/lib/libOpenDDS_Rtps.so
             /usr/lib/libACE.so
             /usr/lib/libOpenDDS_Federator.so"

Signed-off-by: Jan Vermaete <[email protected]>
  • Loading branch information
vermaete committed Jan 14, 2024
1 parent 5d149f8 commit 65a6e2f
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions recipes-connectivity/opendds/opendds.inc
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ OECONF:append:class-nativesdk = "\
--host-tools-only \
"

SOLIBS = ".so*"
FILES_SOLIBSDEV = ""

do_configure() {
./configure ${OECONF}
}
Expand All @@ -92,19 +95,6 @@ do_install:append:class-target() {
install -d ${D}${datadir}/dds/dds/idl
cp ${S}/dds/idl/IDLTemplate.txt ${D}${datadir}/dds/dds/idl

for shared_lib in ${D}${libdir}/*.so.*; do
if [ -f $shared_lib ]; then
baselib=$(basename $shared_lib)
shortlib=$(echo $baselib | sed 's/.so.*//')
extn=$(echo $baselib | sed -n 's/^[^.]*\.so//p')
extn=$(echo $extn | sed 's/[^. 0-9]*//g')
while [ -n "$extn" ]; do
extn=$(echo $extn | sed 's/\.[^.]*$//')
ln -sf $baselib ${D}${libdir}/$shortlib.so$extn
done
fi
done

# Copy OpenDDS source tree folders to sysroot-destdir/usr/share/DDS_ROOT
# to support building OpenDDS apps in their own layers
. ${S}/setenv.sh
Expand Down Expand Up @@ -147,9 +137,8 @@ do_install:append:class-nativesdk() {
}

INSANE_SKIP:${PN} += "dev-so"
INSANE_SKIP:${PN}-dev += "libdir"

FILES:SOLIBSDEV = ""
FILES:${PN} += "${libdir}/*.so"
FILES:${PN}-dev += "${datadir}"

BBCLASSEXTEND = "native nativesdk"

0 comments on commit 65a6e2f

Please sign in to comment.