From 2db7ec8c0a14739c5ee90eec69f17d367c02e7f5 Mon Sep 17 00:00:00 2001 From: David Banks Date: Wed, 5 Dec 2018 14:36:19 -0500 Subject: [PATCH 01/35] Updated package versions to work with RH 2.2.0. Removed fftw3_removal.path from fftlib recipe. Added a depency on python-setuptools --- .../AmFmPmBasebandDemod/rh-amfmpmbasebanddemod_2.0.0.bb | 2 +- ...eresampler_2.0.0.bb => rh-arbitraryrateresampler_2.0.1.bb} | 2 +- .../{rh-filereader_4.0.3.bb => rh-filereader_4.1.0.bb} | 2 +- .../{rh-filewriter_4.0.3.bb => rh-filewriter_4.1.0.bb} | 2 +- recipes-components/HardLimit/rh-hardlimit_2.0.0.bb | 2 +- recipes-components/RBDSDecoder/rh-rbdsdecoder_2.0.1.bb | 2 +- recipes-components/SigGen/rh-siggen_2.0.1.bb | 2 +- recipes-components/SinkSDDS/rh-sinksdds_1.0.0.bb | 2 +- .../{rh-sinkvita49_3.0.2.bb => rh-sinkvita49_3.1.0.bb} | 0 .../{rh-sourcesdds_1.1.0.bb => rh-sourcesdds_1.1.1.bb} | 2 +- .../{rh-sourcevita49_3.0.1.bb => rh-sourcevita49_3.1.0.bb} | 2 +- .../TuneFilterDecimate/rh-tunefilterdecimate_2.0.1.bb | 2 +- recipes-components/agc/rh-agc_2.0.0.bb | 2 +- recipes-components/autocorrelate/rh-autocorrelate_2.0.0.bb | 2 +- .../{rh-fastfilter_2.0.1.bb => rh-fastfilter_2.0.2.bb} | 2 +- recipes-components/psd/rh-psd_2.0.2.bb | 2 +- recipes-components/psk_soft/rh-psk-soft_2.0.1.bb | 2 +- recipes-components/sinksocket/rh-sinksocket_2.0.1.bb | 2 +- .../{rh-sourcesocket_2.1.0.bb => rh-sourcesocket_2.1.1.bb} | 2 +- .../{bulkiointerfaces_2.1.3.bb => bulkiointerfaces_2.2.0.bb} | 2 +- ...{burstiointerfaces_2.1.3.bb => burstiointerfaces_2.2.0.bb} | 2 +- .../frontendInterfaces/frontendinterfaces_2.4.3.bb | 2 +- .../{redhawk-codegen_2.1.3.bb => redhawk-codegen_2.2.0.bb} | 2 +- .../redhawk/{redhawk_2.1.3.bb => redhawk_2.2.0.bb} | 4 ++-- recipes-core/include/redhawk-repo.inc | 2 +- recipes-deps/giflib/giflib_4.1.6.bb | 2 +- recipes-deps/log4cxx/log4cxx_0.10.0.bb | 2 +- recipes-deps/omnievents/omnievents_2.8.1.bb | 2 +- recipes-devices/GPP/{gpp_2.1.3.bb => gpp_2.2.0.bb} | 2 +- .../RTL2832U/{rtl2832u_2.0.1.bb => rtl2832u_2.1.0.bb} | 0 .../USRP_UHD/{usrp-uhd_5.0.0.bb => usrp-uhd_6.1.0.bb} | 2 +- recipes-softpkg/RedhawkDevUtils/rh-redhawkdevutils_4.0.1.bb | 4 ++-- .../VITA49/{rh-vita49_3.0.1.bb => rh-vita49_5.0.0.bb} | 2 +- .../{rh-bluefilelib_2.0.1.bb => rh-bluefilelib_2.1.0.bb} | 2 +- recipes-softpkg/dsp/rh-dsp_2.0.0.bb | 2 +- .../fftlib/{rh-fftlib_2.0.0.bb => rh-fftlib_2.1.0.bb} | 3 +-- 36 files changed, 36 insertions(+), 37 deletions(-) rename recipes-components/ArbitraryRateResampler/{rh-arbitraryrateresampler_2.0.0.bb => rh-arbitraryrateresampler_2.0.1.bb} (94%) rename recipes-components/FileReader/{rh-filereader_4.0.3.bb => rh-filereader_4.1.0.bb} (95%) rename recipes-components/FileWriter/{rh-filewriter_4.0.3.bb => rh-filewriter_4.1.0.bb} (95%) rename recipes-components/SinkVITA49/{rh-sinkvita49_3.0.2.bb => rh-sinkvita49_3.1.0.bb} (100%) rename recipes-components/SourceSDDS/{rh-sourcesdds_1.1.0.bb => rh-sourcesdds_1.1.1.bb} (93%) rename recipes-components/SourceVITA49/{rh-sourcevita49_3.0.1.bb => rh-sourcevita49_3.1.0.bb} (94%) rename recipes-components/fastfilter/{rh-fastfilter_2.0.1.bb => rh-fastfilter_2.0.2.bb} (94%) rename recipes-components/sourcesocket/{rh-sourcesocket_2.1.0.bb => rh-sourcesocket_2.1.1.bb} (94%) rename recipes-core-framework/bulkioInterfaces/{bulkiointerfaces_2.1.3.bb => bulkiointerfaces_2.2.0.bb} (99%) rename recipes-core-framework/burstioInterfaces/{burstiointerfaces_2.1.3.bb => burstiointerfaces_2.2.0.bb} (99%) rename recipes-core-framework/redhawk-codegen/{redhawk-codegen_2.1.3.bb => redhawk-codegen_2.2.0.bb} (99%) rename recipes-core-framework/redhawk/{redhawk_2.1.3.bb => redhawk_2.2.0.bb} (98%) rename recipes-devices/GPP/{gpp_2.1.3.bb => gpp_2.2.0.bb} (99%) rename recipes-devices/RTL2832U/{rtl2832u_2.0.1.bb => rtl2832u_2.1.0.bb} (100%) rename recipes-devices/USRP_UHD/{usrp-uhd_5.0.0.bb => usrp-uhd_6.1.0.bb} (99%) rename recipes-softpkg/VITA49/{rh-vita49_3.0.1.bb => rh-vita49_5.0.0.bb} (95%) rename recipes-softpkg/blueFileLib/{rh-bluefilelib_2.0.1.bb => rh-bluefilelib_2.1.0.bb} (93%) rename recipes-softpkg/fftlib/{rh-fftlib_2.0.0.bb => rh-fftlib_2.1.0.bb} (84%) diff --git a/recipes-components/AmFmPmBasebandDemod/rh-amfmpmbasebanddemod_2.0.0.bb b/recipes-components/AmFmPmBasebandDemod/rh-amfmpmbasebanddemod_2.0.0.bb index f1bfc25..60c90b0 100644 --- a/recipes-components/AmFmPmBasebandDemod/rh-amfmpmbasebanddemod_2.0.0.bb +++ b/recipes-components/AmFmPmBasebandDemod/rh-amfmpmbasebanddemod_2.0.0.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-dsp" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp" -PR = "r1" +PR = "r5" diff --git a/recipes-components/ArbitraryRateResampler/rh-arbitraryrateresampler_2.0.0.bb b/recipes-components/ArbitraryRateResampler/rh-arbitraryrateresampler_2.0.1.bb similarity index 94% rename from recipes-components/ArbitraryRateResampler/rh-arbitraryrateresampler_2.0.0.bb rename to recipes-components/ArbitraryRateResampler/rh-arbitraryrateresampler_2.0.1.bb index 1698b13..da0b6fe 100644 --- a/recipes-components/ArbitraryRateResampler/rh-arbitraryrateresampler_2.0.0.bb +++ b/recipes-components/ArbitraryRateResampler/rh-arbitraryrateresampler_2.0.1.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-dsp" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp" -PR = "r2" +PR = "r4" diff --git a/recipes-components/FileReader/rh-filereader_4.0.3.bb b/recipes-components/FileReader/rh-filereader_4.1.0.bb similarity index 95% rename from recipes-components/FileReader/rh-filereader_4.0.3.bb rename to recipes-components/FileReader/rh-filereader_4.1.0.bb index dcf8576..5316646 100644 --- a/recipes-components/FileReader/rh-filereader_4.0.3.bb +++ b/recipes-components/FileReader/rh-filereader_4.1.0.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-bluefilelib rh-redhawkdevutils" RDEPENDS_${PN} = "bulkiointerfaces rh-bluefilelib rh-redhawkdevutils" -PR = "r1" +PR = "r4" diff --git a/recipes-components/FileWriter/rh-filewriter_4.0.3.bb b/recipes-components/FileWriter/rh-filewriter_4.1.0.bb similarity index 95% rename from recipes-components/FileWriter/rh-filewriter_4.0.3.bb rename to recipes-components/FileWriter/rh-filewriter_4.1.0.bb index 2ddefa1..5a2877d 100644 --- a/recipes-components/FileWriter/rh-filewriter_4.0.3.bb +++ b/recipes-components/FileWriter/rh-filewriter_4.1.0.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-bluefilelib rh-redhawkdevutils" RDEPENDS_${PN} = "bulkiointerfaces rh-bluefilelib rh-redhawkdevutils" -PR = "r1" +PR = "r4" diff --git a/recipes-components/HardLimit/rh-hardlimit_2.0.0.bb b/recipes-components/HardLimit/rh-hardlimit_2.0.0.bb index 3037d47..3559d41 100644 --- a/recipes-components/HardLimit/rh-hardlimit_2.0.0.bb +++ b/recipes-components/HardLimit/rh-hardlimit_2.0.0.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r1" +PR = "r5" diff --git a/recipes-components/RBDSDecoder/rh-rbdsdecoder_2.0.1.bb b/recipes-components/RBDSDecoder/rh-rbdsdecoder_2.0.1.bb index e74df27..bfe7def 100644 --- a/recipes-components/RBDSDecoder/rh-rbdsdecoder_2.0.1.bb +++ b/recipes-components/RBDSDecoder/rh-rbdsdecoder_2.0.1.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r1" +PR = "r5" diff --git a/recipes-components/SigGen/rh-siggen_2.0.1.bb b/recipes-components/SigGen/rh-siggen_2.0.1.bb index bc533d9..e88a51d 100644 --- a/recipes-components/SigGen/rh-siggen_2.0.1.bb +++ b/recipes-components/SigGen/rh-siggen_2.0.1.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r1" +PR = "r5" diff --git a/recipes-components/SinkSDDS/rh-sinksdds_1.0.0.bb b/recipes-components/SinkSDDS/rh-sinksdds_1.0.0.bb index f226570..3f741ff 100644 --- a/recipes-components/SinkSDDS/rh-sinksdds_1.0.0.bb +++ b/recipes-components/SinkSDDS/rh-sinksdds_1.0.0.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r1" +PR = "r5" diff --git a/recipes-components/SinkVITA49/rh-sinkvita49_3.0.2.bb b/recipes-components/SinkVITA49/rh-sinkvita49_3.1.0.bb similarity index 100% rename from recipes-components/SinkVITA49/rh-sinkvita49_3.0.2.bb rename to recipes-components/SinkVITA49/rh-sinkvita49_3.1.0.bb diff --git a/recipes-components/SourceSDDS/rh-sourcesdds_1.1.0.bb b/recipes-components/SourceSDDS/rh-sourcesdds_1.1.1.bb similarity index 93% rename from recipes-components/SourceSDDS/rh-sourcesdds_1.1.0.bb rename to recipes-components/SourceSDDS/rh-sourcesdds_1.1.1.bb index 93067dd..930224e 100644 --- a/recipes-components/SourceSDDS/rh-sourcesdds_1.1.0.bb +++ b/recipes-components/SourceSDDS/rh-sourcesdds_1.1.1.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r1" +PR = "r4" diff --git a/recipes-components/SourceVITA49/rh-sourcevita49_3.0.1.bb b/recipes-components/SourceVITA49/rh-sourcevita49_3.1.0.bb similarity index 94% rename from recipes-components/SourceVITA49/rh-sourcevita49_3.0.1.bb rename to recipes-components/SourceVITA49/rh-sourcevita49_3.1.0.bb index be3d5cf..1bf7ad0 100644 --- a/recipes-components/SourceVITA49/rh-sourcevita49_3.0.1.bb +++ b/recipes-components/SourceVITA49/rh-sourcevita49_3.1.0.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-vita49" RDEPENDS_${PN} = "bulkiointerfaces rh-vita49" -PR = "r1" +PR = "r3" diff --git a/recipes-components/TuneFilterDecimate/rh-tunefilterdecimate_2.0.1.bb b/recipes-components/TuneFilterDecimate/rh-tunefilterdecimate_2.0.1.bb index e1ecb35..925f605 100644 --- a/recipes-components/TuneFilterDecimate/rh-tunefilterdecimate_2.0.1.bb +++ b/recipes-components/TuneFilterDecimate/rh-tunefilterdecimate_2.0.1.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" -PR = "r3" +PR = "r5" diff --git a/recipes-components/agc/rh-agc_2.0.0.bb b/recipes-components/agc/rh-agc_2.0.0.bb index f3a51a0..d8c9e91 100644 --- a/recipes-components/agc/rh-agc_2.0.0.bb +++ b/recipes-components/agc/rh-agc_2.0.0.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-dsp" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp" -PR = "r1" +PR = "r5" diff --git a/recipes-components/autocorrelate/rh-autocorrelate_2.0.0.bb b/recipes-components/autocorrelate/rh-autocorrelate_2.0.0.bb index 23ac69d..5f07302 100644 --- a/recipes-components/autocorrelate/rh-autocorrelate_2.0.0.bb +++ b/recipes-components/autocorrelate/rh-autocorrelate_2.0.0.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" -PR = "r3" +PR = "r7" diff --git a/recipes-components/fastfilter/rh-fastfilter_2.0.1.bb b/recipes-components/fastfilter/rh-fastfilter_2.0.2.bb similarity index 94% rename from recipes-components/fastfilter/rh-fastfilter_2.0.1.bb rename to recipes-components/fastfilter/rh-fastfilter_2.0.2.bb index 27d06ce..ca74ed5 100644 --- a/recipes-components/fastfilter/rh-fastfilter_2.0.1.bb +++ b/recipes-components/fastfilter/rh-fastfilter_2.0.2.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" -PR = "r1" +PR = "r4" diff --git a/recipes-components/psd/rh-psd_2.0.2.bb b/recipes-components/psd/rh-psd_2.0.2.bb index bcb69a8..fd58524 100644 --- a/recipes-components/psd/rh-psd_2.0.2.bb +++ b/recipes-components/psd/rh-psd_2.0.2.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" -PR = "r2" +PR = "r6" diff --git a/recipes-components/psk_soft/rh-psk-soft_2.0.1.bb b/recipes-components/psk_soft/rh-psk-soft_2.0.1.bb index 9cbbe45..4a57ec6 100644 --- a/recipes-components/psk_soft/rh-psk-soft_2.0.1.bb +++ b/recipes-components/psk_soft/rh-psk-soft_2.0.1.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r1" +PR = "r5" diff --git a/recipes-components/sinksocket/rh-sinksocket_2.0.1.bb b/recipes-components/sinksocket/rh-sinksocket_2.0.1.bb index 4dcac18..f49ce92 100644 --- a/recipes-components/sinksocket/rh-sinksocket_2.0.1.bb +++ b/recipes-components/sinksocket/rh-sinksocket_2.0.1.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r1" +PR = "r5" diff --git a/recipes-components/sourcesocket/rh-sourcesocket_2.1.0.bb b/recipes-components/sourcesocket/rh-sourcesocket_2.1.1.bb similarity index 94% rename from recipes-components/sourcesocket/rh-sourcesocket_2.1.0.bb rename to recipes-components/sourcesocket/rh-sourcesocket_2.1.1.bb index fd8e127..31c2819 100644 --- a/recipes-components/sourcesocket/rh-sourcesocket_2.1.0.bb +++ b/recipes-components/sourcesocket/rh-sourcesocket_2.1.1.bb @@ -5,4 +5,4 @@ inherit redhawk-core-cpp-component DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r1" +PR = "r3" diff --git a/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.1.3.bb b/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.0.bb similarity index 99% rename from recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.1.3.bb rename to recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.0.bb index 0a13408..5e7597e 100644 --- a/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.1.3.bb +++ b/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.0.bb @@ -25,7 +25,7 @@ DEPENDS += "redhawk" RDEPENDS_${PN} = "redhawk" RDEPENDS_${PN}-python = "redhawk-python" -PR = "r2" +PR = "r5" SRC_URI_append = "\ file://remove_cppunit.patch \ diff --git a/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.1.3.bb b/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.0.bb similarity index 99% rename from recipes-core-framework/burstioInterfaces/burstiointerfaces_2.1.3.bb rename to recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.0.bb index ac1bfab..07fd804 100644 --- a/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.1.3.bb +++ b/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.0.bb @@ -25,7 +25,7 @@ DEPENDS += "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" RDEPENDS_${PN}-python = "bulkiointerfaces-python" -PR = "r2" +PR = "r5" SRC_URI_append = "\ file://subdir_objects.patch \ diff --git a/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.3.bb b/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.3.bb index 6a92780..6eafc46 100644 --- a/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.3.bb +++ b/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.3.bb @@ -25,7 +25,7 @@ DEPENDS += "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" RDEPENDS_${PN}-python = "bulkiointerfaces-python" -PR = "r2" +PR = "r5" SRC_URI_append = "\ file://fix_idldir_and_remove_cppunit.patch \ diff --git a/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.1.3.bb b/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.0.bb similarity index 99% rename from recipes-core-framework/redhawk-codegen/redhawk-codegen_2.1.3.bb rename to recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.0.bb index 22a8211..17b4fdd 100644 --- a/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.1.3.bb +++ b/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.0.bb @@ -26,7 +26,7 @@ DEPENDS += "redhawk" RDEPENDS_${PN} = "redhawk python" PREFERRED_VERSION_redhawk = "${REDHAWK_VERSION}" -PR = "r2" +PR = "r5" S = "${WORKDIR}/git/redhawk-core-framework/redhawk-codegen" diff --git a/recipes-core-framework/redhawk/redhawk_2.1.3.bb b/recipes-core-framework/redhawk/redhawk_2.2.0.bb similarity index 98% rename from recipes-core-framework/redhawk/redhawk_2.1.3.bb rename to recipes-core-framework/redhawk/redhawk_2.2.0.bb index 5a88fbc..45744ce 100644 --- a/recipes-core-framework/redhawk/redhawk_2.1.3.bb +++ b/recipes-core-framework/redhawk/redhawk_2.2.0.bb @@ -21,11 +21,11 @@ inherit redhawk-core-framework DESCRIPTION = "REDHAWK Core Framework" -PR = "r2" +PR = "r5" DEPENDS += "omniorbpy log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip expat boost boost-native python-numpy python-threading python-numbers python-resource ossp-uuid" RDEPENDS_${PN} = "python omniorbpy omniorb omnievents e2fsprogs apr-util apr zip expat boost python-numpy python-threading python-subprocess python-numbers python-xml python-resource ossp-uuid" -RDEPENDS_${PN}-python = "${PN} omniorb-python omniorbpy python-numpy python-threading python-numbers python-resource python-xml python-lxml" +RDEPENDS_${PN}-python = "${PN} omniorb-python omniorbpy python-numpy python-threading python-numbers python-resource python-xml python-lxml python-setuptools" PREFERRED_VERSION_omniorb = "4.2.0" diff --git a/recipes-core/include/redhawk-repo.inc b/recipes-core/include/redhawk-repo.inc index e8bb6e4..14ec827 100644 --- a/recipes-core/include/redhawk-repo.inc +++ b/recipes-core/include/redhawk-repo.inc @@ -1,4 +1,4 @@ -REDHAWK_VERSION = "2.1.3" +REDHAWK_VERSION = "2.2.0" SRC_URI = "gitsm://github.com/RedhawkSDR/redhawk.git;tag=${REDHAWK_VERSION};branch=master;protocol=git" diff --git a/recipes-deps/giflib/giflib_4.1.6.bb b/recipes-deps/giflib/giflib_4.1.6.bb index fee30b6..995dbf5 100644 --- a/recipes-deps/giflib/giflib_4.1.6.bb +++ b/recipes-deps/giflib/giflib_4.1.6.bb @@ -1,7 +1,7 @@ DESCRIPTION = "shared library for GIF images" SECTION = "libs" LICENSE = "MIT" -PR = "r2" +PR = "r9" SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2" LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" diff --git a/recipes-deps/log4cxx/log4cxx_0.10.0.bb b/recipes-deps/log4cxx/log4cxx_0.10.0.bb index 9112ae8..a2a1e4c 100644 --- a/recipes-deps/log4cxx/log4cxx_0.10.0.bb +++ b/recipes-deps/log4cxx/log4cxx_0.10.0.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" HOMEPAGE = "http://logging.apache.org/log4cxx/" -PR = "r0" +PR = "r16" SRC_URI = "git://git-wip-us.apache.org/repos/asf/logging-log4cxx.git;protocol=https" SRCREV = "03c581216a469eb2bc5cabaa686199504d257af0" diff --git a/recipes-deps/omnievents/omnievents_2.8.1.bb b/recipes-deps/omnievents/omnievents_2.8.1.bb index e669803..8069b32 100644 --- a/recipes-deps/omnievents/omnievents_2.8.1.bb +++ b/recipes-deps/omnievents/omnievents_2.8.1.bb @@ -27,7 +27,7 @@ DEPENDS += "omniorb omniorb-native boost" PREFERRED_VERSION_omniorb = "4.2.0" -PR = "r2" +PR = "r1" SRC_URI = "git://github.com/redhawksdr/omniEvents.git;branch=develop;tag=2.8.1;protocol=git \ file://config.mk.patch \ diff --git a/recipes-devices/GPP/gpp_2.1.3.bb b/recipes-devices/GPP/gpp_2.2.0.bb similarity index 99% rename from recipes-devices/GPP/gpp_2.1.3.bb rename to recipes-devices/GPP/gpp_2.2.0.bb index 288553a..5138645 100644 --- a/recipes-devices/GPP/gpp_2.1.3.bb +++ b/recipes-devices/GPP/gpp_2.2.0.bb @@ -26,7 +26,7 @@ DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" PREFERRED_VERSION_bulkiointerfaces = "2.1.3" -PR = "r2" +PR = "r5" SRC_URI_append = "\ file://configure-gpp \ diff --git a/recipes-devices/RTL2832U/rtl2832u_2.0.1.bb b/recipes-devices/RTL2832U/rtl2832u_2.1.0.bb similarity index 100% rename from recipes-devices/RTL2832U/rtl2832u_2.0.1.bb rename to recipes-devices/RTL2832U/rtl2832u_2.1.0.bb diff --git a/recipes-devices/USRP_UHD/usrp-uhd_5.0.0.bb b/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb similarity index 99% rename from recipes-devices/USRP_UHD/usrp-uhd_5.0.0.bb rename to recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb index be13693..57149e3 100644 --- a/recipes-devices/USRP_UHD/usrp-uhd_5.0.0.bb +++ b/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb @@ -25,7 +25,7 @@ RDEPENDS_${PN} = "bulkiointerfaces frontendinterfaces uhd" PREFERRED_VERSION_bulkiointerfaces = "2.0.8" PREFERRED_VERSION_frontendinterfaces = "2.3.8" -PR = "4" +PR = "2" require recipes-core/include/redhawk-repo.inc diff --git a/recipes-softpkg/RedhawkDevUtils/rh-redhawkdevutils_4.0.1.bb b/recipes-softpkg/RedhawkDevUtils/rh-redhawkdevutils_4.0.1.bb index e319ea4..c12585b 100644 --- a/recipes-softpkg/RedhawkDevUtils/rh-redhawkdevutils_4.0.1.bb +++ b/recipes-softpkg/RedhawkDevUtils/rh-redhawkdevutils_4.0.1.bb @@ -1,10 +1,10 @@ DESCRIPTION = "REDHAWK Dev Utils SoftPkg" -PR = "r2" +PR = "r6" # The core-cpp-softpkg class hierarchy handles ...a lot. inherit redhawk-core-cpp-softpkg # Depends on BULKIO DEPENDS += "bulkiointerfaces" -RDEPENDS_${PN} += "bulkiointerfaces" \ No newline at end of file +RDEPENDS_${PN} += "bulkiointerfaces" diff --git a/recipes-softpkg/VITA49/rh-vita49_3.0.1.bb b/recipes-softpkg/VITA49/rh-vita49_5.0.0.bb similarity index 95% rename from recipes-softpkg/VITA49/rh-vita49_3.0.1.bb rename to recipes-softpkg/VITA49/rh-vita49_5.0.0.bb index 32f1ef4..8d5ee8c 100644 --- a/recipes-softpkg/VITA49/rh-vita49_3.0.1.bb +++ b/recipes-softpkg/VITA49/rh-vita49_5.0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "REDHAWK VITA49 Libraries SoftPkg" -PR = "r1" +PR = "r3" # The core-cpp-softpkg class hierarchy handles ...a lot. inherit redhawk-core-cpp-softpkg diff --git a/recipes-softpkg/blueFileLib/rh-bluefilelib_2.0.1.bb b/recipes-softpkg/blueFileLib/rh-bluefilelib_2.1.0.bb similarity index 93% rename from recipes-softpkg/blueFileLib/rh-bluefilelib_2.0.1.bb rename to recipes-softpkg/blueFileLib/rh-bluefilelib_2.1.0.bb index e4386f2..a3db758 100644 --- a/recipes-softpkg/blueFileLib/rh-bluefilelib_2.0.1.bb +++ b/recipes-softpkg/blueFileLib/rh-bluefilelib_2.1.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "REDHAWK BlueFile Lib SoftPkg" -PR = "r1" +PR = "r4" # The core-cpp-softpkg class hierarchy handles ...a lot. inherit redhawk-core-cpp-softpkg diff --git a/recipes-softpkg/dsp/rh-dsp_2.0.0.bb b/recipes-softpkg/dsp/rh-dsp_2.0.0.bb index 71782ee..4dc4bcc 100644 --- a/recipes-softpkg/dsp/rh-dsp_2.0.0.bb +++ b/recipes-softpkg/dsp/rh-dsp_2.0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "REDHAWK DSP SoftPkg" -PR = "r1" +PR = "r5" # The core-cpp-softpkg class hierarchy handles ...a lot. inherit redhawk-core-cpp-softpkg diff --git a/recipes-softpkg/fftlib/rh-fftlib_2.0.0.bb b/recipes-softpkg/fftlib/rh-fftlib_2.1.0.bb similarity index 84% rename from recipes-softpkg/fftlib/rh-fftlib_2.0.0.bb rename to recipes-softpkg/fftlib/rh-fftlib_2.1.0.bb index 68090e9..72165f1 100644 --- a/recipes-softpkg/fftlib/rh-fftlib_2.0.0.bb +++ b/recipes-softpkg/fftlib/rh-fftlib_2.1.0.bb @@ -1,12 +1,11 @@ DESCRIPTION = "REDHAWK FFTLIB SoftPkg" -PR = "r1" +PR = "r2" # The core-cpp-softpkg class hierarchy handles ...a lot. inherit redhawk-core-cpp-softpkg SRC_URI_append = "\ - file://fftw3_removal.patch \ " DEPENDS += "rh-dsp fftw" From d36a7242844c3064a04fb0fb66bd6560f3aa6ee2 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Thu, 6 Dec 2018 13:25:41 +0000 Subject: [PATCH 02/35] Update usrp-uhd_6.1.0.bb PVs --- recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb b/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb index 57149e3..a101861 100644 --- a/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb +++ b/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb @@ -22,8 +22,8 @@ DESCRIPTION = "REDHAWK Device for the USRP UHD" DEPENDS = "bulkiointerfaces frontendinterfaces uhd" RDEPENDS_${PN} = "bulkiointerfaces frontendinterfaces uhd" -PREFERRED_VERSION_bulkiointerfaces = "2.0.8" -PREFERRED_VERSION_frontendinterfaces = "2.3.8" +PREFERRED_VERSION_bulkiointerfaces = "2.2.0" +PREFERRED_VERSION_frontendinterfaces = "2.4.3" PR = "2" From 34822cbd4f1d2f0c1c89d48fe0a42f795701d441 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Thu, 6 Dec 2018 13:26:44 +0000 Subject: [PATCH 03/35] Update gpp_2.2.0.bb PV against bulkio --- recipes-devices/GPP/gpp_2.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devices/GPP/gpp_2.2.0.bb b/recipes-devices/GPP/gpp_2.2.0.bb index 5138645..9edadc9 100644 --- a/recipes-devices/GPP/gpp_2.2.0.bb +++ b/recipes-devices/GPP/gpp_2.2.0.bb @@ -24,7 +24,7 @@ require recipes-core/include/redhawk-repo.inc DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PREFERRED_VERSION_bulkiointerfaces = "2.1.3" +PREFERRED_VERSION_bulkiointerfaces = "2.2.0" PR = "r5" From 561b085b0bef18d0032f844c53245fea9e71930a Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 10 Dec 2018 12:20:13 -0500 Subject: [PATCH 04/35] Patching ComponentHost.spd.xml Related: #3. This will only work if the domain is running on the device. Otherwise, the domain's ComponentHost.spd.xml needs to be patched to include (not replace) this extra implementation and include the binary built for that target implementation. --- .../files/componenthost_redhawk_processor.patch | 13 +++++++++++++ recipes-core-framework/redhawk/redhawk_2.2.0.bb | 1 + 2 files changed, 14 insertions(+) create mode 100644 recipes-core-framework/redhawk/files/componenthost_redhawk_processor.patch diff --git a/recipes-core-framework/redhawk/files/componenthost_redhawk_processor.patch b/recipes-core-framework/redhawk/files/componenthost_redhawk_processor.patch new file mode 100644 index 0000000..1641b61 --- /dev/null +++ b/recipes-core-framework/redhawk/files/componenthost_redhawk_processor.patch @@ -0,0 +1,13 @@ +Index: src/control/sdr/ComponentHost/ComponentHost.spd.xml +=================================================================== +--- src.orig/control/sdr/ComponentHost/ComponentHost.spd.xml ++++ src/control/sdr/ComponentHost/ComponentHost.spd.xml +@@ -40,7 +40,6 @@ with this program. If not, see http://w + + + +- +- ++ + + diff --git a/recipes-core-framework/redhawk/redhawk_2.2.0.bb b/recipes-core-framework/redhawk/redhawk_2.2.0.bb index 45744ce..4db10f8 100644 --- a/recipes-core-framework/redhawk/redhawk_2.2.0.bb +++ b/recipes-core-framework/redhawk/redhawk_2.2.0.bb @@ -40,6 +40,7 @@ SRC_URI_append = "\ file://remove_csh_scripts.patch \ file://ossie_cv_sdr_root_target.patch \ file://include_scoped_ptr.patch \ + file://componenthost_redhawk_processor.patch \ " S = "${WORKDIR}/git/redhawk-core-framework/redhawk/src" From 739e72b0ffdf7eaa4052442229bb52cd3e46e63f Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 10 Dec 2018 14:27:24 -0500 Subject: [PATCH 05/35] Patching GPP 'configure' to trust uname -p Relates to #2 The GPP's provided node generation script ignores the value of uname -p if it doesn't match a very narrow set of dictionary KV pairs and then slams the result to x86 like that's a good idea. This set of patches amends this behavior to instead trust what the processor is telling it. --- recipes-devices/GPP/files/configure-gpp | 3 ++- recipes-devices/GPP/files/trust-uname-p.patch | 17 +++++++++++++++++ recipes-devices/GPP/gpp_2.2.0.bb | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 recipes-devices/GPP/files/trust-uname-p.patch diff --git a/recipes-devices/GPP/files/configure-gpp b/recipes-devices/GPP/files/configure-gpp index 968a9df..2e34c2d 100755 --- a/recipes-devices/GPP/files/configure-gpp +++ b/recipes-devices/GPP/files/configure-gpp @@ -14,4 +14,5 @@ cpp/gpp_setup \ --location=./ \ --mcastnic=MCASTNIC \ --nodename=GPP_NODE_NAME \ - --gppname=GPP_NAME + --gppname=GPP_NAME \ + --addosprops diff --git a/recipes-devices/GPP/files/trust-uname-p.patch b/recipes-devices/GPP/files/trust-uname-p.patch new file mode 100644 index 0000000..a9f27a5 --- /dev/null +++ b/recipes-devices/GPP/files/trust-uname-p.patch @@ -0,0 +1,17 @@ +Index: cpp/gpp_setup +=================================================================== +--- cpp.orig/gpp_setup ++++ cpp/gpp_setup +@@ -87,10 +87,8 @@ class BaseConfigurator(object): + self.props['hostName'] = self.hostname + tmp_uname_p = platform.processor() + tmp_proc_map = {'i386':'x86', +- 'i686':'x86', +- 'x86_64':'x86_64', +- 'armv7l':'armv7l'} +- self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, 'x86') ++ 'i686':'x86'} ++ self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, tmp_uname_p) + + + diff --git a/recipes-devices/GPP/gpp_2.2.0.bb b/recipes-devices/GPP/gpp_2.2.0.bb index 9edadc9..f57f2a4 100644 --- a/recipes-devices/GPP/gpp_2.2.0.bb +++ b/recipes-devices/GPP/gpp_2.2.0.bb @@ -32,6 +32,7 @@ SRC_URI_append = "\ file://configure-gpp \ file://amflags_no_test_or_config.patch \ file://GPP_ps_e.patch \ + file://trust-uname-p.patch \ " # ################################################ From 99c761f4c12294586650530f980143d290c13b6a Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Tue, 11 Dec 2018 14:26:53 -0500 Subject: [PATCH 06/35] Bumped OmniORB, OmniORBpy, and OmniEvents versions REDHAWK 2.2.1 brought an update to OmniEvents and an edge release of OmniORB. Collected omniorb and omniorbpy into the same path since they're dependent on one another being the same version and can eventually be merged into a shared source build. --- recipes-deps/omnievents/omnievents_2.8.1.bb | 2 - .../omniorb/files/fixPythonShebang.patch | 10 -- .../omniorb/files/omniORB-cross.patch | 31 ------- .../omniorb/files/omniORB_embedded_appl.patch | 24 ----- .../omniorb/files/pyPrefixIsPrefix.patch | 20 ---- .../omniorb/files/rm_LongDouble.patch | 75 --------------- .../omniorb/{files => omniorb-init}/omniNames | 0 .../omniorb/0001-beforeauto-cross.patch | 18 ++++ .../omniorb/omniorb/0002-python-shebang.patch | 20 ++++ .../omniorb/omniorb/0003-embedded-appl.patch | 34 +++++++ .../omniorb/{files => omniorb}/omniORB.cfg | 0 .../{omniorb_4.2.0.bb => omniorb_4.2.3.bb} | 28 +++--- .../omniorbpy/0001-beforeauto-cross.patch} | 8 +- .../omniorbpy_4.2.3.bb} | 26 +++--- .../omniORBpy_modules_codesets_dir.mk.patch | 11 --- ...omniORBpy_modules_connections_dir.mk.patch | 11 --- .../files/omniORBpy_modules_dir.mk.patch | 15 --- .../omniORBpy_modules_sslTP_dir.mk.patch | 11 --- .../files/omniORBpy_modules_ziop_dir.mk.patch | 11 --- recipes-deps/omniorbpy/omniorbpy_4.2.0.bb | 93 ------------------- 20 files changed, 100 insertions(+), 348 deletions(-) delete mode 100644 recipes-deps/omniorb/files/fixPythonShebang.patch delete mode 100644 recipes-deps/omniorb/files/omniORB-cross.patch delete mode 100644 recipes-deps/omniorb/files/omniORB_embedded_appl.patch delete mode 100644 recipes-deps/omniorb/files/pyPrefixIsPrefix.patch delete mode 100644 recipes-deps/omniorb/files/rm_LongDouble.patch rename recipes-deps/omniorb/{files => omniorb-init}/omniNames (100%) create mode 100644 recipes-deps/omniorb/omniorb/0001-beforeauto-cross.patch create mode 100644 recipes-deps/omniorb/omniorb/0002-python-shebang.patch create mode 100644 recipes-deps/omniorb/omniorb/0003-embedded-appl.patch rename recipes-deps/omniorb/{files => omniorb}/omniORB.cfg (100%) rename recipes-deps/omniorb/{omniorb_4.2.0.bb => omniorb_4.2.3.bb} (72%) rename recipes-deps/{omniorbpy/files/omniORBpy-cross.patch => omniorb/omniorbpy/0001-beforeauto-cross.patch} (53%) rename recipes-deps/{omniorbpy/omniorbpy.inc => omniorb/omniorbpy_4.2.3.bb} (78%) delete mode 100644 recipes-deps/omniorbpy/files/omniORBpy_modules_codesets_dir.mk.patch delete mode 100644 recipes-deps/omniorbpy/files/omniORBpy_modules_connections_dir.mk.patch delete mode 100644 recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk.patch delete mode 100644 recipes-deps/omniorbpy/files/omniORBpy_modules_sslTP_dir.mk.patch delete mode 100644 recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk.patch delete mode 100644 recipes-deps/omniorbpy/omniorbpy_4.2.0.bb diff --git a/recipes-deps/omnievents/omnievents_2.8.1.bb b/recipes-deps/omnievents/omnievents_2.8.1.bb index 8069b32..2746b6b 100644 --- a/recipes-deps/omnievents/omnievents_2.8.1.bb +++ b/recipes-deps/omnievents/omnievents_2.8.1.bb @@ -25,8 +25,6 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=68ad62c64cc6c620126241fd429e68fe" DEPENDS += "omniorb omniorb-native boost" -PREFERRED_VERSION_omniorb = "4.2.0" - PR = "r1" SRC_URI = "git://github.com/redhawksdr/omniEvents.git;branch=develop;tag=2.8.1;protocol=git \ diff --git a/recipes-deps/omniorb/files/fixPythonShebang.patch b/recipes-deps/omniorb/files/fixPythonShebang.patch deleted file mode 100644 index 033fcc3..0000000 --- a/recipes-deps/omniorb/files/fixPythonShebang.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/src/tool/omniidl/python/scripts/omniidl.in b/src/tool/omniidl/python/scripts/omniidl.in -index d5ad0b9..a04bfb4 100644 ---- a/src/tool/omniidl/python/scripts/omniidl.in -+++ b/src/tool/omniidl/python/scripts/omniidl.in -@@ -1,4 +1,4 @@ --#!@PYTHON@ -+#!/usr/bin/env python - # -*- python -*- - # Package : omniidl - # omniidl.in Created on: 1999/10/29 diff --git a/recipes-deps/omniorb/files/omniORB-cross.patch b/recipes-deps/omniorb/files/omniORB-cross.patch deleted file mode 100644 index 3206af2..0000000 --- a/recipes-deps/omniorb/files/omniORB-cross.patch +++ /dev/null @@ -1,31 +0,0 @@ -*** omniORB-4.0.5/mk/beforeauto.mk.in 2004-10-17 20:44:56.000000000 -0400 ---- omniORB-4.0.5.new/mk/beforeauto.mk.in 2005-03-21 12:33:05.756947025 -0500 -*************** -*** 48,59 **** - # - # Tool bindir to use depends on make target - # - ifeq ($(MAKECMDGOALS),install) - TOOLBINDIR = $(INSTALLBINDIR) - else - TOOLBINDIR = $(TOP)/$(BINDIR) - endif -! - - ############################################################################# - # ---- 48,60 ---- - # - # Tool bindir to use depends on make target - # -+ ifndef TOOLBINDIR - ifeq ($(MAKECMDGOALS),install) - TOOLBINDIR = $(INSTALLBINDIR) - else - TOOLBINDIR = $(TOP)/$(BINDIR) - endif -! endif - - ############################################################################# - # - diff --git a/recipes-deps/omniorb/files/omniORB_embedded_appl.patch b/recipes-deps/omniorb/files/omniORB_embedded_appl.patch deleted file mode 100644 index 43afc58..0000000 --- a/recipes-deps/omniorb/files/omniORB_embedded_appl.patch +++ /dev/null @@ -1,24 +0,0 @@ -*** omniORB-4.0.5/src/dir.mk 2002-02-18 06:58:54.000000000 -0500 ---- omniORB-4.0.5.new/src/dir.mk 2005-03-23 09:11:04.585121450 -0500 -*************** -*** 12,20 **** - - SUBDIRS += lib - -! ifndef EmbeddedSystem - SUBDIRS += appl services -! endif - - all:: - @echo ---- 12,20 ---- - - SUBDIRS += lib - -! #ifndef EmbeddedSystem - SUBDIRS += appl services -! #endif - - all:: - @echo - diff --git a/recipes-deps/omniorb/files/pyPrefixIsPrefix.patch b/recipes-deps/omniorb/files/pyPrefixIsPrefix.patch deleted file mode 100644 index a63d5c1..0000000 --- a/recipes-deps/omniorb/files/pyPrefixIsPrefix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/tool/omniidl/cxx/dir.mk 2014-03-25 11:22:12.000000000 -0400 -+++ b/src/tool/omniidl/cxx/dir.mk 2017-01-06 13:49:56.793626502 -0500 -@@ -73,14 +73,14 @@ - - ifdef UnixPlatform - #CXXDEBUGFLAGS = -g --PYPREFIX := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.exec_prefix)') -+PYPREFIX := $(PREFIX) - PYVERSION := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.version[:3])') - PYINCDIR := $(PYPREFIX)/include - PYINCFILE := "" - DIR_CPPFLAGS += -I$(PYINCDIR)/python$(PYVERSION) \ - -I$(PYINCDIR)/python$(PYVERSION)mu \ - -I$(PYINCDIR) \ -- -DPYTHON_INCLUDE="" -+ -DPYTHON_INCLUDE=$(PYINCFILE) - endif - - - diff --git a/recipes-deps/omniorb/files/rm_LongDouble.patch b/recipes-deps/omniorb/files/rm_LongDouble.patch deleted file mode 100644 index 1c71d23..0000000 --- a/recipes-deps/omniorb/files/rm_LongDouble.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Nuar omniORB-4.2.0/include/omniORB4/CORBA_sysdep_auto.h omniORB-4.2.0-patched/include/omniORB4/CORBA_sysdep_auto.h ---- omniORB-4.2.0/include/omniORB4/CORBA_sysdep_auto.h 2013-07-18 07:28:03.000000000 -0400 -+++ omniORB-4.2.0-patched/include/omniORB4/CORBA_sysdep_auto.h 2017-01-09 08:34:47.292907892 -0500 -@@ -70,12 +70,12 @@ - - #if !defined(OMNIORB_DISABLE_LONGDOUBLE) - # if defined(SIZEOF_LONG_DOUBLE) && (SIZEOF_LONG_DOUBLE == 16) --# define HAS_LongDouble -+// # define HAS_LongDouble - # define _CORBA_LONGDOUBLE_DECL long double - # endif - - # if defined(SIZEOF_LONG_DOUBLE) && (SIZEOF_LONG_DOUBLE == 12) && defined(__i386__) --# define HAS_LongDouble -+// # define HAS_LongDouble - # define _CORBA_LONGDOUBLE_DECL long double - # endif - #endif -diff -Nuar omniORB-4.2.0/include/omniORB4/CORBA_sysdep_trad.h omniORB-4.2.0-patched/include/omniORB4/CORBA_sysdep_trad.h ---- omniORB-4.2.0/include/omniORB4/CORBA_sysdep_trad.h 2014-01-17 10:27:56.000000000 -0500 -+++ omniORB-4.2.0-patched/include/omniORB4/CORBA_sysdep_trad.h 2017-01-09 08:37:30.544545283 -0500 -@@ -136,7 +136,7 @@ - - // GCC claims to support long long on all platforms - # define HAS_LongLong --# define HAS_LongDouble -+// # define HAS_LongDouble - # define _CORBA_LONGLONG_DECL long long - # define _CORBA_ULONGLONG_DECL unsigned long long - # define _CORBA_LONGDOUBLE_DECL long double -@@ -190,7 +190,7 @@ - # define _CORBA_LONGDOUBLE_DECL long double - # define _CORBA_LONGLONG_CONST(x) (x##LL) - --# define HAS_LongDouble -+// # define HAS_LongDouble - - - #elif defined(_MSC_VER) -@@ -223,7 +223,7 @@ - - # define HAVE_STRTOULL - --# define HAS_LongDouble -+// # define HAS_LongDouble - # define HAS_LongLong - # define _CORBA_LONGDOUBLE_DECL long double - # define _CORBA_LONGLONG_DECL long long -@@ -258,7 +258,7 @@ - # define HAS_Cplusplus_const_cast - # define OMNI_REQUIRES_FQ_BASE_CTOR - # define HAS_LongLong --# define HAS_LongDouble -+// # define HAS_LongDouble - # define _CORBA_LONGLONG_DECL long long - # define _CORBA_ULONGLONG_DECL unsigned long long - # define _CORBA_LONGDOUBLE_DECL long double -@@ -283,7 +283,7 @@ - # define HAS_Cplusplus_Namespace - # define HAS_Std_Namespace - # define HAS_LongLong --# define HAS_LongDouble -+// # define HAS_LongDouble - # define _CORBA_LONGLONG_DECL long long - # define _CORBA_ULONGLONG_DECL unsigned long long - # define _CORBA_LONGDOUBLE_DECL long double -@@ -303,7 +303,7 @@ - # define _CORBA_ULONGLONG_DECL unsigned long long - # define _CORBA_LONGLONG_CONST(x) (x##LL) - # if defined(_FPWIDETYPES) --# define HAS_LongDouble -+// # define HAS_LongDouble - # define _CORBA_LONGDOUBLE_DECL long double - # endif - # ifndef HAVE_STD diff --git a/recipes-deps/omniorb/files/omniNames b/recipes-deps/omniorb/omniorb-init/omniNames similarity index 100% rename from recipes-deps/omniorb/files/omniNames rename to recipes-deps/omniorb/omniorb-init/omniNames diff --git a/recipes-deps/omniorb/omniorb/0001-beforeauto-cross.patch b/recipes-deps/omniorb/omniorb/0001-beforeauto-cross.patch new file mode 100644 index 0000000..100cc03 --- /dev/null +++ b/recipes-deps/omniorb/omniorb/0001-beforeauto-cross.patch @@ -0,0 +1,18 @@ +Index: omniORB-4.2.3/mk/beforeauto.mk.in +=================================================================== +--- omniORB-4.2.3.orig/mk/beforeauto.mk.in ++++ omniORB-4.2.3/mk/beforeauto.mk.in +@@ -62,11 +62,13 @@ endif + + ifndef EmbeddedSystem + ++ifndef TOOLBINDIR + ifeq ($(MAKECMDGOALS),install) + TOOLBINDIR = $(INSTALLBINDIR) + else + TOOLBINDIR = $(TOP)/$(BINDIR) + endif ++endif + + OMKDEPEND = $(TOOLBINDIR)/omkdepend + OMNIORB_IDL_ONLY = $(TOOLBINDIR)/omniidl -bcxx diff --git a/recipes-deps/omniorb/omniorb/0002-python-shebang.patch b/recipes-deps/omniorb/omniorb/0002-python-shebang.patch new file mode 100644 index 0000000..47e6dc4 --- /dev/null +++ b/recipes-deps/omniorb/omniorb/0002-python-shebang.patch @@ -0,0 +1,20 @@ +Index: omniORB/src/tool/omniidl/python/scripts/omniidl.in +=================================================================== +--- omniORB.orig/src/tool/omniidl/python/scripts/omniidl.in ++++ omniORB/src/tool/omniidl/python/scripts/omniidl.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python + # -*- python -*- + # Package : omniidl + # omniidl.in Created on: 1999/10/29 +Index: omniORB/src/tool/omniidl/python3/scripts/omniidl.in +=================================================================== +--- omniORB.orig/src/tool/omniidl/python3/scripts/omniidl.in ++++ omniORB/src/tool/omniidl/python3/scripts/omniidl.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python3 + # -*- python -*- + # Package : omniidl + # omniidl.in Created on: 1999/10/29 diff --git a/recipes-deps/omniorb/omniorb/0003-embedded-appl.patch b/recipes-deps/omniorb/omniorb/0003-embedded-appl.patch new file mode 100644 index 0000000..d3c9135 --- /dev/null +++ b/recipes-deps/omniorb/omniorb/0003-embedded-appl.patch @@ -0,0 +1,34 @@ +Index: omniORB-4.2.3/src/dir.mk +=================================================================== +--- omniORB-4.2.3.orig/src/dir.mk ++++ omniORB-4.2.3/src/dir.mk +@@ -6,15 +6,11 @@ export:: + @$(NoPythonError) + endif + +-ifndef EmbeddedSystem + SUBDIRS += tool +-endif + + SUBDIRS += lib + +-ifndef EmbeddedSystem + SUBDIRS += appl services +-endif + + all:: + @echo +Index: omniORB-4.2.3/src/lib/omniORB/dir.mk +=================================================================== +--- omniORB-4.2.3.orig/src/lib/omniORB/dir.mk ++++ omniORB-4.2.3/src/lib/omniORB/dir.mk +@@ -3,9 +3,7 @@ + + PYSUBDIR = $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.version[0] == "3" and "python3" or "python")') + +-ifndef EmbeddedSystem + SUBDIRS = $(PYSUBDIR) +-endif + + SUBDIRS += orbcore + diff --git a/recipes-deps/omniorb/files/omniORB.cfg b/recipes-deps/omniorb/omniorb/omniORB.cfg similarity index 100% rename from recipes-deps/omniorb/files/omniORB.cfg rename to recipes-deps/omniorb/omniorb/omniORB.cfg diff --git a/recipes-deps/omniorb/omniorb_4.2.0.bb b/recipes-deps/omniorb/omniorb_4.2.3.bb similarity index 72% rename from recipes-deps/omniorb/omniorb_4.2.0.bb rename to recipes-deps/omniorb/omniorb_4.2.3.bb index 007d9f6..15a981e 100644 --- a/recipes-deps/omniorb/omniorb_4.2.0.bb +++ b/recipes-deps/omniorb/omniorb_4.2.3.bb @@ -22,42 +22,38 @@ DESCRIPTION = "OmniORB High Performance ORB" SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=75b02c2872421380bbd47781d2bd75d3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1b422f7cda3870b9c4b040b68ba1c0fe" DEPENDS += "omniorb-native python" -DEPENDS_virtclass-native += "python-native" +DEPENDS_class-native += "python-native" RDEPENDS_${PN}-python += "python" PACKAGES += "${PN}-python" PROVIDES += "${PN}-python" -SRC_URI_BASE = "http://downloads.sourceforge.net/omniorb/omniORB-4.2.0.tar.bz2;name=omniORB420tarbz2" +SRC_URI_BASE = "http://downloads.sourceforge.net/omniorb/omniORB-${PV}.tar.bz2;name=omniORB" +SRC_URI[omniORB.md5sum] = "10a30bae5e1fb4563b47891c6cdf2b5c" +SRC_URI[omniORB.sha256sum] = "26412ac08ab495ce5a6a8e40961fa20b7c43f623c6c26b616d210ca32f078bca" SRC_URI = "${SRC_URI_BASE}" -SRC_URI_virtclass-native = "${SRC_URI_BASE}" -SRC_URI[omniORB420tarbz2.md5sum] = "f1e104d0a2df92829c1b37a853f4805d" -SRC_URI[omniORB420tarbz2.sha256sum] = "74c273fc997c2881b128feb52182dbe067acfecc4cf37475f43c104338eba8bc" +SRC_URI_class-native = "${SRC_URI_BASE}" SRC_URI_append = "\ file://omniORB.cfg \ - file://omniORB-cross.patch \ - file://omniORB_embedded_appl.patch \ - file://pyPrefixIsPrefix.patch \ - file://fixPythonShebang.patch \ - file://rm_LongDouble.patch \ + file://0001-beforeauto-cross.patch \ + file://0002-python-shebang.patch \ + file://0003-embedded-appl.patch \ " S = "${WORKDIR}/omniORB-${PV}" # Here we need python libraries and the softlink for the omniidlmodule, we have to disable the check for soft links. -# Alternativly, we could packge this into the dev package and then pull that in but that would also get all the headers +# Alternativly, we could package this into the dev package and then pull that in but that would also get all the headers # and idl files INSANE_SKIP_${PN}-python += "dev-so" FILES_${PN}-python += "${libdir}/python2.7/site-packages/_omniidlmodule.so*" FILES_${PN}-python += "${libdir}/python2.7/site-packages/omniidl/*" FILES_${PN}-python += "${libdir}/python2.7/site-packages/omniidl_be/*" -FILES_${PN}-dbg += "${libdir}/python2.7/site-packages/.debug/_omniidlmodule.so.4.1" - TARGET_CC_ARCH += "${LDFLAGS}" @@ -70,7 +66,7 @@ do_compile () { oe_runmake } -do_compile_virtclass-native () { +do_compile_class-native () { oe_runmake } @@ -82,5 +78,3 @@ do_install () { } BBCLASSEXTEND = "native" - -NATIVE_INSTALL_WORKS = "1" diff --git a/recipes-deps/omniorbpy/files/omniORBpy-cross.patch b/recipes-deps/omniorb/omniorbpy/0001-beforeauto-cross.patch similarity index 53% rename from recipes-deps/omniorbpy/files/omniORBpy-cross.patch rename to recipes-deps/omniorb/omniorbpy/0001-beforeauto-cross.patch index cd4f65b..8a77903 100644 --- a/recipes-deps/omniorbpy/files/omniORBpy-cross.patch +++ b/recipes-deps/omniorb/omniorbpy/0001-beforeauto-cross.patch @@ -1,6 +1,8 @@ ---- omniORBpy-3.4/mk/beforeauto.mk.in 2009-06-18 08:51:20.000000000 +0000 -+++ omniORBpy-3.4.new/mk/beforeauto.mk.in 2010-10-21 13:41:01.285106847 +0000 -@@ -31,11 +31,13 @@ +Index: omniORBpy-4.2.3/mk/beforeauto.mk.in +=================================================================== +--- omniORBpy-4.2.3.orig/mk/beforeauto.mk.in ++++ omniORBpy-4.2.3/mk/beforeauto.mk.in +@@ -30,11 +30,13 @@ MAKEDIR = mk LIBDIR = lib BINDIR = bin diff --git a/recipes-deps/omniorbpy/omniorbpy.inc b/recipes-deps/omniorb/omniorbpy_4.2.3.bb similarity index 78% rename from recipes-deps/omniorbpy/omniorbpy.inc rename to recipes-deps/omniorb/omniorbpy_4.2.3.bb index 5f32be4..36193b1 100644 --- a/recipes-deps/omniorbpy/omniorbpy.inc +++ b/recipes-deps/omniorb/omniorbpy_4.2.3.bb @@ -22,26 +22,27 @@ DESCRIPTION = "Python bindings for omniORB" SECTION = "devel" PRIORITY = "optional" LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=f1ce71f6a61e941ba8891e815bb61801" DEPENDS += "omniorb omniorbpy-native python" -DEPENDS_virtclass-native += "omniorb-native python-native" +DEPENDS_class-native += "omniorb-native python-native" # This will allow this file to create symlinks to so files without throwing an error INSANE_SKIP_${PN} = "dev-so" +SRC_URI_BASE = "http://downloads.sourceforge.net/omniorb/omniORBpy-${PV}.tar.bz2;name=omniORBpy" +SRC_URI = "${SRC_URI_BASE}" +SRC_URI_class-native = "${SRC_URI_BASE}" +SRC_URI[omniORBpy.md5sum] = "7a48a9c731a70490446d83c4641ae6ff" +SRC_URI[omniORBpy.sha256sum] = "5c601888e57c7664324357a1be50f2739c468057b46fba29821a25069fc0aee5" + SRC_URI_append = "\ - file://omniORBpy-cross.patch \ - file://omniORBpy_modules_codesets_dir.mk.patch \ - file://omniORBpy_modules_connections_dir.mk.patch \ - file://omniORBpy_modules_sslTP_dir.mk.patch \ - file://omniORBpy_modules_dir.mk-${PV}.patch \ + file://0001-beforeauto-cross.patch \ " S = "${WORKDIR}/omniORBpy-${PV}" -EXTRA_OECONF = "--with-omniorb=${STAGING_DIR_TARGET}/usr" -EXTRA_OECONF_virtclass-native = "--with-omniorb=${STAGING_DIR_NATIVE}/usr" - +EXTRA_OECONF = "--with-omniorb=${STAGING_EXECPREFIXDIR}" +EXTRA_OECONF_class-native = "--with-omniorb=${exec_prefix}" FILES_${PN} += " \ ${libdir}/python2.7/site-packages/*.pth \ @@ -69,7 +70,7 @@ do_compile () { oe_runmake } -do_compile_virtclass-native () { +do_compile_class-native () { oe_runmake } @@ -79,6 +80,3 @@ do_install_append() { } BBCLASSEXTEND = "native" - -NATIVE_INSTALL_WORKS = "1" - diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_codesets_dir.mk.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_codesets_dir.mk.patch deleted file mode 100644 index c1a2454..0000000 --- a/recipes-deps/omniorbpy/files/omniORBpy_modules_codesets_dir.mk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- omniORBpy-3.4/modules/codesets/dir.mk 2006-01-19 12:28:44.000000000 -0500 -+++ omniORBpy-3.4.new/modules/codesets/dir.mk 2011-03-15 23:50:18.618692298 -0400 -@@ -25,7 +25,7 @@ - PYINCDIR := $(PYPREFIX)/include - PYINCFILE := "" - PYINCTHRD := "" --DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) -+DIR_CPPFLAGS += -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) - DIR_CPPFLAGS += $(CORBA_CPPFLAGS) - - endif diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_connections_dir.mk.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_connections_dir.mk.patch deleted file mode 100644 index 980a59a..0000000 --- a/recipes-deps/omniorbpy/files/omniORBpy_modules_connections_dir.mk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- omniORBpy-3.4/modules/connections/dir.mk 2008-08-08 09:47:27.000000000 -0400 -+++ omniORBpy-3.4.new/modules/connections/dir.mk 2011-03-15 23:50:00.099130181 -0400 -@@ -23,7 +23,7 @@ - PYINCDIR := $(PYPREFIX)/include - PYINCFILE := "" - PYINCTHRD := "" --DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) -+DIR_CPPFLAGS += -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) - DIR_CPPFLAGS += $(CORBA_CPPFLAGS) - - endif diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk.patch deleted file mode 100644 index 14858f4..0000000 --- a/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- omniORBpy-4.2.0/modules/dir.mk 2013-06-19 09:55:16.000000000 -0400 -+++ omniORBpy-4.2.0-patched/modules/dir.mk 2017-01-09 10:17:18.310669203 -0500 -@@ -75,9 +75,9 @@ - PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix') - PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]') - PYINCDIR := $(PYPREFIX)/include --PYINCFILE := "" --PYINCTHRD := "" --DIR_CPPFLAGS += -I$(PYINCDIR)/python$(PYVERSION) -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) -+PYINCFILE := "" -+PYINCTHRD := "" -+DIR_CPPFLAGS += -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) - DIR_CPPFLAGS += $(CORBA_CPPFLAGS) - - endif diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_sslTP_dir.mk.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_sslTP_dir.mk.patch deleted file mode 100644 index 0568e55..0000000 --- a/recipes-deps/omniorbpy/files/omniORBpy_modules_sslTP_dir.mk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- omniORBpy-3.4/modules/sslTP/dir.mk 2006-01-19 12:28:44.000000000 -0500 -+++ omniORBpy-3.4.new/modules/sslTP/dir.mk 2011-03-15 23:49:38.498921066 -0400 -@@ -24,7 +24,7 @@ - PYINCDIR := $(PYPREFIX)/include - PYINCFILE := "" - PYINCTHRD := "" --DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) -+DIR_CPPFLAGS += -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) - DIR_CPPFLAGS += $(CORBA_CPPFLAGS) - - endif diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk.patch deleted file mode 100644 index 5a38e23..0000000 --- a/recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- omniORBpy-4.2.0/modules/ziop/dir.mk 2013-06-19 09:55:16.000000000 -0400 -+++ omniORBpy-4.2.0-patched/modules/ziop/dir.mk 2017-01-09 10:28:41.431824214 -0500 -@@ -22,7 +22,7 @@ - PYINCDIR := $(PYPREFIX)/include - PYINCFILE := "" - PYINCTHRD := "" --DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) -+DIR_CPPFLAGS += -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) - DIR_CPPFLAGS += $(CORBA_CPPFLAGS) - - endif diff --git a/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb b/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb deleted file mode 100644 index e985a0e..0000000 --- a/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb +++ /dev/null @@ -1,93 +0,0 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# - -DESCRIPTION = "Python bindings for omniORB" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589" -DEPENDS += "omniorb omniorbpy-native python" -DEPENDS_virtclass-native += "omniorb-native python-native" - -# This will allow this file to create symlinks to so files without throwing an error -INSANE_SKIP_${PN} = "dev-so" - - -SRC_URI_BASE = "http://downloads.sourceforge.net/omniorb/omniORBpy-4.2.0.tar.bz2;name=omniORBpytarbz2" -SRC_URI = "${SRC_URI_BASE}" -SRC_URI_virtclass-native = "${SRC_URI_BASE}" - -SRC_URI[omniORBpytarbz2.md5sum] = "50ecde547c865aad2074d30224779412" -SRC_URI[omniORBpytarbz2.sha256sum] = "c82b3bafacbb93cfaace41765219155f2b24eb3781369bba0581feb1dc50fe5e" - -PREFERRED_VERSION_omniorb = "4.2.0" - -SRC_URI_append = "\ - file://omniORBpy-cross.patch \ - file://omniORBpy_modules_codesets_dir.mk.patch \ - file://omniORBpy_modules_connections_dir.mk.patch \ - file://omniORBpy_modules_sslTP_dir.mk.patch \ - file://omniORBpy_modules_dir.mk.patch \ - file://omniORBpy_modules_ziop_dir.mk.patch \ -" - -S = "${WORKDIR}/omniORBpy-${PV}" - -EXTRA_OECONF = "--with-omniorb=${STAGING_EXECPREFIXDIR}" -EXTRA_OECONF_virtclass-native = "--with-omniorb=${exec_prefix}" - -FILES_${PN} += " \ - ${libdir}/python2.7/site-packages/*.pth \ - ${libdir}/python2.7/site-packages/*.pyo \ - ${libdir}/python2.7/site-packages/*.py \ - ${libdir}/python2.7/site-packages/*.pyc \ - ${libdir}/python2.7/site-packages/*.so.* \ - ${libdir}/python2.7/site-packages/*.so \ - ${libdir}/python2.7/site-packages/omniidl_be/* \ - ${libdir}/python2.7/site-packages/omniORB/* \ - ${libdir}/python2.7/site-packages/omniORB/COS/* \ - ${libdir}/python2.7/site-packages/omniORB/COS/*/* \ - ${libdir}/python2.7/site-packages/CosNaming__POA/* \ - ${libdir}/python2.7/site-packages/CosNaming/* \ -" - -inherit autotools pkgconfig distutils-base - -#ERROR: QA Issue with omniorbpy-dev: No GNU_HASH in the elf binary... -#See for more info: http://old.nabble.com/No-GNU_HASH-found-in-elf-binary-td23072960.html -TARGET_CC_ARCH += "${LDFLAGS}" - -do_compile () { - export OMNIORB_BINDIR=${STAGING_BINDIR_NATIVE} - oe_runmake -} - -do_compile_virtclass-native () { - oe_runmake -} - -# omniOrb already provides the init file -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/omniidl_be/__init__.* -} - -BBCLASSEXTEND = "native" - -NATIVE_INSTALL_WORKS = "1" From 17f2fb1a8e5731d71c091df4f7dfa44904ff6733 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Tue, 11 Dec 2018 14:35:42 -0500 Subject: [PATCH 07/35] Rolled to REDHAWK 2.2.1 Also addressed PREFERRED_VERSION needing to be global. Now setting REDHAWK_VERSION will include the appropriate set of preferred versions as well as configure the shared source URI (in prep of shared source multi-version builds). --- conf/layer.conf | 17 +++++++ conf/versions/omniorb-4.2.3.inc | 3 ++ conf/versions/redhawk-2.2.1.inc | 44 +++++++++++++++++++ conf/versions/redhawk.inc | 11 +++++ ...ces_2.2.0.bb => bulkiointerfaces_2.2.1.bb} | 2 +- ...es_2.2.0.bb => burstiointerfaces_2.2.1.bb} | 2 +- ...s_2.4.3.bb => frontendinterfaces_2.4.4.bb} | 2 +- ...egen_2.2.0.bb => redhawk-codegen_2.2.1.bb} | 3 +- .../{redhawk_2.2.0.bb => redhawk_2.2.1.bb} | 4 +- recipes-core/include/redhawk-repo.inc | 12 ----- .../GPP/files/amflags_no_test_or_config.patch | 20 ++++++--- .../GPP/{gpp_2.2.0.bb => gpp_2.2.1.bb} | 7 ++- recipes-devices/RTL2832U/rtl2832u_2.1.0.bb | 5 +-- recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb | 5 +-- .../node-deployer/node-deployer_1.0.0.bb | 1 - .../template-cpp/template-cpp.bb.tpl | 4 -- 16 files changed, 98 insertions(+), 44 deletions(-) create mode 100644 conf/versions/omniorb-4.2.3.inc create mode 100644 conf/versions/redhawk-2.2.1.inc create mode 100644 conf/versions/redhawk.inc rename recipes-core-framework/bulkioInterfaces/{bulkiointerfaces_2.2.0.bb => bulkiointerfaces_2.2.1.bb} (99%) rename recipes-core-framework/burstioInterfaces/{burstiointerfaces_2.2.0.bb => burstiointerfaces_2.2.1.bb} (99%) rename recipes-core-framework/frontendInterfaces/{frontendinterfaces_2.4.3.bb => frontendinterfaces_2.4.4.bb} (99%) rename recipes-core-framework/redhawk-codegen/{redhawk-codegen_2.2.0.bb => redhawk-codegen_2.2.1.bb} (96%) rename recipes-core-framework/redhawk/{redhawk_2.2.0.bb => redhawk_2.2.1.bb} (98%) rename recipes-devices/GPP/{gpp_2.2.0.bb => gpp_2.2.1.bb} (93%) diff --git a/conf/layer.conf b/conf/layer.conf index 7d7495f..9b39053 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -35,3 +35,20 @@ LAYERDEPENDS_redhawk-sdr = "\ networking-layer \ meta-python \ " + +# ##################################################### +# Set this in your local.conf to override the version # +# (if available in this layer). # +# ##################################################### +REDHAWK_VERSION ?= "2.2.1" +require conf/versions/redhawk.inc + +# Dynamic architecture patch for whatever ${REDHAWK_PROCESSOR} is set to. +# 1. This takes whatever is ${NODE_CONFIG_SCRIPT} and find where it hard-codes the architecture look-up, +# replacing it for ${REDHAWK_PROCESSOR} +# 2. This changes processor name x86_64 and replaces it with ${REDHAWK_PROCESSOR}. +# 3. This removes processor name x86. +REDHAWK_PROCESSOR ?= "x86_64" +REDHAWK_PROCESSOR_rpi ?= "armv7l" +REDHAWK_PROCESSOR_zynq ?= "armv7l" +REDHAWK_PROCESSOR_zynqmp ?= "aarch64" diff --git a/conf/versions/omniorb-4.2.3.inc b/conf/versions/omniorb-4.2.3.inc new file mode 100644 index 0000000..6c663f0 --- /dev/null +++ b/conf/versions/omniorb-4.2.3.inc @@ -0,0 +1,3 @@ +PREFERRED_VERSION_omniorb = "4.2.3" +PREFERRED_VERSION_omniorbpy = "4.2.3" +PREFERRED_VERSION_omnievents = "2.8.1" diff --git a/conf/versions/redhawk-2.2.1.inc b/conf/versions/redhawk-2.2.1.inc new file mode 100644 index 0000000..eb862dd --- /dev/null +++ b/conf/versions/redhawk-2.2.1.inc @@ -0,0 +1,44 @@ +# Core Framework +PREFERRED_VERSION_redhawk = "2.2.1" +PREFERRED_VERSION_bulkiointerfaces = "2.2.1" +PREFERRED_VERSION_burstiointerfaces = "2.2.1" +PREFERRED_VERSION_frontendinterfaces = "2.4.4" +PREFERRED_VERSION_redhawk-codegen = "2.2.1" + +# Components +PREFERRED_VERSION_rh-agc = "2.0.0" +PREFERRED_VERSION_rh-amfmpmbasebanddemod = "2.0.0" +PREFERRED_VERSION_rh-arbitraryrateresampler = "2.0.1" +PREFERRED_VERSION_rh-autocorrelate = "2.0.0" +PREFERRED_VERSION_rh-fastfilter = "2.0.2" +PREFERRED_VERSION_rh-filereader = "4.1.0" +PREFERRED_VERSION_rh-filewriter = "4.1.0" +PREFERRED_VERSION_rh-hardlimit = "2.0.0" +PREFERRED_VERSION_rh-psd = "2.0.2" +PREFERRED_VERSION_rh-psk-soft = "2.0.1" +PREFERRED_VERSION_rh-rbdsdecoder = "2.0.1" +PREFERRED_VERSION_rh-siggen = "2.0.1" +PREFERRED_VERSION_rh-sinksdds = "1.0.0" +PREFERRED_VERSION_rh-sinksocket = "2.0.1" +PREFERRED_VERSION_rh-sinkvita49 = "3.1.0" +PREFERRED_VERSION_rh-sourcesdds = "1.1.1" +PREFERRED_VERSION_rh-sourcesocket = "2.1.1" +PREFERRED_VERSION_rh-sourcevita49 = "3.1.0" +PREFERRED_VERSION_rh-tunefilterdecimate = "2.0.1" + +# SoftPkgs +PREFERRED_VERSION_rh-bluefilelib = "2.1.0" +PREFERRED_VERSION_rh-dsp = "2.0.0" +PREFERRED_VERSION_rh-fftlib = "2.1.0" +PREFERRED_VERSION_rh-redhawkdevutils = "4.0.1" +PREFERRED_VERSION_rh-vita49 = "5.0.0" + +# Devices +PREFERRED_VERSION_gpp = "2.2.1" +PREFERRED_VERSION_rtl2832u = "2.1.0" +PREFERRED_VERSION_usrp-uhd = "6.1.0" + +# Other deps +PREFERRED_VERSION_rtlsdr = "0.5.2" +PREFERRED_VERSION_xsd = "4.0.0" +require omniorb-4.2.3.inc diff --git a/conf/versions/redhawk.inc b/conf/versions/redhawk.inc new file mode 100644 index 0000000..90cf46f --- /dev/null +++ b/conf/versions/redhawk.inc @@ -0,0 +1,11 @@ +require redhawk-${REDHAWK_VERSION}.inc + +# Dynamic architecture patch for whatever ${REDHAWK_PROCESSOR} is set to. +# 1. This takes whatever is ${NODE_CONFIG_SCRIPT} and find where it hard-codes the architecture look-up, +# replacing it for ${REDHAWK_PROCESSOR} +# 2. This changes processor name x86_64 and replaces it with ${REDHAWK_PROCESSOR}. +# 3. This removes processor name x86. +REDHAWK_PROCESSOR ?= "x86_64" +REDHAWK_PROCESSOR_rpi ?= "armv7l" +REDHAWK_PROCESSOR_zynq ?= "armv7l" +REDHAWK_PROCESSOR_zynqmp ?= "aarch64" \ No newline at end of file diff --git a/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.0.bb b/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.1.bb similarity index 99% rename from recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.0.bb rename to recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.1.bb index 5e7597e..0a13408 100644 --- a/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.0.bb +++ b/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.1.bb @@ -25,7 +25,7 @@ DEPENDS += "redhawk" RDEPENDS_${PN} = "redhawk" RDEPENDS_${PN}-python = "redhawk-python" -PR = "r5" +PR = "r2" SRC_URI_append = "\ file://remove_cppunit.patch \ diff --git a/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.0.bb b/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.1.bb similarity index 99% rename from recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.0.bb rename to recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.1.bb index 07fd804..ac1bfab 100644 --- a/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.0.bb +++ b/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.1.bb @@ -25,7 +25,7 @@ DEPENDS += "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" RDEPENDS_${PN}-python = "bulkiointerfaces-python" -PR = "r5" +PR = "r2" SRC_URI_append = "\ file://subdir_objects.patch \ diff --git a/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.3.bb b/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.4.bb similarity index 99% rename from recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.3.bb rename to recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.4.bb index 6eafc46..6a92780 100644 --- a/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.3.bb +++ b/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.4.bb @@ -25,7 +25,7 @@ DEPENDS += "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" RDEPENDS_${PN}-python = "bulkiointerfaces-python" -PR = "r5" +PR = "r2" SRC_URI_append = "\ file://fix_idldir_and_remove_cppunit.patch \ diff --git a/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.0.bb b/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.1.bb similarity index 96% rename from recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.0.bb rename to recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.1.bb index 17b4fdd..0170c1f 100644 --- a/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.0.bb +++ b/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.1.bb @@ -24,9 +24,8 @@ DESCRIPTION = "REDHAWK Codegen" DEPENDS += "redhawk" RDEPENDS_${PN} = "redhawk python" -PREFERRED_VERSION_redhawk = "${REDHAWK_VERSION}" -PR = "r5" +PR = "r2" S = "${WORKDIR}/git/redhawk-core-framework/redhawk-codegen" diff --git a/recipes-core-framework/redhawk/redhawk_2.2.0.bb b/recipes-core-framework/redhawk/redhawk_2.2.1.bb similarity index 98% rename from recipes-core-framework/redhawk/redhawk_2.2.0.bb rename to recipes-core-framework/redhawk/redhawk_2.2.1.bb index 4db10f8..04573e8 100644 --- a/recipes-core-framework/redhawk/redhawk_2.2.0.bb +++ b/recipes-core-framework/redhawk/redhawk_2.2.1.bb @@ -21,14 +21,12 @@ inherit redhawk-core-framework DESCRIPTION = "REDHAWK Core Framework" -PR = "r5" +PR = "r2" DEPENDS += "omniorbpy log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip expat boost boost-native python-numpy python-threading python-numbers python-resource ossp-uuid" RDEPENDS_${PN} = "python omniorbpy omniorb omnievents e2fsprogs apr-util apr zip expat boost python-numpy python-threading python-subprocess python-numbers python-xml python-resource ossp-uuid" RDEPENDS_${PN}-python = "${PN} omniorb-python omniorbpy python-numpy python-threading python-numbers python-resource python-xml python-lxml python-setuptools" -PREFERRED_VERSION_omniorb = "4.2.0" - SRC_URI_append = "\ file://uuid_python_package.patch \ file://redhawk_processor.patch \ diff --git a/recipes-core/include/redhawk-repo.inc b/recipes-core/include/redhawk-repo.inc index 14ec827..01f7124 100644 --- a/recipes-core/include/redhawk-repo.inc +++ b/recipes-core/include/redhawk-repo.inc @@ -1,18 +1,6 @@ -REDHAWK_VERSION = "2.2.0" - SRC_URI = "gitsm://github.com/RedhawkSDR/redhawk.git;tag=${REDHAWK_VERSION};branch=master;protocol=git" HOMEPAGE = "http://www.redhawksdr.org" LICENSE = "LGPL-3.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/redhawk-core-framework/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -# Dynamic architecture patch for whatever ${REDHAWK_PROCESSOR} is set to. -# 1. This takes whatever is ${NODE_CONFIG_SCRIPT} and find where it hard-codes the architecture look-up, -# replacing it for ${REDHAWK_PROCESSOR} -# 2. This changes processor name x86_64 and replaces it with ${REDHAWK_PROCESSOR}. -# 3. This removes processor name x86. -REDHAWK_PROCESSOR ?= "x86_64" -REDHAWK_PROCESSOR_rpi ?= "armv7l" -REDHAWK_PROCESSOR_zynq ?= "armv7l" -REDHAWK_PROCESSOR_zynqmp ?= "aarch64" diff --git a/recipes-devices/GPP/files/amflags_no_test_or_config.patch b/recipes-devices/GPP/files/amflags_no_test_or_config.patch index b31d64b..b57c437 100644 --- a/recipes-devices/GPP/files/amflags_no_test_or_config.patch +++ b/recipes-devices/GPP/files/amflags_no_test_or_config.patch @@ -1,6 +1,8 @@ ---- cpp/Makefile.am 2017-07-29 22:16:53.470273530 -0400 -+++ cpp-patched/Makefile.am 2017-07-29 22:19:39.173311677 -0400 -@@ -18,21 +18,13 @@ +Index: cpp/Makefile.am +=================================================================== +--- cpp.orig/Makefile.am ++++ cpp/Makefile.am +@@ -18,25 +18,17 @@ # along with this program. If not, see http://www.gnu.org/licenses/. # ossieName = GPP @@ -13,7 +15,11 @@ +xmldir = $(SDR_ROOT)/dev/devices/GPP/ dist_xml_DATA = ../GPP.scd.xml ../GPP.prf.xml ../GPP.spd.xml -ACLOCAL_AMFLAGS = -I m4 -I${OSSIEHOME}/share/aclocal/ossie -- ++ACLOCAL_AMFLAGS = -I m4 + + screendir = $(bindir) + screen_DATA = $(srcdir)/gpp.screenrc + -all-local: GPP - mkdir -p ../tests/sdr/dev/devices/GPP/cpp - cp GPP ../tests/sdr/dev/devices/GPP/cpp/ @@ -21,11 +27,11 @@ - cp ../GPP.spd.xml ../tests/sdr/dev/devices/GPP/ - cp ../GPP.prf.xml ../tests/sdr/dev/devices/GPP/ - ./gpp_setup --gppcfg --silent --location=../tests/sdr/dev/devices/GPP -+ACLOCAL_AMFLAGS = -I m4 - +- distclean-local: rm -f config.* -@@ -47,9 +39,6 @@ + rm -rf autom4te.cache +@@ -50,9 +42,6 @@ distclean-local: rm -f missing rm -rf .deps diff --git a/recipes-devices/GPP/gpp_2.2.0.bb b/recipes-devices/GPP/gpp_2.2.1.bb similarity index 93% rename from recipes-devices/GPP/gpp_2.2.0.bb rename to recipes-devices/GPP/gpp_2.2.1.bb index f57f2a4..864d7e4 100644 --- a/recipes-devices/GPP/gpp_2.2.0.bb +++ b/recipes-devices/GPP/gpp_2.2.1.bb @@ -24,13 +24,12 @@ require recipes-core/include/redhawk-repo.inc DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PREFERRED_VERSION_bulkiointerfaces = "2.2.0" -PR = "r5" +PR = "r2" SRC_URI_append = "\ - file://configure-gpp \ file://amflags_no_test_or_config.patch \ + file://configure-gpp \ file://GPP_ps_e.patch \ file://trust-uname-p.patch \ " @@ -46,7 +45,7 @@ RH_GPP_NAME ?= "GPP-${PACKAGE_ARCH}" S = "${WORKDIR}/git/redhawk-core-framework/GPP/cpp" # We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. +# autotools-brokensep is the same as autotools but our build and src locations are the same since we cannot build away from our src. inherit autotools-brokensep pkgconfig pythonnative redhawk-device FILES_${PN} += "${SDRROOT}/*" diff --git a/recipes-devices/RTL2832U/rtl2832u_2.1.0.bb b/recipes-devices/RTL2832U/rtl2832u_2.1.0.bb index 71f0f9f..7d82f72 100644 --- a/recipes-devices/RTL2832U/rtl2832u_2.1.0.bb +++ b/recipes-devices/RTL2832U/rtl2832u_2.1.0.bb @@ -22,10 +22,7 @@ DESCRIPTION = "REDHAWK Device for the RTL2832U" DEPENDS = "frontendinterfaces bulkiointerfaces rtlsdr" RDEPENDS_${PN} = "frontendinterfaces rtlsdr" -PREFERRED_VERSION_bulkiointerfaces = "2.0.6" -PREFERRED_VERSION_frontendinterfaces = "2.3.6" - -PR = "r5" +PR = "r2" require recipes-core/include/redhawk-repo.inc diff --git a/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb b/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb index a101861..eb5e304 100644 --- a/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb +++ b/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb @@ -22,10 +22,7 @@ DESCRIPTION = "REDHAWK Device for the USRP UHD" DEPENDS = "bulkiointerfaces frontendinterfaces uhd" RDEPENDS_${PN} = "bulkiointerfaces frontendinterfaces uhd" -PREFERRED_VERSION_bulkiointerfaces = "2.2.0" -PREFERRED_VERSION_frontendinterfaces = "2.4.3" - -PR = "2" +PR = "r2" require recipes-core/include/redhawk-repo.inc diff --git a/recipes-devices/node-deployer/node-deployer_1.0.0.bb b/recipes-devices/node-deployer/node-deployer_1.0.0.bb index 320fa60..d63d172 100644 --- a/recipes-devices/node-deployer/node-deployer_1.0.0.bb +++ b/recipes-devices/node-deployer/node-deployer_1.0.0.bb @@ -25,7 +25,6 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad DEPENDS := "redhawk" RDEPENDS_${PN} := "redhawk" -PREFERRED_VERSION_redhawk = "2.0.%" SRC_URI = "\ file://node-init.d \ diff --git a/recipes-devices/template-cpp/template-cpp.bb.tpl b/recipes-devices/template-cpp/template-cpp.bb.tpl index ac7bca5..42d7869 100644 --- a/recipes-devices/template-cpp/template-cpp.bb.tpl +++ b/recipes-devices/template-cpp/template-cpp.bb.tpl @@ -29,10 +29,6 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d9836802 DEPENDS = "redhawk" RDEPENDS_${PN} = "redhawk" -# This ensures you depend on the right version -PREFERRED_VERSION_redhawk = "2.0.%" - - # If you do not specify a tag, you will need to specify the commit # hash using a separate recipe variable. SRC_URI = "git://;tag=;protocol=git \ From 9b58efc3c246345d0009ec286f40e9441cedd0d6 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Thu, 13 Dec 2018 08:29:05 -0500 Subject: [PATCH 08/35] Re-org for faster builds, multiple LTS versions This is a squash of several features. 1. Dropped the use of the 'redhawk' repo of repos since having dozens of unpack events really slows the build down when it's all the same filesystem. We cannot do a parallel build because of the autotools configuration (i.e., need for brokensep), so the alternative is to point to the individual repositories. 2. Going along with (1), pulled all of the redhawk packages into recipes-core as core-framework, components, devices, and softpkgs, each with versioned file paths. This is to facilitate supporting multiple LTS releases at the head of the branch rather than forcing 1.10 users, for example to use much older versions of Yocto. 3. The bug related to the GPP configuration not gaining the correct processor name has been addressed. 4. The bug where some packages warn of host-user contamination has been addressed via fakeroot. 5. vardeps have been added to help rebuilds reflect changes to certain variables like REDHAWK_PROCESSOR 6. Added DIRFILES to fix the multiple providers error related to also using package_rpm (i.e., package_rpm should now work). --- classes/redhawk-core-cpp-softpkg.bbclass | 16 ---- classes/redhawk-softpkg.bbclass | 5 +- classes/redhawk-sysroot.bbclass | 4 +- .../RBDSDecoder/rh-rbdsdecoder_2.0.1.bb | 8 -- recipes-components/SigGen/rh-siggen_2.0.1.bb | 8 -- .../SinkSDDS/rh-sinksdds_1.0.0.bb | 8 -- .../SourceSDDS/rh-sourcesdds_1.1.1.bb | 8 -- .../rh-tunefilterdecimate_2.0.1.bb | 8 -- .../autocorrelate/rh-autocorrelate_2.0.0.bb | 8 -- .../fastfilter/rh-fastfilter_2.0.2.bb | 8 -- recipes-components/psd/rh-psd_2.0.2.bb | 8 -- .../psk_soft/rh-psk-soft_2.0.1.bb | 8 -- .../sinksocket/rh-sinksocket_2.0.1.bb | 8 -- .../sourcesocket/rh-sourcesocket_2.1.1.bb | 8 -- .../components/core-cpp-component.inc | 8 +- .../components}/rh-agc_2.0.0.bb | 6 +- .../rh-amfmpmbasebanddemod_2.0.0.bb | 6 +- .../rh-arbitraryrateresampler_2.0.1.bb | 6 +- .../components/rh-autocorrelate_2.0.0.bb | 10 ++ .../components/rh-fastfilter_2.0.2.bb | 10 ++ .../components}/rh-filereader_4.1.0.bb | 8 +- .../components}/rh-filewriter_4.1.0.bb | 6 +- .../components}/rh-hardlimit_2.0.0.bb | 6 +- recipes-core/components/rh-psd_2.0.2.bb | 10 ++ recipes-core/components/rh-psk-soft_2.0.1.bb | 10 ++ .../components/rh-rbdsdecoder_2.0.1.bb | 10 ++ recipes-core/components/rh-siggen_2.0.1.bb | 8 ++ recipes-core/components/rh-sinksdds_1.0.0.bb | 8 ++ .../components/rh-sinksocket_2.0.1.bb | 8 ++ .../components}/rh-sinkvita49_3.1.0.bb | 8 +- .../components/rh-sourcesdds_1.1.1.bb | 8 ++ .../components/rh-sourcesocket_2.1.1.bb | 8 ++ .../components}/rh-sourcevita49_3.1.0.bb | 8 +- .../components/rh-tunefilterdecimate_2.0.1.bb | 10 ++ .../remove_cppunit.patch | 0 .../core-framework}/bulkiointerfaces_2.2.1.bb | 7 +- .../burstioInterfaces_libs.patch | 0 .../fix_idldir_and_remove_cppunit.patch | 0 .../subdir_objects.patch | 0 .../burstiointerfaces_2.2.1.bb | 7 +- .../core-framework/core-framework-2.2.1.inc | 3 + .../core-framework-autotools.inc | 11 ++- .../core-framework/core-framework.inc | 4 + .../core-framework}/domain-init.bb | 0 .../core-framework/domain-init}/LICENSE | 0 .../core-framework/domain-init}/domain-init.d | 0 .../fix_idldir_and_remove_cppunit.patch | 0 .../frontendinterfaces_2.4.4.bb | 7 +- .../redhawk-2.2.1}/Fix_Idl_prefix.patch | 0 .../OSSIEHOME_global_prefix.patch | 0 .../redhawk-2.2.1}/Remove_Tests.patch | 0 .../redhawk-2.2.1}/allow_idl_dir_set.patch | 0 .../componenthost_redhawk_processor.patch | 0 .../redhawk-2.2.1}/gcc_fix_nodebooter.patch | 0 .../redhawk-2.2.1}/include_scoped_ptr.patch | 0 .../ossie_cv_sdr_root_target.patch | 0 .../redhawk-2.2.1}/redhawk_processor.patch | 0 .../redhawk-2.2.1}/remove_csh_scripts.patch | 0 .../redhawk-2.2.1}/uuid_python_package.patch | 0 .../core-framework}/redhawk-codegen_2.2.1.bb | 8 +- .../core-framework}/redhawk_2.2.1.bb | 9 +- .../devices/gpp-2.2.1}/GPP_ps_e.patch | 0 .../amflags_no_test_or_config.patch | 0 .../devices/gpp-2.2.1}/configure-gpp | 0 .../devices/gpp-2.2.1}/trust-uname-p.patch | 0 .../GPP => recipes-core/devices}/gpp_2.2.1.bb | 7 +- .../devices/node-deployer-1.0.0}/LICENSE | 0 .../devices/node-deployer-1.0.0}/node-init.d | 0 .../node-deployer-1.0.0}/node-merge.py | 0 .../devices}/node-deployer_1.0.0.bb | 0 .../Fix_rtl_version_constraint.patch | 0 .../devices/rtl2832u-2.1.0}/nodeconfig.patch | 0 .../devices}/rtl2832u_2.1.0.bb | 5 +- .../devices/usrp-uhd-6.1.0}/nodeconfig.patch | 0 .../devices}/usrp-uhd_6.1.0.bb | 7 +- recipes-core/include/redhawk-repo.inc | 6 -- recipes-core/softpkgs/core-cpp-softpkg.inc | 10 ++ recipes-core/softpkgs/rh-bluefilelib_2.1.0.bb | 7 ++ recipes-core/softpkgs/rh-dsp_2.0.0.bb | 7 ++ recipes-core/softpkgs/rh-fftlib_2.1.0.bb | 12 +++ .../softpkgs}/rh-redhawkdevutils_4.0.1.bb | 7 +- recipes-core/softpkgs/rh-vita49_5.0.0.bb | 7 ++ recipes-deps/omniorb/omniorb_4.2.3.bb | 2 + recipes-deps/omniorb/omniorbpy_4.2.3.bb | 2 + recipes-deps/rtlsdr/rtlsdr_0.5.2.bb | 7 +- .../files/Add_Missing_Files.patch | 12 --- .../template-cpp/template-cpp.bb.tpl | 91 ------------------- recipes-softpkg/VITA49/rh-vita49_5.0.0.bb | 9 -- .../blueFileLib/rh-bluefilelib_2.1.0.bb | 6 -- recipes-softpkg/dsp/rh-dsp_2.0.0.bb | 6 -- recipes-softpkg/fftlib/rh-fftlib_2.1.0.bb | 12 --- 91 files changed, 235 insertions(+), 318 deletions(-) delete mode 100644 classes/redhawk-core-cpp-softpkg.bbclass delete mode 100644 recipes-components/RBDSDecoder/rh-rbdsdecoder_2.0.1.bb delete mode 100644 recipes-components/SigGen/rh-siggen_2.0.1.bb delete mode 100644 recipes-components/SinkSDDS/rh-sinksdds_1.0.0.bb delete mode 100644 recipes-components/SourceSDDS/rh-sourcesdds_1.1.1.bb delete mode 100644 recipes-components/TuneFilterDecimate/rh-tunefilterdecimate_2.0.1.bb delete mode 100644 recipes-components/autocorrelate/rh-autocorrelate_2.0.0.bb delete mode 100644 recipes-components/fastfilter/rh-fastfilter_2.0.2.bb delete mode 100644 recipes-components/psd/rh-psd_2.0.2.bb delete mode 100644 recipes-components/psk_soft/rh-psk-soft_2.0.1.bb delete mode 100644 recipes-components/sinksocket/rh-sinksocket_2.0.1.bb delete mode 100644 recipes-components/sourcesocket/rh-sourcesocket_2.1.1.bb rename classes/redhawk-core-cpp-component.bbclass => recipes-core/components/core-cpp-component.inc (57%) rename {recipes-components/agc => recipes-core/components}/rh-agc_2.0.0.bb (73%) rename {recipes-components/AmFmPmBasebandDemod => recipes-core/components}/rh-amfmpmbasebanddemod_2.0.0.bb (75%) rename {recipes-components/ArbitraryRateResampler => recipes-core/components}/rh-arbitraryrateresampler_2.0.1.bb (76%) create mode 100644 recipes-core/components/rh-autocorrelate_2.0.0.bb create mode 100644 recipes-core/components/rh-fastfilter_2.0.2.bb rename {recipes-components/FileReader => recipes-core/components}/rh-filereader_4.1.0.bb (58%) rename {recipes-components/FileWriter => recipes-core/components}/rh-filewriter_4.1.0.bb (80%) rename {recipes-components/HardLimit => recipes-core/components}/rh-hardlimit_2.0.0.bb (72%) create mode 100644 recipes-core/components/rh-psd_2.0.2.bb create mode 100644 recipes-core/components/rh-psk-soft_2.0.1.bb create mode 100644 recipes-core/components/rh-rbdsdecoder_2.0.1.bb create mode 100644 recipes-core/components/rh-siggen_2.0.1.bb create mode 100644 recipes-core/components/rh-sinksdds_1.0.0.bb create mode 100644 recipes-core/components/rh-sinksocket_2.0.1.bb rename {recipes-components/SinkVITA49 => recipes-core/components}/rh-sinkvita49_3.1.0.bb (50%) create mode 100644 recipes-core/components/rh-sourcesdds_1.1.1.bb create mode 100644 recipes-core/components/rh-sourcesocket_2.1.1.bb rename {recipes-components/SourceVITA49 => recipes-core/components}/rh-sourcevita49_3.1.0.bb (50%) create mode 100644 recipes-core/components/rh-tunefilterdecimate_2.0.1.bb rename {recipes-core-framework/bulkioInterfaces/files => recipes-core/core-framework/bulkiointerfaces-2.2.1}/remove_cppunit.patch (100%) rename {recipes-core-framework/bulkioInterfaces => recipes-core/core-framework}/bulkiointerfaces_2.2.1.bb (93%) rename {recipes-core-framework/burstioInterfaces/files => recipes-core/core-framework/burstiointerfaces-2.2.1}/burstioInterfaces_libs.patch (100%) rename {recipes-core-framework/burstioInterfaces/files => recipes-core/core-framework/burstiointerfaces-2.2.1}/fix_idldir_and_remove_cppunit.patch (100%) rename {recipes-core-framework/burstioInterfaces/files => recipes-core/core-framework/burstiointerfaces-2.2.1}/subdir_objects.patch (100%) rename {recipes-core-framework/burstioInterfaces => recipes-core/core-framework}/burstiointerfaces_2.2.1.bb (94%) create mode 100644 recipes-core/core-framework/core-framework-2.2.1.inc rename classes/redhawk-core-framework.bbclass => recipes-core/core-framework/core-framework-autotools.inc (86%) create mode 100644 recipes-core/core-framework/core-framework.inc rename {recipes-core-framework/domain => recipes-core/core-framework}/domain-init.bb (100%) rename {recipes-core-framework/domain/files => recipes-core/core-framework/domain-init}/LICENSE (100%) rename {recipes-core-framework/domain/files => recipes-core/core-framework/domain-init}/domain-init.d (100%) rename {recipes-core-framework/frontendInterfaces/files => recipes-core/core-framework/frontendinterfaces-2.4.4}/fix_idldir_and_remove_cppunit.patch (100%) rename {recipes-core-framework/frontendInterfaces => recipes-core/core-framework}/frontendinterfaces_2.4.4.bb (93%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/Fix_Idl_prefix.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/OSSIEHOME_global_prefix.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/Remove_Tests.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/allow_idl_dir_set.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/componenthost_redhawk_processor.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/gcc_fix_nodebooter.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/include_scoped_ptr.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/ossie_cv_sdr_root_target.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/redhawk_processor.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/remove_csh_scripts.patch (100%) rename {recipes-core-framework/redhawk/files => recipes-core/core-framework/redhawk-2.2.1}/uuid_python_package.patch (100%) rename {recipes-core-framework/redhawk-codegen => recipes-core/core-framework}/redhawk-codegen_2.2.1.bb (90%) rename {recipes-core-framework/redhawk => recipes-core/core-framework}/redhawk_2.2.1.bb (94%) rename {recipes-devices/GPP/files => recipes-core/devices/gpp-2.2.1}/GPP_ps_e.patch (100%) rename {recipes-devices/GPP/files => recipes-core/devices/gpp-2.2.1}/amflags_no_test_or_config.patch (100%) rename {recipes-devices/GPP/files => recipes-core/devices/gpp-2.2.1}/configure-gpp (100%) rename {recipes-devices/GPP/files => recipes-core/devices/gpp-2.2.1}/trust-uname-p.patch (100%) rename {recipes-devices/GPP => recipes-core/devices}/gpp_2.2.1.bb (96%) rename {recipes-devices/node-deployer/files => recipes-core/devices/node-deployer-1.0.0}/LICENSE (100%) rename {recipes-devices/node-deployer/files => recipes-core/devices/node-deployer-1.0.0}/node-init.d (100%) rename {recipes-devices/node-deployer/files => recipes-core/devices/node-deployer-1.0.0}/node-merge.py (100%) rename {recipes-devices/node-deployer => recipes-core/devices}/node-deployer_1.0.0.bb (100%) rename {recipes-devices/RTL2832U/files => recipes-core/devices/rtl2832u-2.1.0}/Fix_rtl_version_constraint.patch (100%) rename {recipes-devices/RTL2832U/files => recipes-core/devices/rtl2832u-2.1.0}/nodeconfig.patch (100%) rename {recipes-devices/RTL2832U => recipes-core/devices}/rtl2832u_2.1.0.bb (95%) rename {recipes-devices/USRP_UHD/files => recipes-core/devices/usrp-uhd-6.1.0}/nodeconfig.patch (100%) rename {recipes-devices/USRP_UHD => recipes-core/devices}/usrp-uhd_6.1.0.bb (94%) delete mode 100644 recipes-core/include/redhawk-repo.inc create mode 100644 recipes-core/softpkgs/core-cpp-softpkg.inc create mode 100644 recipes-core/softpkgs/rh-bluefilelib_2.1.0.bb create mode 100644 recipes-core/softpkgs/rh-dsp_2.0.0.bb create mode 100644 recipes-core/softpkgs/rh-fftlib_2.1.0.bb rename {recipes-softpkg/RedhawkDevUtils => recipes-core/softpkgs}/rh-redhawkdevutils_4.0.1.bb (56%) create mode 100644 recipes-core/softpkgs/rh-vita49_5.0.0.bb delete mode 100644 recipes-devices/template-cpp/files/Add_Missing_Files.patch delete mode 100644 recipes-devices/template-cpp/template-cpp.bb.tpl delete mode 100644 recipes-softpkg/VITA49/rh-vita49_5.0.0.bb delete mode 100644 recipes-softpkg/blueFileLib/rh-bluefilelib_2.1.0.bb delete mode 100644 recipes-softpkg/dsp/rh-dsp_2.0.0.bb delete mode 100644 recipes-softpkg/fftlib/rh-fftlib_2.1.0.bb diff --git a/classes/redhawk-core-cpp-softpkg.bbclass b/classes/redhawk-core-cpp-softpkg.bbclass deleted file mode 100644 index 4c42d87..0000000 --- a/classes/redhawk-core-cpp-softpkg.bbclass +++ /dev/null @@ -1,16 +0,0 @@ -# Inherit the core repo references, etc. -include recipes-core/include/redhawk-repo.inc - -# Inherit the base softpkg class -inherit autotools-brokensep pkgconfig redhawk-softpkg - -# Derive the softpkg's parent directory name which (should) be the installed softpkg name and location in the -# core repo. -SOFTPKG_NAME ?= "${@'${THISDIR}'.split('/')[-1]}" -SOFTPKG_REPO_DIR ?= "${SOFTPKG_NAME}" - -# Append SOFTPKG_PREFIX -SOFTPKG_PREFIX .= "/rh/${SOFTPKG_NAME}" - -# Set source directory -S = "${WORKDIR}/git/redhawk-sharedlibs/${SOFTPKG_REPO_DIR}/cpp" diff --git a/classes/redhawk-softpkg.bbclass b/classes/redhawk-softpkg.bbclass index e023af0..5ee8e67 100644 --- a/classes/redhawk-softpkg.bbclass +++ b/classes/redhawk-softpkg.bbclass @@ -1,4 +1,4 @@ -inherit redhawk-entity +inherit autotools-brokensep pkgconfig redhawk-entity # Basic set of depends DEPENDS = "redhawk" @@ -35,6 +35,7 @@ FILES_${PN}-dev += "\ FILES_${PN}-staticdev += "${SOFTPKG_LIBDIR}/*.a" # Move the xml to be at the base of SOFTPKG_PREFIX. -do_install_append () { +fakeroot do_install_append () { find ${D} -name "*.spd.xml" -exec mv {} ${D}${SOFTPKG_PREFIX} \; } +do_install[vardeps] += "SOFTPKG_PREFIX" \ No newline at end of file diff --git a/classes/redhawk-sysroot.bbclass b/classes/redhawk-sysroot.bbclass index 1d89d38..0a3670b 100644 --- a/classes/redhawk-sysroot.bbclass +++ b/classes/redhawk-sysroot.bbclass @@ -1,10 +1,10 @@ inherit redhawk-env -redhawk_core_ossie_sysroot () { +fakeroot redhawk_core_ossie_sysroot () { sysroot_stage_dir ${D}${OSSIEHOME} \ ${SYSROOT_DESTDIR}${OSSIEHOME} } -redhawk_core_sdrroot_sysroot () { +fakeroot redhawk_core_sdrroot_sysroot () { sysroot_stage_dir ${D}${SDRROOT} \ ${SYSROOT_DESTDIR}${SDRROOT} } diff --git a/recipes-components/RBDSDecoder/rh-rbdsdecoder_2.0.1.bb b/recipes-components/RBDSDecoder/rh-rbdsdecoder_2.0.1.bb deleted file mode 100644 index bfe7def..0000000 --- a/recipes-components/RBDSDecoder/rh-rbdsdecoder_2.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK RBDS Decoder Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces" -RDEPENDS_${PN} = "bulkiointerfaces" - -PR = "r5" diff --git a/recipes-components/SigGen/rh-siggen_2.0.1.bb b/recipes-components/SigGen/rh-siggen_2.0.1.bb deleted file mode 100644 index e88a51d..0000000 --- a/recipes-components/SigGen/rh-siggen_2.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK SigGen Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces" -RDEPENDS_${PN} = "bulkiointerfaces" - -PR = "r5" diff --git a/recipes-components/SinkSDDS/rh-sinksdds_1.0.0.bb b/recipes-components/SinkSDDS/rh-sinksdds_1.0.0.bb deleted file mode 100644 index 3f741ff..0000000 --- a/recipes-components/SinkSDDS/rh-sinksdds_1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK SinkSDDS Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces" -RDEPENDS_${PN} = "bulkiointerfaces" - -PR = "r5" diff --git a/recipes-components/SourceSDDS/rh-sourcesdds_1.1.1.bb b/recipes-components/SourceSDDS/rh-sourcesdds_1.1.1.bb deleted file mode 100644 index 930224e..0000000 --- a/recipes-components/SourceSDDS/rh-sourcesdds_1.1.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK SourceSDDS Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces" -RDEPENDS_${PN} = "bulkiointerfaces" - -PR = "r4" diff --git a/recipes-components/TuneFilterDecimate/rh-tunefilterdecimate_2.0.1.bb b/recipes-components/TuneFilterDecimate/rh-tunefilterdecimate_2.0.1.bb deleted file mode 100644 index 925f605..0000000 --- a/recipes-components/TuneFilterDecimate/rh-tunefilterdecimate_2.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK Tune Filter Decimate Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" -RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" - -PR = "r5" diff --git a/recipes-components/autocorrelate/rh-autocorrelate_2.0.0.bb b/recipes-components/autocorrelate/rh-autocorrelate_2.0.0.bb deleted file mode 100644 index 5f07302..0000000 --- a/recipes-components/autocorrelate/rh-autocorrelate_2.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK Autocorrelate Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" -RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" - -PR = "r7" diff --git a/recipes-components/fastfilter/rh-fastfilter_2.0.2.bb b/recipes-components/fastfilter/rh-fastfilter_2.0.2.bb deleted file mode 100644 index ca74ed5..0000000 --- a/recipes-components/fastfilter/rh-fastfilter_2.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK fastfilter Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" -RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" - -PR = "r4" diff --git a/recipes-components/psd/rh-psd_2.0.2.bb b/recipes-components/psd/rh-psd_2.0.2.bb deleted file mode 100644 index fd58524..0000000 --- a/recipes-components/psd/rh-psd_2.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK PSD Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" -RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" - -PR = "r6" diff --git a/recipes-components/psk_soft/rh-psk-soft_2.0.1.bb b/recipes-components/psk_soft/rh-psk-soft_2.0.1.bb deleted file mode 100644 index 4a57ec6..0000000 --- a/recipes-components/psk_soft/rh-psk-soft_2.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK PSK Soft (Decision) Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces" -RDEPENDS_${PN} = "bulkiointerfaces" - -PR = "r5" diff --git a/recipes-components/sinksocket/rh-sinksocket_2.0.1.bb b/recipes-components/sinksocket/rh-sinksocket_2.0.1.bb deleted file mode 100644 index f49ce92..0000000 --- a/recipes-components/sinksocket/rh-sinksocket_2.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK Sink Socket Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces" -RDEPENDS_${PN} = "bulkiointerfaces" - -PR = "r5" diff --git a/recipes-components/sourcesocket/rh-sourcesocket_2.1.1.bb b/recipes-components/sourcesocket/rh-sourcesocket_2.1.1.bb deleted file mode 100644 index 31c2819..0000000 --- a/recipes-components/sourcesocket/rh-sourcesocket_2.1.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "REDHAWK Source Socket Component (CPP)" - -inherit redhawk-core-cpp-component - -DEPENDS = "bulkiointerfaces" -RDEPENDS_${PN} = "bulkiointerfaces" - -PR = "r3" diff --git a/classes/redhawk-core-cpp-component.bbclass b/recipes-core/components/core-cpp-component.inc similarity index 57% rename from classes/redhawk-core-cpp-component.bbclass rename to recipes-core/components/core-cpp-component.inc index cfe44c0..01bfb12 100644 --- a/classes/redhawk-core-cpp-component.bbclass +++ b/recipes-core/components/core-cpp-component.inc @@ -1,14 +1,14 @@ -# Inherit the core repo references, etc. -include recipes-core/include/redhawk-repo.inc +require recipes-core/core-framework/core-framework.inc # Inherit the base component class inherit redhawk-component # Derive the component's parent directory name which (should) be the installed component name and location in the # core repo. -COMPONENT_NAME="${@'${THISDIR}'.split('/')[-1]}" +COMPONENT_NAME ?= "${@'${PN}'.split('rh-')[-1]}" -S = "${WORKDIR}/git/redhawk-components/${COMPONENT_NAME}/cpp" +SRC_URI = "git://github.com/redhawksdr/${COMPONENT_NAME};protocol=https;tag=${PV}-${PR}" +S = "${WORKDIR}/git/cpp" FILES_${PN} += "${SDRROOT}/*" FILES_${PN}-dbg += "${SDRROOT}/dom/components/rh/${COMPONENT_NAME}/cpp/.debug" diff --git a/recipes-components/agc/rh-agc_2.0.0.bb b/recipes-core/components/rh-agc_2.0.0.bb similarity index 73% rename from recipes-components/agc/rh-agc_2.0.0.bb rename to recipes-core/components/rh-agc_2.0.0.bb index d8c9e91..c4de3ae 100644 --- a/recipes-components/agc/rh-agc_2.0.0.bb +++ b/recipes-core/components/rh-agc_2.0.0.bb @@ -1,8 +1,8 @@ DESCRIPTION = "REDHAWK AGC Component (CPP)" -inherit redhawk-core-cpp-component - DEPENDS = "bulkiointerfaces rh-dsp" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp" -PR = "r5" +PR = "5" + +require core-cpp-component.inc diff --git a/recipes-components/AmFmPmBasebandDemod/rh-amfmpmbasebanddemod_2.0.0.bb b/recipes-core/components/rh-amfmpmbasebanddemod_2.0.0.bb similarity index 75% rename from recipes-components/AmFmPmBasebandDemod/rh-amfmpmbasebanddemod_2.0.0.bb rename to recipes-core/components/rh-amfmpmbasebanddemod_2.0.0.bb index 60c90b0..f3cac94 100644 --- a/recipes-components/AmFmPmBasebandDemod/rh-amfmpmbasebanddemod_2.0.0.bb +++ b/recipes-core/components/rh-amfmpmbasebanddemod_2.0.0.bb @@ -1,8 +1,8 @@ DESCRIPTION = "REDHAWK AM FM PM Baseband Demod Component" -inherit redhawk-core-cpp-component - DEPENDS = "bulkiointerfaces rh-dsp" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp" -PR = "r5" +PR = "5" + +require core-cpp-component.inc diff --git a/recipes-components/ArbitraryRateResampler/rh-arbitraryrateresampler_2.0.1.bb b/recipes-core/components/rh-arbitraryrateresampler_2.0.1.bb similarity index 76% rename from recipes-components/ArbitraryRateResampler/rh-arbitraryrateresampler_2.0.1.bb rename to recipes-core/components/rh-arbitraryrateresampler_2.0.1.bb index da0b6fe..dd0e448 100644 --- a/recipes-components/ArbitraryRateResampler/rh-arbitraryrateresampler_2.0.1.bb +++ b/recipes-core/components/rh-arbitraryrateresampler_2.0.1.bb @@ -1,8 +1,8 @@ DESCRIPTION = "REDHAWK Arbitrary Rate Resampler Component (CPP)" -inherit redhawk-core-cpp-component - DEPENDS = "bulkiointerfaces rh-dsp" RDEPENDS_${PN} = "bulkiointerfaces rh-dsp" -PR = "r4" +PR = "4" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-autocorrelate_2.0.0.bb b/recipes-core/components/rh-autocorrelate_2.0.0.bb new file mode 100644 index 0000000..88cd743 --- /dev/null +++ b/recipes-core/components/rh-autocorrelate_2.0.0.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "REDHAWK Autocorrelate Component" + +DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" +RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" + +PR = "7" + +LIC_MD5 = "92aadbd9e4b26926809a4e97460613d5" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-fastfilter_2.0.2.bb b/recipes-core/components/rh-fastfilter_2.0.2.bb new file mode 100644 index 0000000..f2ba817 --- /dev/null +++ b/recipes-core/components/rh-fastfilter_2.0.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "REDHAWK fastfilter Component" + +DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" +RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" + +PR = "4" + +LIC_MD5 = "92aadbd9e4b26926809a4e97460613d5" + +require core-cpp-component.inc diff --git a/recipes-components/FileReader/rh-filereader_4.1.0.bb b/recipes-core/components/rh-filereader_4.1.0.bb similarity index 58% rename from recipes-components/FileReader/rh-filereader_4.1.0.bb rename to recipes-core/components/rh-filereader_4.1.0.bb index 5316646..2ecc4fb 100644 --- a/recipes-components/FileReader/rh-filereader_4.1.0.bb +++ b/recipes-core/components/rh-filereader_4.1.0.bb @@ -1,8 +1,8 @@ -DESCRIPTION = "REDHAWK File Reader Component (CPP)" - -inherit redhawk-core-cpp-component +DESCRIPTION = "REDHAWK File Reader Component" DEPENDS = "bulkiointerfaces rh-bluefilelib rh-redhawkdevutils" RDEPENDS_${PN} = "bulkiointerfaces rh-bluefilelib rh-redhawkdevutils" -PR = "r4" +PR = "4" + +require core-cpp-component.inc diff --git a/recipes-components/FileWriter/rh-filewriter_4.1.0.bb b/recipes-core/components/rh-filewriter_4.1.0.bb similarity index 80% rename from recipes-components/FileWriter/rh-filewriter_4.1.0.bb rename to recipes-core/components/rh-filewriter_4.1.0.bb index 5a2877d..5a0b921 100644 --- a/recipes-components/FileWriter/rh-filewriter_4.1.0.bb +++ b/recipes-core/components/rh-filewriter_4.1.0.bb @@ -1,8 +1,8 @@ DESCRIPTION = "REDHAWK File Writer Component (CPP)" -inherit redhawk-core-cpp-component - DEPENDS = "bulkiointerfaces rh-bluefilelib rh-redhawkdevutils" RDEPENDS_${PN} = "bulkiointerfaces rh-bluefilelib rh-redhawkdevutils" -PR = "r4" +PR = "4" + +require core-cpp-component.inc diff --git a/recipes-components/HardLimit/rh-hardlimit_2.0.0.bb b/recipes-core/components/rh-hardlimit_2.0.0.bb similarity index 72% rename from recipes-components/HardLimit/rh-hardlimit_2.0.0.bb rename to recipes-core/components/rh-hardlimit_2.0.0.bb index 3559d41..980bf12 100644 --- a/recipes-components/HardLimit/rh-hardlimit_2.0.0.bb +++ b/recipes-core/components/rh-hardlimit_2.0.0.bb @@ -1,8 +1,8 @@ DESCRIPTION = "REDHAWK File Reader Component (CPP)" -inherit redhawk-core-cpp-component - DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r5" +PR = "5" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-psd_2.0.2.bb b/recipes-core/components/rh-psd_2.0.2.bb new file mode 100644 index 0000000..3c64a36 --- /dev/null +++ b/recipes-core/components/rh-psd_2.0.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "REDHAWK PSD Component" + +DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" +RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" + +PR = "6" + +LIC_MD5 = "d32239bcb673463ab874e80d47fae504" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-psk-soft_2.0.1.bb b/recipes-core/components/rh-psk-soft_2.0.1.bb new file mode 100644 index 0000000..86ef574 --- /dev/null +++ b/recipes-core/components/rh-psk-soft_2.0.1.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "REDHAWK PSK Soft (Decision) Component" + +DEPENDS = "bulkiointerfaces" +RDEPENDS_${PN} = "bulkiointerfaces" + +PR = "5" + +COMPONENT_NAME = "psk_soft" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-rbdsdecoder_2.0.1.bb b/recipes-core/components/rh-rbdsdecoder_2.0.1.bb new file mode 100644 index 0000000..fc98ffd --- /dev/null +++ b/recipes-core/components/rh-rbdsdecoder_2.0.1.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "REDHAWK RBDS Decoder Component" + +DEPENDS = "bulkiointerfaces" +RDEPENDS_${PN} = "bulkiointerfaces" + +PR = "5" + +LIC_MD5 = "92aadbd9e4b26926809a4e97460613d5" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-siggen_2.0.1.bb b/recipes-core/components/rh-siggen_2.0.1.bb new file mode 100644 index 0000000..75eed9d --- /dev/null +++ b/recipes-core/components/rh-siggen_2.0.1.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "REDHAWK SigGen Component" + +DEPENDS = "bulkiointerfaces" +RDEPENDS_${PN} = "bulkiointerfaces" + +PR = "5" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-sinksdds_1.0.0.bb b/recipes-core/components/rh-sinksdds_1.0.0.bb new file mode 100644 index 0000000..bd45dc4 --- /dev/null +++ b/recipes-core/components/rh-sinksdds_1.0.0.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "REDHAWK SinkSDDS Component" + +DEPENDS = "bulkiointerfaces" +RDEPENDS_${PN} = "bulkiointerfaces" + +PR = "5" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-sinksocket_2.0.1.bb b/recipes-core/components/rh-sinksocket_2.0.1.bb new file mode 100644 index 0000000..f79719e --- /dev/null +++ b/recipes-core/components/rh-sinksocket_2.0.1.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "REDHAWK Sink Socket Component" + +DEPENDS = "bulkiointerfaces" +RDEPENDS_${PN} = "bulkiointerfaces" + +PR = "5" + +require core-cpp-component.inc diff --git a/recipes-components/SinkVITA49/rh-sinkvita49_3.1.0.bb b/recipes-core/components/rh-sinkvita49_3.1.0.bb similarity index 50% rename from recipes-components/SinkVITA49/rh-sinkvita49_3.1.0.bb rename to recipes-core/components/rh-sinkvita49_3.1.0.bb index 1bf7ad0..d5c7c45 100644 --- a/recipes-components/SinkVITA49/rh-sinkvita49_3.1.0.bb +++ b/recipes-core/components/rh-sinkvita49_3.1.0.bb @@ -1,8 +1,8 @@ -DESCRIPTION = "REDHAWK SinkVITA49 (CPP)" - -inherit redhawk-core-cpp-component +DESCRIPTION = "REDHAWK SinkVITA49" DEPENDS = "bulkiointerfaces rh-vita49" RDEPENDS_${PN} = "bulkiointerfaces rh-vita49" -PR = "r3" +PR = "3" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-sourcesdds_1.1.1.bb b/recipes-core/components/rh-sourcesdds_1.1.1.bb new file mode 100644 index 0000000..ab564b8 --- /dev/null +++ b/recipes-core/components/rh-sourcesdds_1.1.1.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "REDHAWK SourceSDDS Component" + +DEPENDS = "bulkiointerfaces" +RDEPENDS_${PN} = "bulkiointerfaces" + +PR = "4" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-sourcesocket_2.1.1.bb b/recipes-core/components/rh-sourcesocket_2.1.1.bb new file mode 100644 index 0000000..8446d6a --- /dev/null +++ b/recipes-core/components/rh-sourcesocket_2.1.1.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "REDHAWK Source Socket Component" + +DEPENDS = "bulkiointerfaces" +RDEPENDS_${PN} = "bulkiointerfaces" + +PR = "3" + +require core-cpp-component.inc diff --git a/recipes-components/SourceVITA49/rh-sourcevita49_3.1.0.bb b/recipes-core/components/rh-sourcevita49_3.1.0.bb similarity index 50% rename from recipes-components/SourceVITA49/rh-sourcevita49_3.1.0.bb rename to recipes-core/components/rh-sourcevita49_3.1.0.bb index 1bf7ad0..d5c7c45 100644 --- a/recipes-components/SourceVITA49/rh-sourcevita49_3.1.0.bb +++ b/recipes-core/components/rh-sourcevita49_3.1.0.bb @@ -1,8 +1,8 @@ -DESCRIPTION = "REDHAWK SinkVITA49 (CPP)" - -inherit redhawk-core-cpp-component +DESCRIPTION = "REDHAWK SinkVITA49" DEPENDS = "bulkiointerfaces rh-vita49" RDEPENDS_${PN} = "bulkiointerfaces rh-vita49" -PR = "r3" +PR = "3" + +require core-cpp-component.inc diff --git a/recipes-core/components/rh-tunefilterdecimate_2.0.1.bb b/recipes-core/components/rh-tunefilterdecimate_2.0.1.bb new file mode 100644 index 0000000..ad6071f --- /dev/null +++ b/recipes-core/components/rh-tunefilterdecimate_2.0.1.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "REDHAWK Tune Filter Decimate Component" + +DEPENDS = "bulkiointerfaces rh-dsp rh-fftlib" +RDEPENDS_${PN} = "bulkiointerfaces rh-dsp rh-fftlib" + +PR = "5" + +LIC_MD5 = "92aadbd9e4b26926809a4e97460613d5" + +require core-cpp-component.inc diff --git a/recipes-core-framework/bulkioInterfaces/files/remove_cppunit.patch b/recipes-core/core-framework/bulkiointerfaces-2.2.1/remove_cppunit.patch similarity index 100% rename from recipes-core-framework/bulkioInterfaces/files/remove_cppunit.patch rename to recipes-core/core-framework/bulkiointerfaces-2.2.1/remove_cppunit.patch diff --git a/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.1.bb b/recipes-core/core-framework/bulkiointerfaces_2.2.1.bb similarity index 93% rename from recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.1.bb rename to recipes-core/core-framework/bulkiointerfaces_2.2.1.bb index 0a13408..7ff0067 100644 --- a/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.2.1.bb +++ b/recipes-core/core-framework/bulkiointerfaces_2.2.1.bb @@ -17,7 +17,8 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see http://www.gnu.org/licenses/. # -inherit redhawk-core-framework +require core-framework-2.2.1.inc +require core-framework-autotools.inc DESCRIPTION = "REDHAWK Framework BulkIO Interfaces" @@ -25,13 +26,13 @@ DEPENDS += "redhawk" RDEPENDS_${PN} = "redhawk" RDEPENDS_${PN}-python = "redhawk-python" -PR = "r2" +PR = "2" SRC_URI_append = "\ file://remove_cppunit.patch \ " -S = "${WORKDIR}/git/redhawk-core-framework/bulkioInterfaces" +S = "${WORKDIR}/git/bulkioInterfaces" EXTRA_OECONF += "\ --with-boost-system=boost_system \ diff --git a/recipes-core-framework/burstioInterfaces/files/burstioInterfaces_libs.patch b/recipes-core/core-framework/burstiointerfaces-2.2.1/burstioInterfaces_libs.patch similarity index 100% rename from recipes-core-framework/burstioInterfaces/files/burstioInterfaces_libs.patch rename to recipes-core/core-framework/burstiointerfaces-2.2.1/burstioInterfaces_libs.patch diff --git a/recipes-core-framework/burstioInterfaces/files/fix_idldir_and_remove_cppunit.patch b/recipes-core/core-framework/burstiointerfaces-2.2.1/fix_idldir_and_remove_cppunit.patch similarity index 100% rename from recipes-core-framework/burstioInterfaces/files/fix_idldir_and_remove_cppunit.patch rename to recipes-core/core-framework/burstiointerfaces-2.2.1/fix_idldir_and_remove_cppunit.patch diff --git a/recipes-core-framework/burstioInterfaces/files/subdir_objects.patch b/recipes-core/core-framework/burstiointerfaces-2.2.1/subdir_objects.patch similarity index 100% rename from recipes-core-framework/burstioInterfaces/files/subdir_objects.patch rename to recipes-core/core-framework/burstiointerfaces-2.2.1/subdir_objects.patch diff --git a/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.1.bb b/recipes-core/core-framework/burstiointerfaces_2.2.1.bb similarity index 94% rename from recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.1.bb rename to recipes-core/core-framework/burstiointerfaces_2.2.1.bb index ac1bfab..a40a4f3 100644 --- a/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.2.1.bb +++ b/recipes-core/core-framework/burstiointerfaces_2.2.1.bb @@ -17,7 +17,8 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see http://www.gnu.org/licenses/. # -inherit redhawk-core-framework +require core-framework-2.2.1.inc +require core-framework-autotools.inc DESCRIPTION = "REDHAWK Framework BurstIO Interfaces" @@ -25,7 +26,7 @@ DEPENDS += "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" RDEPENDS_${PN}-python = "bulkiointerfaces-python" -PR = "r2" +PR = "2" SRC_URI_append = "\ file://subdir_objects.patch \ @@ -33,7 +34,7 @@ SRC_URI_append = "\ file://burstioInterfaces_libs.patch \ " -S = "${WORKDIR}/git/redhawk-core-framework/burstioInterfaces" +S = "${WORKDIR}/git/burstioInterfaces" EXTRA_OECONF += "\ --disable-testing \ diff --git a/recipes-core/core-framework/core-framework-2.2.1.inc b/recipes-core/core-framework/core-framework-2.2.1.inc new file mode 100644 index 0000000..dc237ee --- /dev/null +++ b/recipes-core/core-framework/core-framework-2.2.1.inc @@ -0,0 +1,3 @@ +SRC_URI = "git://github.com/redhawksdr/core-framework;protocol=https;tag=2.2.1" + +require core-framework.inc diff --git a/classes/redhawk-core-framework.bbclass b/recipes-core/core-framework/core-framework-autotools.inc similarity index 86% rename from classes/redhawk-core-framework.bbclass rename to recipes-core/core-framework/core-framework-autotools.inc index afbcb5d..81eca49 100644 --- a/classes/redhawk-core-framework.bbclass +++ b/recipes-core/core-framework/core-framework-autotools.inc @@ -1,16 +1,18 @@ -# All based on the same source repository. -require recipes-core/include/redhawk-repo.inc # We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. +# autotools-brokensep is the sasme as autotools but our build and src locations +# are the same since we cannot build away from our src. inherit autotools-brokensep pkgconfig pythonnative redhawk-oeconf redhawk-sysroot # For parsing IDL during compile and autoconf detect omniORB IDL DEPENDS += "omniorbpy-native python-setuptools-native" -# Each typically provides a python package +# Each typically provides a python package; disable directory ownership +# in the packager to avoid "multiple providers" errors, especially in +# python packages. PACKAGES += "${PN}-python" PROVIDES += "${PN}-python" +DIRFILES = "1" # Common packaging structure FILES_${PN}-python += " \ @@ -58,4 +60,3 @@ do_install_prepend() { export STAGING_INCDIR=${STAGING_INCDIR} export STAGING_LIBDIR=${STAGING_LIBDIR} } - diff --git a/recipes-core/core-framework/core-framework.inc b/recipes-core/core-framework/core-framework.inc new file mode 100644 index 0000000..c3f47fc --- /dev/null +++ b/recipes-core/core-framework/core-framework.inc @@ -0,0 +1,4 @@ +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "LGPL-3.0" +LIC_MD5 ?= "e6a600fd5e1d9cbde2d983680233ad02" +LIC_FILES_CHKSUM ?= "file://${WORKDIR}/git/LICENSE;md5=${LIC_MD5}" diff --git a/recipes-core-framework/domain/domain-init.bb b/recipes-core/core-framework/domain-init.bb similarity index 100% rename from recipes-core-framework/domain/domain-init.bb rename to recipes-core/core-framework/domain-init.bb diff --git a/recipes-core-framework/domain/files/LICENSE b/recipes-core/core-framework/domain-init/LICENSE similarity index 100% rename from recipes-core-framework/domain/files/LICENSE rename to recipes-core/core-framework/domain-init/LICENSE diff --git a/recipes-core-framework/domain/files/domain-init.d b/recipes-core/core-framework/domain-init/domain-init.d similarity index 100% rename from recipes-core-framework/domain/files/domain-init.d rename to recipes-core/core-framework/domain-init/domain-init.d diff --git a/recipes-core-framework/frontendInterfaces/files/fix_idldir_and_remove_cppunit.patch b/recipes-core/core-framework/frontendinterfaces-2.4.4/fix_idldir_and_remove_cppunit.patch similarity index 100% rename from recipes-core-framework/frontendInterfaces/files/fix_idldir_and_remove_cppunit.patch rename to recipes-core/core-framework/frontendinterfaces-2.4.4/fix_idldir_and_remove_cppunit.patch diff --git a/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.4.bb b/recipes-core/core-framework/frontendinterfaces_2.4.4.bb similarity index 93% rename from recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.4.bb rename to recipes-core/core-framework/frontendinterfaces_2.4.4.bb index 6a92780..4626893 100644 --- a/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.4.bb +++ b/recipes-core/core-framework/frontendinterfaces_2.4.4.bb @@ -17,7 +17,8 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see http://www.gnu.org/licenses/. # -inherit redhawk-core-framework +require core-framework-2.2.1.inc +require core-framework-autotools.inc DESCRIPTION = "REDHAWK Framework FrontEnd Interfaces" @@ -25,13 +26,13 @@ DEPENDS += "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" RDEPENDS_${PN}-python = "bulkiointerfaces-python" -PR = "r2" +PR = "2" SRC_URI_append = "\ file://fix_idldir_and_remove_cppunit.patch \ " -S = "${WORKDIR}/git/redhawk-core-framework/frontendInterfaces" +S = "${WORKDIR}/git/frontendInterfaces" CFLAGS += "-fpermissive" diff --git a/recipes-core-framework/redhawk/files/Fix_Idl_prefix.patch b/recipes-core/core-framework/redhawk-2.2.1/Fix_Idl_prefix.patch similarity index 100% rename from recipes-core-framework/redhawk/files/Fix_Idl_prefix.patch rename to recipes-core/core-framework/redhawk-2.2.1/Fix_Idl_prefix.patch diff --git a/recipes-core-framework/redhawk/files/OSSIEHOME_global_prefix.patch b/recipes-core/core-framework/redhawk-2.2.1/OSSIEHOME_global_prefix.patch similarity index 100% rename from recipes-core-framework/redhawk/files/OSSIEHOME_global_prefix.patch rename to recipes-core/core-framework/redhawk-2.2.1/OSSIEHOME_global_prefix.patch diff --git a/recipes-core-framework/redhawk/files/Remove_Tests.patch b/recipes-core/core-framework/redhawk-2.2.1/Remove_Tests.patch similarity index 100% rename from recipes-core-framework/redhawk/files/Remove_Tests.patch rename to recipes-core/core-framework/redhawk-2.2.1/Remove_Tests.patch diff --git a/recipes-core-framework/redhawk/files/allow_idl_dir_set.patch b/recipes-core/core-framework/redhawk-2.2.1/allow_idl_dir_set.patch similarity index 100% rename from recipes-core-framework/redhawk/files/allow_idl_dir_set.patch rename to recipes-core/core-framework/redhawk-2.2.1/allow_idl_dir_set.patch diff --git a/recipes-core-framework/redhawk/files/componenthost_redhawk_processor.patch b/recipes-core/core-framework/redhawk-2.2.1/componenthost_redhawk_processor.patch similarity index 100% rename from recipes-core-framework/redhawk/files/componenthost_redhawk_processor.patch rename to recipes-core/core-framework/redhawk-2.2.1/componenthost_redhawk_processor.patch diff --git a/recipes-core-framework/redhawk/files/gcc_fix_nodebooter.patch b/recipes-core/core-framework/redhawk-2.2.1/gcc_fix_nodebooter.patch similarity index 100% rename from recipes-core-framework/redhawk/files/gcc_fix_nodebooter.patch rename to recipes-core/core-framework/redhawk-2.2.1/gcc_fix_nodebooter.patch diff --git a/recipes-core-framework/redhawk/files/include_scoped_ptr.patch b/recipes-core/core-framework/redhawk-2.2.1/include_scoped_ptr.patch similarity index 100% rename from recipes-core-framework/redhawk/files/include_scoped_ptr.patch rename to recipes-core/core-framework/redhawk-2.2.1/include_scoped_ptr.patch diff --git a/recipes-core-framework/redhawk/files/ossie_cv_sdr_root_target.patch b/recipes-core/core-framework/redhawk-2.2.1/ossie_cv_sdr_root_target.patch similarity index 100% rename from recipes-core-framework/redhawk/files/ossie_cv_sdr_root_target.patch rename to recipes-core/core-framework/redhawk-2.2.1/ossie_cv_sdr_root_target.patch diff --git a/recipes-core-framework/redhawk/files/redhawk_processor.patch b/recipes-core/core-framework/redhawk-2.2.1/redhawk_processor.patch similarity index 100% rename from recipes-core-framework/redhawk/files/redhawk_processor.patch rename to recipes-core/core-framework/redhawk-2.2.1/redhawk_processor.patch diff --git a/recipes-core-framework/redhawk/files/remove_csh_scripts.patch b/recipes-core/core-framework/redhawk-2.2.1/remove_csh_scripts.patch similarity index 100% rename from recipes-core-framework/redhawk/files/remove_csh_scripts.patch rename to recipes-core/core-framework/redhawk-2.2.1/remove_csh_scripts.patch diff --git a/recipes-core-framework/redhawk/files/uuid_python_package.patch b/recipes-core/core-framework/redhawk-2.2.1/uuid_python_package.patch similarity index 100% rename from recipes-core-framework/redhawk/files/uuid_python_package.patch rename to recipes-core/core-framework/redhawk-2.2.1/uuid_python_package.patch diff --git a/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.1.bb b/recipes-core/core-framework/redhawk-codegen_2.2.1.bb similarity index 90% rename from recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.1.bb rename to recipes-core/core-framework/redhawk-codegen_2.2.1.bb index 0170c1f..6821d9f 100644 --- a/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.2.1.bb +++ b/recipes-core/core-framework/redhawk-codegen_2.2.1.bb @@ -17,17 +17,17 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see http://www.gnu.org/licenses/. # -require recipes-core/include/redhawk-repo.inc -inherit setuptools redhawk-sysroot +require core-framework-2.2.1.inc +inherit setuptools DESCRIPTION = "REDHAWK Codegen" DEPENDS += "redhawk" RDEPENDS_${PN} = "redhawk python" -PR = "r2" +PR = "2" -S = "${WORKDIR}/git/redhawk-core-framework/redhawk-codegen" +S = "${WORKDIR}/git/redhawk-codegen" # Recipe concept based on: http://stackoverflow.com/questions/16090550/building-python-packages diff --git a/recipes-core-framework/redhawk/redhawk_2.2.1.bb b/recipes-core/core-framework/redhawk_2.2.1.bb similarity index 94% rename from recipes-core-framework/redhawk/redhawk_2.2.1.bb rename to recipes-core/core-framework/redhawk_2.2.1.bb index 04573e8..d449706 100644 --- a/recipes-core-framework/redhawk/redhawk_2.2.1.bb +++ b/recipes-core/core-framework/redhawk_2.2.1.bb @@ -17,11 +17,12 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see http://www.gnu.org/licenses/. # -inherit redhawk-core-framework +require core-framework-2.2.1.inc +require core-framework-autotools.inc DESCRIPTION = "REDHAWK Core Framework" -PR = "r2" +PR = "2" DEPENDS += "omniorbpy log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip expat boost boost-native python-numpy python-threading python-numbers python-resource ossp-uuid" RDEPENDS_${PN} = "python omniorbpy omniorb omnievents e2fsprogs apr-util apr zip expat boost python-numpy python-threading python-subprocess python-numbers python-xml python-resource ossp-uuid" @@ -41,12 +42,13 @@ SRC_URI_append = "\ file://componenthost_redhawk_processor.patch \ " -S = "${WORKDIR}/git/redhawk-core-framework/redhawk/src" +S = "${WORKDIR}/git/redhawk/src" EXTRA_OECONF += "\ --with-sdr=${SDRROOT} \ --with-expat=${STAGING_EXECPREFIXDIR} \ --with-boost-regex=boost_regex \ + --without-tests \ " FILES_${PN}-dbg += " \ @@ -83,6 +85,7 @@ FILES_${PN} += " \ do_redhawk_processor_patch () { find ${S} -type f -exec sed -i "s/BB_REDHAWK_PROCESSOR/${REDHAWK_PROCESSOR}/g" {} \; } +do_redhawk_processor_patch[vardeps] += "REDHAWK_PROCESSOR" addtask redhawk_processor_patch after do_patch before do_configure # Get the things from /etc (sysconfdir) diff --git a/recipes-devices/GPP/files/GPP_ps_e.patch b/recipes-core/devices/gpp-2.2.1/GPP_ps_e.patch similarity index 100% rename from recipes-devices/GPP/files/GPP_ps_e.patch rename to recipes-core/devices/gpp-2.2.1/GPP_ps_e.patch diff --git a/recipes-devices/GPP/files/amflags_no_test_or_config.patch b/recipes-core/devices/gpp-2.2.1/amflags_no_test_or_config.patch similarity index 100% rename from recipes-devices/GPP/files/amflags_no_test_or_config.patch rename to recipes-core/devices/gpp-2.2.1/amflags_no_test_or_config.patch diff --git a/recipes-devices/GPP/files/configure-gpp b/recipes-core/devices/gpp-2.2.1/configure-gpp similarity index 100% rename from recipes-devices/GPP/files/configure-gpp rename to recipes-core/devices/gpp-2.2.1/configure-gpp diff --git a/recipes-devices/GPP/files/trust-uname-p.patch b/recipes-core/devices/gpp-2.2.1/trust-uname-p.patch similarity index 100% rename from recipes-devices/GPP/files/trust-uname-p.patch rename to recipes-core/devices/gpp-2.2.1/trust-uname-p.patch diff --git a/recipes-devices/GPP/gpp_2.2.1.bb b/recipes-core/devices/gpp_2.2.1.bb similarity index 96% rename from recipes-devices/GPP/gpp_2.2.1.bb rename to recipes-core/devices/gpp_2.2.1.bb index 864d7e4..0777acf 100644 --- a/recipes-devices/GPP/gpp_2.2.1.bb +++ b/recipes-core/devices/gpp_2.2.1.bb @@ -17,15 +17,14 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see http://www.gnu.org/licenses/. # +require recipes-core/core-framework/core-framework-2.2.1.inc DESCRIPTION = "REDHAWK Core Framework GPP" -require recipes-core/include/redhawk-repo.inc - DEPENDS = "bulkiointerfaces" RDEPENDS_${PN} = "bulkiointerfaces" -PR = "r2" +PR = "2" SRC_URI_append = "\ file://amflags_no_test_or_config.patch \ @@ -42,7 +41,7 @@ RH_GPP_NODE_NAME ?= "DevMgr-GPP" RH_GPP_NAME ?= "GPP-${PACKAGE_ARCH}" # ################################################ -S = "${WORKDIR}/git/redhawk-core-framework/GPP/cpp" +S = "${WORKDIR}/git/GPP/cpp" # We have to inherit from pythonnative if we do stuff with the system python. # autotools-brokensep is the same as autotools but our build and src locations are the same since we cannot build away from our src. diff --git a/recipes-devices/node-deployer/files/LICENSE b/recipes-core/devices/node-deployer-1.0.0/LICENSE similarity index 100% rename from recipes-devices/node-deployer/files/LICENSE rename to recipes-core/devices/node-deployer-1.0.0/LICENSE diff --git a/recipes-devices/node-deployer/files/node-init.d b/recipes-core/devices/node-deployer-1.0.0/node-init.d similarity index 100% rename from recipes-devices/node-deployer/files/node-init.d rename to recipes-core/devices/node-deployer-1.0.0/node-init.d diff --git a/recipes-devices/node-deployer/files/node-merge.py b/recipes-core/devices/node-deployer-1.0.0/node-merge.py similarity index 100% rename from recipes-devices/node-deployer/files/node-merge.py rename to recipes-core/devices/node-deployer-1.0.0/node-merge.py diff --git a/recipes-devices/node-deployer/node-deployer_1.0.0.bb b/recipes-core/devices/node-deployer_1.0.0.bb similarity index 100% rename from recipes-devices/node-deployer/node-deployer_1.0.0.bb rename to recipes-core/devices/node-deployer_1.0.0.bb diff --git a/recipes-devices/RTL2832U/files/Fix_rtl_version_constraint.patch b/recipes-core/devices/rtl2832u-2.1.0/Fix_rtl_version_constraint.patch similarity index 100% rename from recipes-devices/RTL2832U/files/Fix_rtl_version_constraint.patch rename to recipes-core/devices/rtl2832u-2.1.0/Fix_rtl_version_constraint.patch diff --git a/recipes-devices/RTL2832U/files/nodeconfig.patch b/recipes-core/devices/rtl2832u-2.1.0/nodeconfig.patch similarity index 100% rename from recipes-devices/RTL2832U/files/nodeconfig.patch rename to recipes-core/devices/rtl2832u-2.1.0/nodeconfig.patch diff --git a/recipes-devices/RTL2832U/rtl2832u_2.1.0.bb b/recipes-core/devices/rtl2832u_2.1.0.bb similarity index 95% rename from recipes-devices/RTL2832U/rtl2832u_2.1.0.bb rename to recipes-core/devices/rtl2832u_2.1.0.bb index 7d82f72..aa4dd26 100644 --- a/recipes-devices/RTL2832U/rtl2832u_2.1.0.bb +++ b/recipes-core/devices/rtl2832u_2.1.0.bb @@ -17,14 +17,15 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see http://www.gnu.org/licenses/. # +require recipes-core/core-framework/core-framework.inc DESCRIPTION = "REDHAWK Device for the RTL2832U" DEPENDS = "frontendinterfaces bulkiointerfaces rtlsdr" RDEPENDS_${PN} = "frontendinterfaces rtlsdr" -PR = "r2" +PR = "2" -require recipes-core/include/redhawk-repo.inc +SRC_URI = "git://github.com/redhawksdr/rtl2832u;protocol=https;tag=${PV}-${PR}" # ################################################ # End user-controlled variables to adjust the node diff --git a/recipes-devices/USRP_UHD/files/nodeconfig.patch b/recipes-core/devices/usrp-uhd-6.1.0/nodeconfig.patch similarity index 100% rename from recipes-devices/USRP_UHD/files/nodeconfig.patch rename to recipes-core/devices/usrp-uhd-6.1.0/nodeconfig.patch diff --git a/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb b/recipes-core/devices/usrp-uhd_6.1.0.bb similarity index 94% rename from recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb rename to recipes-core/devices/usrp-uhd_6.1.0.bb index eb5e304..354090c 100644 --- a/recipes-devices/USRP_UHD/usrp-uhd_6.1.0.bb +++ b/recipes-core/devices/usrp-uhd_6.1.0.bb @@ -17,14 +17,15 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see http://www.gnu.org/licenses/. # +require recipes-core/core-framework/core-framework.inc DESCRIPTION = "REDHAWK Device for the USRP UHD" DEPENDS = "bulkiointerfaces frontendinterfaces uhd" RDEPENDS_${PN} = "bulkiointerfaces frontendinterfaces uhd" -PR = "r2" +PR = "2" -require recipes-core/include/redhawk-repo.inc +SRC_URI = "git://github.com/redhawksdr/USRP_UHD;protocol=https;tag=${PV}-${PR}" # NOTE: This recipe requires the USRP UHD driver and hardware installed # which is provided by the meta-sdr layer which relies on meta-ettus. @@ -43,7 +44,7 @@ SRC_URI_append = "\ file://nodeconfig.patch \ " -S = "${WORKDIR}/git/redhawk-devices/USRP_UHD/cpp" +S = "${WORKDIR}/git/cpp" # We have to inherit from pythonnative if we do stuff with the system python. # autotools-brokensep is the same as autotools but our build and src locations are the same since we cannot build away from our src. diff --git a/recipes-core/include/redhawk-repo.inc b/recipes-core/include/redhawk-repo.inc deleted file mode 100644 index 01f7124..0000000 --- a/recipes-core/include/redhawk-repo.inc +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = "gitsm://github.com/RedhawkSDR/redhawk.git;tag=${REDHAWK_VERSION};branch=master;protocol=git" - -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/redhawk-core-framework/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - diff --git a/recipes-core/softpkgs/core-cpp-softpkg.inc b/recipes-core/softpkgs/core-cpp-softpkg.inc new file mode 100644 index 0000000..1414ab2 --- /dev/null +++ b/recipes-core/softpkgs/core-cpp-softpkg.inc @@ -0,0 +1,10 @@ +require recipes-core/core-framework/core-framework.inc + +# Inherit the base softpkg class +inherit redhawk-softpkg + +# Append SOFTPKG_PREFIX +SOFTPKG_PREFIX .= "/rh/${SOFTPKG_NAME}" + +SRC_URI = "git://github.com/redhawksdr/${SOFTPKG_NAME};protocol=https;tag=${PV}-${PR}" +S = "${WORKDIR}/git/cpp" diff --git a/recipes-core/softpkgs/rh-bluefilelib_2.1.0.bb b/recipes-core/softpkgs/rh-bluefilelib_2.1.0.bb new file mode 100644 index 0000000..68ca7eb --- /dev/null +++ b/recipes-core/softpkgs/rh-bluefilelib_2.1.0.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "REDHAWK BlueFile Lib SoftPkg" + +PR = "4" + +SOFTPKG_NAME = "blueFileLib" + +require core-cpp-softpkg.inc diff --git a/recipes-core/softpkgs/rh-dsp_2.0.0.bb b/recipes-core/softpkgs/rh-dsp_2.0.0.bb new file mode 100644 index 0000000..99ebc84 --- /dev/null +++ b/recipes-core/softpkgs/rh-dsp_2.0.0.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "REDHAWK DSP SoftPkg" + +PR = "5" + +SOFTPKG_NAME = "dsp" + +require core-cpp-softpkg.inc diff --git a/recipes-core/softpkgs/rh-fftlib_2.1.0.bb b/recipes-core/softpkgs/rh-fftlib_2.1.0.bb new file mode 100644 index 0000000..2586128 --- /dev/null +++ b/recipes-core/softpkgs/rh-fftlib_2.1.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "REDHAWK FFTLIB SoftPkg" + +PR = "2" + +LIC_MD5 = "d4d548a7833916fd41218fdc2430246e" + +SOFTPKG_NAME = "fftlib" + +require core-cpp-softpkg.inc + +DEPENDS += "rh-dsp fftw" +RDEPENDS_${PN} += "rh-dsp libfftwf" diff --git a/recipes-softpkg/RedhawkDevUtils/rh-redhawkdevutils_4.0.1.bb b/recipes-core/softpkgs/rh-redhawkdevutils_4.0.1.bb similarity index 56% rename from recipes-softpkg/RedhawkDevUtils/rh-redhawkdevutils_4.0.1.bb rename to recipes-core/softpkgs/rh-redhawkdevutils_4.0.1.bb index c12585b..1af9ca2 100644 --- a/recipes-softpkg/RedhawkDevUtils/rh-redhawkdevutils_4.0.1.bb +++ b/recipes-core/softpkgs/rh-redhawkdevutils_4.0.1.bb @@ -1,9 +1,10 @@ DESCRIPTION = "REDHAWK Dev Utils SoftPkg" -PR = "r6" +PR = "6" -# The core-cpp-softpkg class hierarchy handles ...a lot. -inherit redhawk-core-cpp-softpkg +require core-cpp-softpkg.inc + +SOFTPKG_NAME = "RedhawkDevUtils" # Depends on BULKIO DEPENDS += "bulkiointerfaces" diff --git a/recipes-core/softpkgs/rh-vita49_5.0.0.bb b/recipes-core/softpkgs/rh-vita49_5.0.0.bb new file mode 100644 index 0000000..1faa073 --- /dev/null +++ b/recipes-core/softpkgs/rh-vita49_5.0.0.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "REDHAWK VITA49 Libraries SoftPkg" + +PR = "3" + +require core-cpp-softpkg.inc + +SOFTPKG_NAME = "VITA49" diff --git a/recipes-deps/omniorb/omniorb_4.2.3.bb b/recipes-deps/omniorb/omniorb_4.2.3.bb index 15a981e..9a2c5ef 100644 --- a/recipes-deps/omniorb/omniorb_4.2.3.bb +++ b/recipes-deps/omniorb/omniorb_4.2.3.bb @@ -55,6 +55,8 @@ FILES_${PN}-python += "${libdir}/python2.7/site-packages/_omniidlmodule.so*" FILES_${PN}-python += "${libdir}/python2.7/site-packages/omniidl/*" FILES_${PN}-python += "${libdir}/python2.7/site-packages/omniidl_be/*" +DIRFILES = "1" + TARGET_CC_ARCH += "${LDFLAGS}" inherit autotools pkgconfig pythonnative diff --git a/recipes-deps/omniorb/omniorbpy_4.2.3.bb b/recipes-deps/omniorb/omniorbpy_4.2.3.bb index 36193b1..4f5d235 100644 --- a/recipes-deps/omniorb/omniorbpy_4.2.3.bb +++ b/recipes-deps/omniorb/omniorbpy_4.2.3.bb @@ -59,6 +59,8 @@ FILES_${PN} += " \ ${libdir}/python2.7/site-packages/CosNaming/* \ " +DIRFILES = "1" + inherit autotools pkgconfig distutils-base #ERROR: QA Issue with omniorbpy-dev: No GNU_HASH in the elf binary... diff --git a/recipes-deps/rtlsdr/rtlsdr_0.5.2.bb b/recipes-deps/rtlsdr/rtlsdr_0.5.2.bb index 17b317e..4a3b8d3 100644 --- a/recipes-deps/rtlsdr/rtlsdr_0.5.2.bb +++ b/recipes-deps/rtlsdr/rtlsdr_0.5.2.bb @@ -1,7 +1,5 @@ DESCRIPTION = "Driver for RTL-SDR device maintained by REDHAWK SDR" -include recipes-core/include/redhawk-repo.inc - inherit autotools pkgconfig HOMEPAGE = "http://sdr.osmocom.org/trac/wiki/rtl-sdr" @@ -11,10 +9,11 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libusb1" RDEPENDS_${PN} = "libusb1" -PR = "r4" +PR = "4" SRC_URI_append = "\ + git://github.com/redhawksdr/librtlsdr;protocol=https;tag=${PV}-${PR} \ file://01_fix_pkgconfig.patch \ " -S = "${WORKDIR}/git/redhawk-dependencies/librtlsdr" +S = "${WORKDIR}/git" diff --git a/recipes-devices/template-cpp/files/Add_Missing_Files.patch b/recipes-devices/template-cpp/files/Add_Missing_Files.patch deleted file mode 100644 index 70855f3..0000000 --- a/recipes-devices/template-cpp/files/Add_Missing_Files.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git src/AUTHORS src/AUTHORS -new file mode 100644 -index 0000000..e69de29 -diff --git src/ChangeLog src/ChangeLog -new file mode 100644 -index 0000000..e69de29 -diff --git src/NEWS src/NEWS -new file mode 100644 -index 0000000..e69de29 -diff --git src/README src/README -new file mode 100644 -index 0000000..e69de29 diff --git a/recipes-devices/template-cpp/template-cpp.bb.tpl b/recipes-devices/template-cpp/template-cpp.bb.tpl deleted file mode 100644 index 42d7869..0000000 --- a/recipes-devices/template-cpp/template-cpp.bb.tpl +++ /dev/null @@ -1,91 +0,0 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# - - -DESCRIPTION = "REDHAWK SDR C++ Device Recipe Template" -HOMEPAGE = "http://www.your-org.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -# DEPENDS -- These are your build dependencies -# RDEPENDS -- Runtime dependencies (i.e., on the embedded system) -DEPENDS = "redhawk" -RDEPENDS_${PN} = "redhawk" - -# If you do not specify a tag, you will need to specify the commit -# hash using a separate recipe variable. -SRC_URI = "git://;tag=;protocol=git \ - file://Add_Missing_Files.patch \ - " - -# Revision number -PR = "r0" - -# This is the "source" directory for where to look for a Makefile, for example. -S = "${WORKDIR}/git/cpp" - -# We use autotools, but brokensep since it's less problemmatic for us -# to build in ${S} rather than the usual behavior of trying to copy files -# out of the source tree into a build directory, and then build. -# Note the use of the redhawk-device class. It provides some nice post- -# installation behaviors as well as SDRROOT and OSSIEHOME, among other things. -inherit autotools-brokensep pkgconfig pythonnative redhawk-device - -# This ensures the packager collects things in the SDRROOT and ignores -# the fact we're not trying to break things up into individual packages. -FILES_${PN} += "${SDRROOT}/*" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" - -# You may need to patch your Makefile.am so that OSSIEHOME isn't specified. -EXTRA_OECONF += "--prefix=${SDRROOT}" - -# Setting pymod_ossie=yes is to avoid the configure call checking for the -# python ossie module. This isn't ideal but it checks by running python and -# trying to import said module which is all cross compiled. -# We could have it run in a native build but what does that really prove then? -CACHED_CONFIGUREVARS += "ac_cv_pymod_ossie=yes" - -# The compiler in Dizzy is GCC v4.8 which may cause problems because of the -# liberties taken with the templating system in REDHAWK. To get around this -# issue, the meta-redhawk-sdr layer requires GCC 4.8 and you should (almost) -# always use these flags: -CXXFLAGS += "-fpermissive" -CFLAGS += "-fpermissive" - - -# IF you plan on using node-deployer, your device must install its own -# node definition. See the GPP, RTL2832U or the USRP_UHD for example -# scripts. See those recipes' do_install_append methods for how each -# calls its own script with command line options. Also note the use of -# weak-set variables so that end-users can specify those values -# in their local.conf or through a .bbappend. - - -# IF your node-creating script is in the parent directory of ${S}, you -# may need to do this step if you need to apply a patch (see RTL2832U and -# the USRP_UHD). - -# addtask link_nodeconfig before do_patch after do_unpack -# do_link_nodeconfig () { -# mv ${S}/../nodeconfig.py ${S} -# ln -sf ${S}/nodeconfig.py ${S}/../nodeconfig.py -# } - - diff --git a/recipes-softpkg/VITA49/rh-vita49_5.0.0.bb b/recipes-softpkg/VITA49/rh-vita49_5.0.0.bb deleted file mode 100644 index 8d5ee8c..0000000 --- a/recipes-softpkg/VITA49/rh-vita49_5.0.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "REDHAWK VITA49 Libraries SoftPkg" - -PR = "r3" - -# The core-cpp-softpkg class hierarchy handles ...a lot. -inherit redhawk-core-cpp-softpkg - -# This library location in the main repo is VITA49Libraries -SOFTPKG_REPO_DIR = "VITA49Libraries" diff --git a/recipes-softpkg/blueFileLib/rh-bluefilelib_2.1.0.bb b/recipes-softpkg/blueFileLib/rh-bluefilelib_2.1.0.bb deleted file mode 100644 index a3db758..0000000 --- a/recipes-softpkg/blueFileLib/rh-bluefilelib_2.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -DESCRIPTION = "REDHAWK BlueFile Lib SoftPkg" - -PR = "r4" - -# The core-cpp-softpkg class hierarchy handles ...a lot. -inherit redhawk-core-cpp-softpkg diff --git a/recipes-softpkg/dsp/rh-dsp_2.0.0.bb b/recipes-softpkg/dsp/rh-dsp_2.0.0.bb deleted file mode 100644 index 4dc4bcc..0000000 --- a/recipes-softpkg/dsp/rh-dsp_2.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -DESCRIPTION = "REDHAWK DSP SoftPkg" - -PR = "r5" - -# The core-cpp-softpkg class hierarchy handles ...a lot. -inherit redhawk-core-cpp-softpkg diff --git a/recipes-softpkg/fftlib/rh-fftlib_2.1.0.bb b/recipes-softpkg/fftlib/rh-fftlib_2.1.0.bb deleted file mode 100644 index 72165f1..0000000 --- a/recipes-softpkg/fftlib/rh-fftlib_2.1.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "REDHAWK FFTLIB SoftPkg" - -PR = "r2" - -# The core-cpp-softpkg class hierarchy handles ...a lot. -inherit redhawk-core-cpp-softpkg - -SRC_URI_append = "\ - " - -DEPENDS += "rh-dsp fftw" -RDEPENDS_${PN} += "rh-dsp libfftwf" From 9ad453957b8612f7e6ecd57ad18f5ec47a5f9c6a Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Thu, 13 Dec 2018 08:29:53 -0500 Subject: [PATCH 09/35] fftw3 - Earlier commit did not remove the patch file. --- .../fftlib/files/fftw3_removal.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 recipes-softpkg/fftlib/files/fftw3_removal.patch diff --git a/recipes-softpkg/fftlib/files/fftw3_removal.patch b/recipes-softpkg/fftlib/files/fftw3_removal.patch deleted file mode 100644 index 6d350a9..0000000 --- a/recipes-softpkg/fftlib/files/fftw3_removal.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- cpp/configure.ac 2017-07-21 11:00:55.961173854 -0400 -+++ cpp/configure.ac.new 2017-07-21 13:21:27.126171563 -0400 -@@ -33,7 +33,7 @@ - - # Dependencies - PKG_CHECK_MODULES([REDHAWK], [ossie >= 2.0]) --PKG_CHECK_MODULES([PROJECTDEPS], [fftw3 >= 3.0 fftw3f >= 3.0]) -+PKG_CHECK_MODULES([PROJECTDEPS], [fftw3f >= 3.0]) - RH_SOFTPKG_CXX([/deps/rh/dsp/dsp.spd.xml],[cpp],[2.0]) - OSSIE_ENABLE_LOG4CXX - AX_BOOST_BASE([1.41]) ---- cpp/rh.fftlib.pc.in 2017-07-21 11:00:55.962173862 -0400 -+++ cpp/rh.fftlib.pc.in.new 2017-07-21 13:21:17.793117117 -0400 -@@ -23,7 +23,7 @@ - - Name: rh.fftlib - Description: basic-components signal processing shared library wrapping FFTW --Requires: rh.dsp >= 2.0 fftw3 >= 3.0 fftw3f >= 3.0 -+Requires: rh.dsp >= 2.0 fftw3f >= 3.0 - Version: 2.0.0 --Libs: -L${libdir} -lfftlib -lfftw3 -lfftw3f -+Libs: -L${libdir} -lfftlib -lfftw3f - Cflags: -I${includedir} From 5fd3ac135906e77ec39bbb57831a53b04d614d5f Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Thu, 13 Dec 2018 08:30:41 -0500 Subject: [PATCH 10/35] Cleaning/removing brokensep comments --- classes/redhawk-component.bbclass | 4 ---- classes/redhawk-device.bbclass | 2 -- recipes-core/devices/usrp-uhd_6.1.0.bb | 3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/classes/redhawk-component.bbclass b/classes/redhawk-component.bbclass index 5ed5877..ac6a270 100644 --- a/classes/redhawk-component.bbclass +++ b/classes/redhawk-component.bbclass @@ -1,5 +1 @@ - -# We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. - inherit autotools-brokensep pkgconfig redhawk-entity diff --git a/classes/redhawk-device.bbclass b/classes/redhawk-device.bbclass index ee1a014..8406722 100644 --- a/classes/redhawk-device.bbclass +++ b/classes/redhawk-device.bbclass @@ -1,5 +1,3 @@ -# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. - inherit autotools-brokensep pkgconfig redhawk-entity DEPENDS += "omniorb-native omniorbpy-native" diff --git a/recipes-core/devices/usrp-uhd_6.1.0.bb b/recipes-core/devices/usrp-uhd_6.1.0.bb index 354090c..fea1038 100644 --- a/recipes-core/devices/usrp-uhd_6.1.0.bb +++ b/recipes-core/devices/usrp-uhd_6.1.0.bb @@ -47,7 +47,8 @@ SRC_URI_append = "\ S = "${WORKDIR}/git/cpp" # We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the same as autotools but our build and src locations are the same since we cannot build away from our src. +# autotools-brokensep is the same as autotools but our build and src locations +# are the same since we cannot build away from our src. inherit autotools-brokensep pkgconfig pythonnative redhawk-device EXTRA_OECONF += "--prefix=${SDRROOT}" From d96d2202c8c89a68fcd36d1bd5256dd6f591475f Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Thu, 13 Dec 2018 08:31:02 -0500 Subject: [PATCH 11/35] Changing default REDHAWK_PROCESSOR to MACHINE_ARCH The previous default was x86_64, which isn't terribly helpful if you are using qemuarm or qemuarm64. Now we default to MACHINE_ARCH as a bit more dynamic of a guess (but it's still a guess). --- conf/layer.conf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 9b39053..2421670 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -43,12 +43,10 @@ LAYERDEPENDS_redhawk-sdr = "\ REDHAWK_VERSION ?= "2.2.1" require conf/versions/redhawk.inc -# Dynamic architecture patch for whatever ${REDHAWK_PROCESSOR} is set to. -# 1. This takes whatever is ${NODE_CONFIG_SCRIPT} and find where it hard-codes the architecture look-up, -# replacing it for ${REDHAWK_PROCESSOR} -# 2. This changes processor name x86_64 and replaces it with ${REDHAWK_PROCESSOR}. -# 3. This removes processor name x86. -REDHAWK_PROCESSOR ?= "x86_64" +# In several places, the processor architecture may not match any available variable, but +# will need to match the response of uname in the running system. Patches in this layer +# address that need using this variable, which can be overridden as needed. +REDHAWK_PROCESSOR ?= "${MACHINE_ARCH}" REDHAWK_PROCESSOR_rpi ?= "armv7l" REDHAWK_PROCESSOR_zynq ?= "armv7l" REDHAWK_PROCESSOR_zynqmp ?= "aarch64" From ae44cf1707ee1d0e3010cfbabc001534d43fc56f Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 7 Jan 2019 14:24:02 -0500 Subject: [PATCH 12/35] Bugfix: redhawk-codegen installs to libdir vs. ossiehome/lib/python --- recipes-core/core-framework/redhawk-codegen_2.2.1.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes-core/core-framework/redhawk-codegen_2.2.1.bb b/recipes-core/core-framework/redhawk-codegen_2.2.1.bb index 6821d9f..4ec869b 100644 --- a/recipes-core/core-framework/redhawk-codegen_2.2.1.bb +++ b/recipes-core/core-framework/redhawk-codegen_2.2.1.bb @@ -18,7 +18,7 @@ # along with this program. If not, see http://www.gnu.org/licenses/. # require core-framework-2.2.1.inc -inherit setuptools +inherit setuptools redhawk-sysroot DESCRIPTION = "REDHAWK Codegen" @@ -42,6 +42,7 @@ do_configure_prepend() { BBCLASSEXTEND = "native" -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/site.py* -} +PYTHON_SITEPACKAGES_DIR = "${OSSIEHOME}/lib/python" +DISTUTILS_INSTALL_ARGS = "--prefix=${D}/${OSSIEHOME}" + +FILES_${PN} = "${OSSIEHOME}" From 2b56a77c45fce1b1195723f82f36e5cea5407f0a Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 7 Jan 2019 14:26:40 -0500 Subject: [PATCH 13/35] Cleaning up tabs --- recipes-core/core-framework/redhawk-codegen_2.2.1.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-core/core-framework/redhawk-codegen_2.2.1.bb b/recipes-core/core-framework/redhawk-codegen_2.2.1.bb index 4ec869b..5ef6fca 100644 --- a/recipes-core/core-framework/redhawk-codegen_2.2.1.bb +++ b/recipes-core/core-framework/redhawk-codegen_2.2.1.bb @@ -34,10 +34,10 @@ S = "${WORKDIR}/git/redhawk-codegen" # This is a python package do_configure_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} } BBCLASSEXTEND = "native" From 25909a9f591bb7ec3be8256fd497e6ba6df9850b Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 7 Jan 2019 14:28:54 -0500 Subject: [PATCH 14/35] Collecting REDHAWK_PROCESSOR into redhawk.inc --- conf/layer.conf | 8 -------- conf/versions/redhawk.inc | 12 +++++------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 2421670..e88cecd 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -42,11 +42,3 @@ LAYERDEPENDS_redhawk-sdr = "\ # ##################################################### REDHAWK_VERSION ?= "2.2.1" require conf/versions/redhawk.inc - -# In several places, the processor architecture may not match any available variable, but -# will need to match the response of uname in the running system. Patches in this layer -# address that need using this variable, which can be overridden as needed. -REDHAWK_PROCESSOR ?= "${MACHINE_ARCH}" -REDHAWK_PROCESSOR_rpi ?= "armv7l" -REDHAWK_PROCESSOR_zynq ?= "armv7l" -REDHAWK_PROCESSOR_zynqmp ?= "aarch64" diff --git a/conf/versions/redhawk.inc b/conf/versions/redhawk.inc index 90cf46f..03b73b8 100644 --- a/conf/versions/redhawk.inc +++ b/conf/versions/redhawk.inc @@ -1,11 +1,9 @@ require redhawk-${REDHAWK_VERSION}.inc -# Dynamic architecture patch for whatever ${REDHAWK_PROCESSOR} is set to. -# 1. This takes whatever is ${NODE_CONFIG_SCRIPT} and find where it hard-codes the architecture look-up, -# replacing it for ${REDHAWK_PROCESSOR} -# 2. This changes processor name x86_64 and replaces it with ${REDHAWK_PROCESSOR}. -# 3. This removes processor name x86. -REDHAWK_PROCESSOR ?= "x86_64" +# In several places, the processor architecture may not match any available variable, but +# will need to match the response of uname in the running system. Patches in this layer +# address that need using this variable, which can be overridden as needed. +REDHAWK_PROCESSOR ?= "${MACHINE_ARCH}" REDHAWK_PROCESSOR_rpi ?= "armv7l" REDHAWK_PROCESSOR_zynq ?= "armv7l" -REDHAWK_PROCESSOR_zynqmp ?= "aarch64" \ No newline at end of file +REDHAWK_PROCESSOR_zynqmp ?= "aarch64" From 38f41ffd9a6433472a685a3bd35040ab8c2fb46b Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 7 Jan 2019 14:38:03 -0500 Subject: [PATCH 15/35] Moved node config from entity to device class The entity class applied to components as well, whereas the node configuration would only apply to a device. --- classes/redhawk-device.bbclass | 8 ++++++++ classes/redhawk-entity.bbclass | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/classes/redhawk-device.bbclass b/classes/redhawk-device.bbclass index 8406722..2e3e63d 100644 --- a/classes/redhawk-device.bbclass +++ b/classes/redhawk-device.bbclass @@ -1,3 +1,11 @@ inherit autotools-brokensep pkgconfig redhawk-entity DEPENDS += "omniorb-native omniorbpy-native" + +NODE_CONFIG_SCRIPT ?= "" +do_nodeconfig_patch () { + if ! [ -z ${NODE_CONFIG_SCRIPT} ] ; then + sed -i "s/tmp_proc_map.get(tmp_uname_p, 'x86')/'${REDHAWK_PROCESSOR}'/g" ${S}/${NODE_CONFIG_SCRIPT} + fi +} +do_patch[postfuncs] += "do_nodeconfig_patch" diff --git a/classes/redhawk-entity.bbclass b/classes/redhawk-entity.bbclass index 9c1a2bd..01e9f84 100644 --- a/classes/redhawk-entity.bbclass +++ b/classes/redhawk-entity.bbclass @@ -30,11 +30,7 @@ do_install_prepend() { export PYTHONPATH=${OSSIEHOME_STAGED}/lib/python:${PYTHONPATH} } -NODE_CONFIG_SCRIPT ?= "" do_dynamic_arch_patch () { - if ! [ -z ${NODE_CONFIG_SCRIPT} ] ; then - sed -i "s/tmp_proc_map.get(tmp_uname_p, 'x86')/'${REDHAWK_PROCESSOR}'/g" ${S}/${NODE_CONFIG_SCRIPT} - fi find ${S}/../ -name *.spd.xml -exec sed -i "s///g" {} \; find ${S}/../ -name *.spd.xml -exec sed -i "s///g" {} \; } From 9f5fdf7dabc099870977cbe07909d85f817db50e Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 7 Jan 2019 14:42:54 -0500 Subject: [PATCH 16/35] Moving redhawk depends/rdepends to top-level entity class This makes sense logically since at a minimum any redhawk entity depends on redhawk (though it may depend on something more specific like bulkio). --- classes/redhawk-entity.bbclass | 4 ++++ classes/redhawk-softpkg.bbclass | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/redhawk-entity.bbclass b/classes/redhawk-entity.bbclass index 01e9f84..5b9d9b3 100644 --- a/classes/redhawk-entity.bbclass +++ b/classes/redhawk-entity.bbclass @@ -19,6 +19,10 @@ do_configure_prepend() { sed -i 's/domdir = $(prefix)/domdir = $(SDR_ROOT)/g' Makefile.am sed -i 's,${prefix}/dom/deps,${SDR_ROOT}/dom/deps,g' configure.ac } +# Basic set of depends +DEPENDS = "redhawk redhawk-native" +RDEPENDS_${PN} = "redhawk" + # Needed so that when the python distutils is run it can get the system prefix. do_install_prepend() { diff --git a/classes/redhawk-softpkg.bbclass b/classes/redhawk-softpkg.bbclass index 5ee8e67..5cdab32 100644 --- a/classes/redhawk-softpkg.bbclass +++ b/classes/redhawk-softpkg.bbclass @@ -1,8 +1,5 @@ inherit autotools-brokensep pkgconfig redhawk-entity -# Basic set of depends -DEPENDS = "redhawk" -RDEPENDS_${PN} = "redhawk" # Set/append SOFTPKG_PREFIX to the installation directory of your softpkg. # Standard REDHAWK Deps install with a package config as: From fee1d9c7bcb8e187c0232c923c77b4b5d10ea54e Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 7 Jan 2019 14:57:36 -0500 Subject: [PATCH 17/35] Normalizing whitespace usage --- .../core-framework/core-framework-autotools.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-core/core-framework/core-framework-autotools.inc b/recipes-core/core-framework/core-framework-autotools.inc index 81eca49..c221171 100644 --- a/recipes-core/core-framework/core-framework-autotools.inc +++ b/recipes-core/core-framework/core-framework-autotools.inc @@ -47,7 +47,7 @@ INSANE_SKIP_${PN}-dbg += "libdir" # OECONF EXTRA_OECONF += "\ - --disable-java \ + --disable-java \ OMNIORB_INCLUDEDIR=${STAGING_INCDIR} \ idldir=${STAGING_DATADIR}/idl/omniORB \ OMNICOS_IDLDIR=${STAGING_DATADIR}/idl/omniORB/COS \ @@ -55,8 +55,8 @@ EXTRA_OECONF += "\ # Needed so that when the python distutils is run it can get the system prefix. do_install_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} } From 8da6bf3d508cde0c143b13e508559194e3a3bcad Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 07:58:39 -0500 Subject: [PATCH 18/35] Switched to platform.machine vs. platform.processor Some architectures return nothing for platform.processor (empty string) even though uname -p returns something. In those instances uname -m and platform.machine seem to match. Additionally, parts of the core framework (aside from the GPP) seem to use the machine rather than the processor as well. This change enables using the qemuarm64 machine for testing. --- .../gpp-2.2.1/{trust-uname-p.patch => trust-uname-m.patch} | 3 ++- recipes-core/devices/gpp_2.2.1.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) rename recipes-core/devices/gpp-2.2.1/{trust-uname-p.patch => trust-uname-m.patch} (86%) diff --git a/recipes-core/devices/gpp-2.2.1/trust-uname-p.patch b/recipes-core/devices/gpp-2.2.1/trust-uname-m.patch similarity index 86% rename from recipes-core/devices/gpp-2.2.1/trust-uname-p.patch rename to recipes-core/devices/gpp-2.2.1/trust-uname-m.patch index a9f27a5..c18ea44 100644 --- a/recipes-core/devices/gpp-2.2.1/trust-uname-p.patch +++ b/recipes-core/devices/gpp-2.2.1/trust-uname-m.patch @@ -4,7 +4,8 @@ Index: cpp/gpp_setup +++ cpp/gpp_setup @@ -87,10 +87,8 @@ class BaseConfigurator(object): self.props['hostName'] = self.hostname - tmp_uname_p = platform.processor() +- tmp_uname_p = platform.processor() ++ tmp_uname_p = platform.machine() tmp_proc_map = {'i386':'x86', - 'i686':'x86', - 'x86_64':'x86_64', diff --git a/recipes-core/devices/gpp_2.2.1.bb b/recipes-core/devices/gpp_2.2.1.bb index 0777acf..f6f53e8 100644 --- a/recipes-core/devices/gpp_2.2.1.bb +++ b/recipes-core/devices/gpp_2.2.1.bb @@ -30,7 +30,7 @@ SRC_URI_append = "\ file://amflags_no_test_or_config.patch \ file://configure-gpp \ file://GPP_ps_e.patch \ - file://trust-uname-p.patch \ + file://trust-uname-m.patch \ " # ################################################ From e229cf91556bb3103046fb26756c41a1809d6629 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 08:57:03 -0500 Subject: [PATCH 19/35] Nodes inits missing a fail path that cleans up in that case. --- recipes-core/core-framework/domain-init/domain-init.d | 2 +- recipes-core/devices/node-deployer-1.0.0/node-init.d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-core/core-framework/domain-init/domain-init.d b/recipes-core/core-framework/domain-init/domain-init.d index 6523e2c..0c1729b 100644 --- a/recipes-core/core-framework/domain-init/domain-init.d +++ b/recipes-core/core-framework/domain-init/domain-init.d @@ -52,7 +52,7 @@ do_start() { echo "PID file exists. Attemping to stop before starting." do_stop fi - nodeBooter $DAEMON_ARGS + nodeBooter $DAEMON_ARGS || do_stop } do_stop() { diff --git a/recipes-core/devices/node-deployer-1.0.0/node-init.d b/recipes-core/devices/node-deployer-1.0.0/node-init.d index dd7e5da..3bc8d1d 100755 --- a/recipes-core/devices/node-deployer-1.0.0/node-init.d +++ b/recipes-core/devices/node-deployer-1.0.0/node-init.d @@ -60,7 +60,7 @@ do_start() { echo "PID file exists. Attemping to stop before starting." do_stop fi - nodeBooter $DAEMON_ARGS + nodeBooter $DAEMON_ARGS || do_stop } do_stop() { From d8b78f5c5850b1e199931ec21f1015f6382c0dbd Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:06:12 -0500 Subject: [PATCH 20/35] Cleaning up packaging of redhawk to expose componenthost Cleaned up packaging of the main redhawk, -dbg, etc. patches to not collect the ComponentHost container. Added ComponentHost as a new package to help with multi-impl domain integration (an upcoming feature). --- .../core-framework-autotools.inc | 8 +++--- .../core-framework/redhawk-codegen_2.2.1.bb | 4 +++ recipes-core/core-framework/redhawk_2.2.1.bb | 26 ++++++++++++++----- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/recipes-core/core-framework/core-framework-autotools.inc b/recipes-core/core-framework/core-framework-autotools.inc index c221171..36ec747 100644 --- a/recipes-core/core-framework/core-framework-autotools.inc +++ b/recipes-core/core-framework/core-framework-autotools.inc @@ -15,11 +15,11 @@ PROVIDES += "${PN}-python" DIRFILES = "1" # Common packaging structure -FILES_${PN}-python += " \ +FILES_${PN}-python = " \ ${OSSIEHOME}/lib/python \ " -FILES_${PN} += " \ +FILES_${PN} = " \ ${OSSIEHOME}/share \ ${OSSIEHOME}/lib/lib*.so.* \ " @@ -34,7 +34,7 @@ FILES_${PN}-dev += " \ ${OSSIEHOME}/lib/pkgconfig \ " -FILES_${PN}-staticdev += " \ +FILES_${PN}-staticdev = " \ ${OSSIEHOME}/lib/*.a \ ${OSSIEHOME}/lib/*.la \ " @@ -60,3 +60,5 @@ do_install_prepend() { export STAGING_INCDIR=${STAGING_INCDIR} export STAGING_LIBDIR=${STAGING_LIBDIR} } + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" diff --git a/recipes-core/core-framework/redhawk-codegen_2.2.1.bb b/recipes-core/core-framework/redhawk-codegen_2.2.1.bb index 5ef6fca..da26b33 100644 --- a/recipes-core/core-framework/redhawk-codegen_2.2.1.bb +++ b/recipes-core/core-framework/redhawk-codegen_2.2.1.bb @@ -40,6 +40,10 @@ do_configure_prepend() { export STAGING_LIBDIR=${STAGING_LIBDIR} } +do_install_append() { + rm -f ${D}${OSSIEHOME}/lib/python/redhawk/__init__.py* +} + BBCLASSEXTEND = "native" PYTHON_SITEPACKAGES_DIR = "${OSSIEHOME}/lib/python" diff --git a/recipes-core/core-framework/redhawk_2.2.1.bb b/recipes-core/core-framework/redhawk_2.2.1.bb index d449706..fe3718e 100644 --- a/recipes-core/core-framework/redhawk_2.2.1.bb +++ b/recipes-core/core-framework/redhawk_2.2.1.bb @@ -27,6 +27,9 @@ PR = "2" DEPENDS += "omniorbpy log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip expat boost boost-native python-numpy python-threading python-numbers python-resource ossp-uuid" RDEPENDS_${PN} = "python omniorbpy omniorb omnievents e2fsprogs apr-util apr zip expat boost python-numpy python-threading python-subprocess python-numbers python-xml python-resource ossp-uuid" RDEPENDS_${PN}-python = "${PN} omniorb-python omniorbpy python-numpy python-threading python-numbers python-resource python-xml python-lxml python-setuptools" +COMPONENTHOST_PN := "rh-componenthost" +PACKAGES += "${COMPONENTHOST_PN}" + SRC_URI_append = "\ file://uuid_python_package.patch \ @@ -51,6 +54,22 @@ EXTRA_OECONF += "\ --without-tests \ " +COMPONENTHOST_PATH = "${SDRROOT}/dom/mgr/rh/ComponentHost" +FILES_${COMPONENTHOST_PN} = "${COMPONENTHOST_PATH}" + +FILES_${PN} += " \ + ${OSSIEHOME}/bin/redhawk-shminfo \ + ${OSSIEHOME}/bin/redhawk-shmclean \ + ${OSSIEHOME}/bin/nodeBooter \ + ${SDRROOT}/dom/mgr/DomainManager* \ + ${SDRROOT}/dom/domain \ + ${SDRROOT}/dom/deps \ + ${SDRROOT}/dom/components \ + ${SDRROOT}/dom/waveforms \ + ${SDRROOT}/dev \ + /etc/* \ + " + FILES_${PN}-dbg += " \ ${SDRROOT}/dev/mgr/.debug \ ${SDRROOT}/dom/mgr/.debug \ @@ -73,13 +92,6 @@ FILES_${PN}-python += " \ ${OSSIEHOME}/bin/cleanes \ " -FILES_${PN} += " \ - ${OSSIEHOME}/bin/redhawk-shminfo \ - ${OSSIEHOME}/bin/redhawk-shmclean \ - ${OSSIEHOME}/bin/nodeBooter \ - ${SDRROOT}/* \ - /etc/* \ -" # Patch for lack of support in specifying an alternative to armv7l and various x86 options. do_redhawk_processor_patch () { From 9a32b5a7853967148feaae44b0022cbab55701c1 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:09:06 -0500 Subject: [PATCH 21/35] Updated component host patch for multi-impl integration. --- .../componenthost_redhawk_processor.patch | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/recipes-core/core-framework/redhawk-2.2.1/componenthost_redhawk_processor.patch b/recipes-core/core-framework/redhawk-2.2.1/componenthost_redhawk_processor.patch index 1641b61..d086544 100644 --- a/recipes-core/core-framework/redhawk-2.2.1/componenthost_redhawk_processor.patch +++ b/recipes-core/core-framework/redhawk-2.2.1/componenthost_redhawk_processor.patch @@ -2,7 +2,20 @@ Index: src/control/sdr/ComponentHost/ComponentHost.spd.xml =================================================================== --- src.orig/control/sdr/ComponentHost/ComponentHost.spd.xml +++ src/control/sdr/ComponentHost/ComponentHost.spd.xml -@@ -40,7 +40,6 @@ with this program. If not, see http://w +@@ -30,17 +30,16 @@ with this program. If not, see http://w + + + +- ++ + Deployable container for launching multiple components in the same process + +- +- ComponentHost ++ ++ ComponentHost-BB_REDHAWK_PROCESSOR + + From 5be3441a790f2a68a33e8c00cfcae5ed9197dd41 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:22:20 -0500 Subject: [PATCH 22/35] Made configure_gpp 'find' the setup script rather than assume impl. --- recipes-core/devices/gpp-2.2.1/configure-gpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/devices/gpp-2.2.1/configure-gpp b/recipes-core/devices/gpp-2.2.1/configure-gpp index 2e34c2d..7f7d26e 100755 --- a/recipes-core/devices/gpp-2.2.1/configure-gpp +++ b/recipes-core/devices/gpp-2.2.1/configure-gpp @@ -10,7 +10,7 @@ echo "Configuring GPP" source /etc/profile cd $SDRROOT/dev/devices/GPP -cpp/gpp_setup \ +$(find . -name gpp_setup) \ --location=./ \ --mcastnic=MCASTNIC \ --nodename=GPP_NODE_NAME \ From 47ad0690b9510ab4b31d00d6020ab6cb9e0e9d1d Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:23:13 -0500 Subject: [PATCH 23/35] Removed unnecessary import of platform --- recipes-core/devices/node-deployer-1.0.0/node-merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/devices/node-deployer-1.0.0/node-merge.py b/recipes-core/devices/node-deployer-1.0.0/node-merge.py index 60df005..edb13dd 100755 --- a/recipes-core/devices/node-deployer-1.0.0/node-merge.py +++ b/recipes-core/devices/node-deployer-1.0.0/node-merge.py @@ -20,7 +20,7 @@ # -import os, sys, commands, logging, platform, shutil, socket +import os, sys, commands, logging, shutil, socket from ossie import parsers from ossie.utils.model import _uuidgen as uuidgen From 2664d0b904da0f085aeb78aeafc216b27b8d2f1b Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:24:48 -0500 Subject: [PATCH 24/35] Cleaning up redhawk recipe formatting to avoid super-long lines, etc. --- recipes-core/core-framework/redhawk_2.2.1.bb | 21 +++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/recipes-core/core-framework/redhawk_2.2.1.bb b/recipes-core/core-framework/redhawk_2.2.1.bb index fe3718e..56a82e7 100644 --- a/recipes-core/core-framework/redhawk_2.2.1.bb +++ b/recipes-core/core-framework/redhawk_2.2.1.bb @@ -24,12 +24,23 @@ DESCRIPTION = "REDHAWK Core Framework" PR = "2" -DEPENDS += "omniorbpy log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip expat boost boost-native python-numpy python-threading python-numbers python-resource ossp-uuid" -RDEPENDS_${PN} = "python omniorbpy omniorb omnievents e2fsprogs apr-util apr zip expat boost python-numpy python-threading python-subprocess python-numbers python-xml python-resource ossp-uuid" -RDEPENDS_${PN}-python = "${PN} omniorb-python omniorbpy python-numpy python-threading python-numbers python-resource python-xml python-lxml python-setuptools" COMPONENTHOST_PN := "rh-componenthost" PACKAGES += "${COMPONENTHOST_PN}" +DEPENDS += "\ + omniorbpy log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip \ + expat boost boost-native python-numpy python-threading python-numbers \ + python-resource ossp-uuid \ + " +RDEPENDS_${PN} += "\ + python omniorbpy omniorb omnievents e2fsprogs apr-util apr zip expat boost \ + python-numpy python-threading python-subprocess python-numbers python-xml \ + python-resource ossp-uuid \ + " +RDEPENDS_${PN}-python += "\ + ${PN} omniorb-python omniorbpy python-numpy python-threading \ + python-numbers python-resource python-xml python-lxml python-setuptools" + SRC_URI_append = "\ file://uuid_python_package.patch \ @@ -43,7 +54,7 @@ SRC_URI_append = "\ file://ossie_cv_sdr_root_target.patch \ file://include_scoped_ptr.patch \ file://componenthost_redhawk_processor.patch \ -" + " S = "${WORKDIR}/git/redhawk/src" @@ -90,7 +101,7 @@ FILES_${PN}-python += " \ ${OSSIEHOME}/bin/py2prf \ ${OSSIEHOME}/bin/eventviewer \ ${OSSIEHOME}/bin/cleanes \ -" + " # Patch for lack of support in specifying an alternative to armv7l and various x86 options. From 9bdf13f9a07a63dec6b27ce9191559a7930945cd Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:25:43 -0500 Subject: [PATCH 25/35] Unified processor patch and accounted for ComponentHost install The "new" architecture component host will be -arch in the SPD. This ensures the built binary is that name. --- recipes-core/core-framework/redhawk_2.2.1.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/recipes-core/core-framework/redhawk_2.2.1.bb b/recipes-core/core-framework/redhawk_2.2.1.bb index 56a82e7..faf9cbd 100644 --- a/recipes-core/core-framework/redhawk_2.2.1.bb +++ b/recipes-core/core-framework/redhawk_2.2.1.bb @@ -108,8 +108,14 @@ FILES_${PN}-python += " \ do_redhawk_processor_patch () { find ${S} -type f -exec sed -i "s/BB_REDHAWK_PROCESSOR/${REDHAWK_PROCESSOR}/g" {} \; } -do_redhawk_processor_patch[vardeps] += "REDHAWK_PROCESSOR" -addtask redhawk_processor_patch after do_patch before do_configure +do_patch[postfuncs] += "do_redhawk_processor_patch" + +do_install_append () { + # Rename ComponentHost to match the entrypoint created by the + # componenthost SPD patch + mv ${D}${COMPONENTHOST_PATH}/ComponentHost \ + ${D}${COMPONENTHOST_PATH}/ComponentHost-${REDHAWK_PROCESSOR} +} # Get the things from /etc (sysconfdir) redhawk_core_etc_sysroot () { From f93669b7827d8d0be1f9f9fc9d739d3cabdc994c Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:33:26 -0500 Subject: [PATCH 26/35] Added integration script for patching implementations pre-install This script requires "native" recipes of REDHAWK to function within a recipe. In a host OS, it also acts as an installer for yocto-built components, etc. into a domain of different architecture. --- conf/layer.conf | 3 + scripts/spd_utility | 299 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 302 insertions(+) create mode 100755 scripts/spd_utility diff --git a/conf/layer.conf b/conf/layer.conf index e88cecd..521d77d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -42,3 +42,6 @@ LAYERDEPENDS_redhawk-sdr = "\ # ##################################################### REDHAWK_VERSION ?= "2.2.1" require conf/versions/redhawk.inc + +# Utility scripts for REDHAWK +PATH =. "${LAYERDIR}/scripts:" diff --git a/scripts/spd_utility b/scripts/spd_utility new file mode 100755 index 0000000..f57f419 --- /dev/null +++ b/scripts/spd_utility @@ -0,0 +1,299 @@ +#!/usr/bin/env python +# Author: Thomas Goodwin +# +# Purpose: +# 1. Patches a source tree to include a new implementation. +# +# 2. Patches a binary tree to include a new implementation. +import os +import sys +import copy +import shutil +import re +import logging +from optparse import OptionParser + +from ossie.parsers import spd + +LOGGER_NAME = 'SPD Utility' + +EXIT_OKAY = 0 +EXIT_NO_PATH = EXIT_OKAY + 1 +EXIT_TOO_MANY_ARGS = EXIT_NO_PATH + 1 +EXIT_TOO_MANY_OPTIONS = EXIT_TOO_MANY_ARGS + 1 +EXIT_NEW_IMPL_ALREADY_EXISTS = EXIT_OKAY +EXIT_NO_X86_IMPL_EXISTS = EXIT_TOO_MANY_OPTIONS + 1 +EXIT_NO_SPD_FOUND = EXIT_NO_X86_IMPL_EXISTS + 1 +EXIT_UNKNOWN_TARGET_TYPE = EXIT_NO_SPD_FOUND + 1 +EXIT_PATCH_SOURCE_OR_INSTALL = EXIT_UNKNOWN_TARGET_TYPE + 1 + +def get_impl(the_spd, the_name): + ''' + Returns the implementation + ''' + for impl in the_spd.get_implementation(): + names = [p.get_name() for p in impl.get_processor()] + if the_name in names: + return impl + return None + +def patch_source(spd_path, processor_name, replace=False): + ''' + Attempts to find an x86_64 implementation duplicate that source tree + as the processor_name, then insert the new implementation and then + writes out the updated SPD XML. + + In the case of ComponentHost, the entrypoint executable name will + change rather than the directory. + ''' + _log = logging.getLogger(LOGGER_NAME) + project_spd = spd.parse(spd_path) + is_componenthost = project_spd.get_name().endswith('ComponentHost') + + x86_impl = get_impl(project_spd, 'x86_64') + if not x86_impl: + _log.error("No x86_64 implementation exists. Something is wrong.") + sys.exit(EXIT_NO_X86_IMPL_EXISTS) + + new_impl = get_impl(project_spd, processor_name) + if new_impl: + _log.info("Implementation %s already exists" % (processor_name)) + sys.exit(EXIT_NEW_IMPL_ALREADY_EXISTS) + + # Duplicate or replace + if replace: + new_impl = x86_impl + new_impl.set_processor([]) + _log.info("Replaced the x86_64 implementation") + else: + # Duplicate the x86_impl and add it to the SPD + new_impl = copy.deepcopy(x86_impl) + project_spd.add_implementation(new_impl) + _log.info('Duplicated the x86_64 implementation') + + # Duplicate the source directory to the new space + # Does not apply to ComponentHost + suffix = '-' + processor_name + old_impl_id = new_impl.get_id() + new_impl_id = old_impl_id + suffix + if not is_componenthost: + project_path = os.path.dirname(spd_path) + old_impl_project_path = os.path.join(project_path, old_impl_id) + new_impl_project_path = os.path.join(project_path, new_impl_id) + if os.path.exists(new_impl_project_path): + shutil.rmtree(new_impl_project_path) + shutil.copytree(old_impl_project_path, new_impl_project_path) + _log.info('Copied source tree %s to %s' % (old_impl_id, new_impl_id)) + + # Patch the new_impl + # - Implementation ID + # - code + # - localfile name + # - entrypoint (if component, device, ComponentHost) + # ComponentHost: append the executable with the suffix + # All others: replace [old_impl_id] with [new_impl_id] + # - Processor Name + # - for each dependency type=runtime_requirements + # - softpkgref + # - implref refid replace [old_impl_id] with [new_impl_id] + new_impl.set_id(new_impl_id) + new_code = new_impl.get_code() + lf_name = new_code.get_localfile().get_name() + entrypoint = new_code.get_entrypoint() + if is_componenthost: + lf_name += suffix + entrypoint += suffix + else: + lf_name = lf_name.replace(old_impl_id, new_impl_id) + new_code.get_localfile().set_name(lf_name) + if entrypoint: + entrypoint = entrypoint.replace(old_impl_id, new_impl_id) + new_code.set_entrypoint(entrypoint) + new_impl.set_processor([spd.processor(processor_name)]) + for dep in new_impl.get_dependency(): + if dep.get_type() == 'runtime_requirements': + dep.get_softpkgref().get_implref().set_refid(new_impl_id) + + _log.info('Finished Implementation: %s' % new_impl_id) + + # Add the new_impl and export. + with open(spd_path, 'w') as f: + project_spd.export(f, 0) + _log.info('Updated: %s' % spd_path) + +def patch_sdrroot(source_spd_path, target_type): + ''' + Attempts to find the project in the local SDRROOT. + - If the target exists, it is patched with the new implementation. + - If the target does not exist, the whole source project is copied + to the SDRROOT. + + The ComponentHost does not keep its binaries in separate directories, + therefore all binaries will be located at the root with the XML. + + Variable Naming Convention: + var_spd -> An SPD object + var_path -> abs. or relative path to the var + var_file -> just the file name for var + var_dirname -> path containing the var + ''' + _log = logging.getLogger(LOGGER_NAME) + source_spd = spd.parse(source_spd_path) + source_spd_file = os.path.basename(source_spd_path) + source_spd_dirname = os.path.dirname(source_spd_path) + is_componenthost = source_spd.get_name().endswith('ComponentHost') + + # Find the destination SPD file if it exists. + sdrroot = os.getenv('SDRROOT') + target_spd_path = None + if source_spd_file == 'ComponentHost.spd.xml': + target_spd_path = os.path.join(sdrroot, 'dom/mgr') + elif target_type == 'device': + target_spd_path = os.path.join(sdrroot, 'dev/devices') + elif target_type == 'softpkg': + target_spd_path = os.path.join(sdrroot, 'dom/deps') + elif target_type == 'component': + target_spd_path = os.path.join(sdrroot, 'dom/components') + else: + _log.error('Unknown target type: %s' % target_type) + sys.exit(EXIT_UNKNOWN_TARGET_TYPE) + + # Get the anticipated target location, using the convention of RH assets + # installing 'rh.NAME' to '/rh/NAME'. + target_subdir = source_spd.get_name().replace('.','/') + target_spd_path = os.path.join(target_spd_path, target_subdir, source_spd_file) + target_spd_dirname = os.path.dirname(target_spd_path) + + if os.path.isfile(target_spd_path): + _log.info('Patching implementation IDs') + _log.info('\tFrom: %s' % source_spd_path) + _log.info('\tTo: %s' % target_spd_path) + + # Get an SPD instance, the directory where the SPD is at, + # and a list of implementation IDs. Then update data and files: + # - Component/ComponentHost/Device: use entrypoint to ID path to copy + # - SoftPkg, use localfile name as the path + target_spd = spd.parse(target_spd_path) + target_dirname = os.path.dirname(target_spd_path) + + # The trick to the next block of logic is that softpkg use localfile.name + # which does not point to the library file, only cpp/lib. Components, + # Devices, and the ComponentHost use entrypoint. Further complicating things, + # the ComponentHost doesn't store its binary within cpp, it's in the same path + # as the SPD XML. + def entrypoint_or_localfile(code): + return code.get_entrypoint() or code.get_localfile().get_name() + + target_impl_map = dict() + for impl in target_spd.get_implementation(): + target_impl_map[impl.get_id()] = entrypoint_or_localfile(impl.get_code()) + + for s_impl in source_spd.get_implementation(): + _log.info('Implementation: %s' % s_impl.get_id()) + s_code_ref = entrypoint_or_localfile(s_impl.get_code()) + s_code_file = os.path.join(source_spd_dirname, s_code_ref) + s_code_dirname = os.path.dirname(s_code_file) + + # Check if the source's code reference file or path exists, if not skip this impl. + # In the case of softpkg, this will be cpp[-arch]/lib, so if the arch was never + # built, this will evaluate to false since cpp[-arch] is missing too. + if not os.path.exists(s_code_file): + _log.info('\tSkipped (entrypoint or localfile does not exist)') + continue + + # Check if the target entry point ref exists + t_code_ref = target_impl_map.get(s_impl.get_id(), None) + + l_msg = '\t%s implementation %s' + l_msg_target = target_type.title() + l_msg_result = 'updated' + if not t_code_ref: + # Implementation does not exist, add it. + target_spd.add_implementation(copy.deepcopy(s_impl)) + t_code_ref = s_code_ref + l_msg_result = 'added' + + if is_componenthost: + # ComponentHost is a single file + shutil.copy(s_code_file, target_dirname) + l_msg_target = 'ComponentHost' + else: + # Replace the target directory with the source one: + # rm -rf target/ + # cp -r source/ target + t_code_file = os.path.join(target_dirname, t_code_ref) + t_code_dirname = os.path.dirname(t_code_file) + shutil.rmtree(t_code_dirname) + shutil.copytree(s_code_dirname, target_dirname + s_impl.get_id()) + + # Parting statement + _log.info(l_msg % (l_msg_target, l_msg_result)) + else: + # Copy the whole project to the destination (this is entirely new) + # NOTE: We're trusting this is only the necessary runtime artifacts, not + # a source tree. + shutil.copytree(source_spd_dirname, target_spd_dirname) + _log.info("Installed '%s' into %s" % (source_spd.get_name(), sdrroot)) + +if __name__ == '__main__': + logging.basicConfig(format='%(name)-9s:%(levelname)-8s: %(message)s', level=logging.INFO) + _log = logging.getLogger(LOGGER_NAME) + + parser = OptionParser() + parser.usage = "usage: %prog [options] spd_path" + parser.add_option('-n', '--name', + action='store', + dest='processor_name', + default=None, + help='Processor name (implentation) to create in a source tree') + parser.add_option('-t', '--type', + type='choice', + choices=['device', 'component', 'softpkg'], + action='store', + default=None, + dest='target_type', + help='Target type: device, component, softpkg (not used for ComponentHost)') + parser.add_option('-r', '--replace', + action='store_true', + dest='replace', + default=False, + help='Replace the x86_64 source implementation with the new one') + (options, args) = parser.parse_args() + + if len(args) == 0: + _log.error("You must specify the path to a project") + sys.exit(EXIT_NO_PATH) + elif len(args) > 1: + _log.error("Only one argument is supported") + sys.exit(EXIT_TOO_MANY_ARGS) + + if options.processor_name and options.target_type: + _log.error("Only specify 1: processor_name or target_type") + sys.exit(EXIT_TOO_MANY_OPTIONS) + + # spd_path should be a path to the folder containing the spd, prf, etc. + spd_path = args[0] + if not spd_path.endswith('.xml'): + spd_proj_path = spd_path + spd_path = None + for root, dirs, files in os.walk(spd_proj_path): + for name in files: + if re.match(r'^.+?\.(SPD|spd)\.(XML|xml)', name): + spd_path = os.path.join(root, name) + break + if spd_path: + break + if not spd_path: + _log.error('Provided path did not contain an SPD XML.') + sys.exit(EXIT_NO_SPD_FOUND) + elif not os.path.isfile(spd_path): + _log.error('Provided project file name does not exist') + sys.exit(EXIT_NO_SPD_FOUND) + + if options.processor_name: + patch_source(spd_path, options.processor_name, options.replace) + elif options.target_type: + patch_sdrroot(spd_path, options.target_type) + else: + sys.exit(EXIT_PATCH_SOURCE_OR_INSTALL) + sys.exit(EXIT_OKAY) From 426bb3bd4d02ffed4c76bf87bc6d32a1ced223d0 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:36:21 -0500 Subject: [PATCH 27/35] Added 'native' redhawk for multi-impl domain support --- recipes-core/core-framework/redhawk_2.2.1.bb | 7 +++++++ recipes-deps/omnievents/omnievents_2.8.1.bb | 3 +++ recipes-deps/xsd/xsd_4.0.0.bb | 8 +++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/recipes-core/core-framework/redhawk_2.2.1.bb b/recipes-core/core-framework/redhawk_2.2.1.bb index faf9cbd..7b535d6 100644 --- a/recipes-core/core-framework/redhawk_2.2.1.bb +++ b/recipes-core/core-framework/redhawk_2.2.1.bb @@ -41,6 +41,13 @@ RDEPENDS_${PN}-python += "\ ${PN} omniorb-python omniorbpy python-numpy python-threading \ python-numbers python-resource python-xml python-lxml python-setuptools" +BBCLASSEXTEND = "native" +DEPENDS_class-native += "\ + omniorbpy-native omniorb-native xsd-native log4cxx-native \ + omnievents-native e2fsprogs-native apr-util-native apr-native zip-native \ + expat-native boost-native python-native python-setuptools-native \ + ossp-uuid-native \ + " SRC_URI_append = "\ file://uuid_python_package.patch \ diff --git a/recipes-deps/omnievents/omnievents_2.8.1.bb b/recipes-deps/omnievents/omnievents_2.8.1.bb index 2746b6b..d43f912 100644 --- a/recipes-deps/omnievents/omnievents_2.8.1.bb +++ b/recipes-deps/omnievents/omnievents_2.8.1.bb @@ -23,7 +23,10 @@ SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=68ad62c64cc6c620126241fd429e68fe" + +BBCLASSEXTEND = "native" DEPENDS += "omniorb omniorb-native boost" +DEPENDS_class-native += "omniorb-native boost-native" PR = "r1" diff --git a/recipes-deps/xsd/xsd_4.0.0.bb b/recipes-deps/xsd/xsd_4.0.0.bb index dc8db27..2121fbe 100644 --- a/recipes-deps/xsd/xsd_4.0.0.bb +++ b/recipes-deps/xsd/xsd_4.0.0.bb @@ -25,7 +25,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://xsd/LICENSE;md5=79e31466c4d9f3a85f2f987c11ebcd83" DEPENDS = "" -DEPENDS_virtclass-native = "xerces-c-native xsd-dev" +DEPENDS_class-native = "xerces-c-native xsd-dev" BBCLASSEXTEND = "native" PROVIDES += "${PN}-dev ${PN}-dev-native" @@ -56,10 +56,12 @@ do_install () { cp -r ${S}/xsd/libxsd/xsd ${D}${includedir}/xsd } -do_compile_virtclass-native () { +do_compile_class-native () { oe_runmake } -do_install_virtclass-native () { +do_install_class-native () { + install -d ${D}${includedir} install -m 0755 -D ${S}/xsd/xsd/xsd ${D}${bindir}/xsdcxx + cp -r ${S}/xsd/libxsd/xsd ${D}${includedir}/xsd } \ No newline at end of file From 57b21d2d7871100d88ea7d9a2ce3056aa0ded6c5 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:38:33 -0500 Subject: [PATCH 28/35] Split task into unpack and patch tasks The installation of README, etc. is an unpack behavior, and the modifying of the autoconf file(s) is obviously a patch. --- classes/redhawk-oeconf.bbclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/classes/redhawk-oeconf.bbclass b/classes/redhawk-oeconf.bbclass index b23366b..30fe44e 100644 --- a/classes/redhawk-oeconf.bbclass +++ b/classes/redhawk-oeconf.bbclass @@ -15,10 +15,15 @@ EXTRA_OECONF += "\ " # Patches common to nearly every REDHAWK source -do_configure_prepend () { - touch ./NEWS ./README ./AUTHORS ./ChangeLog - sed -i 's/ACLOCAL_AMFLAGS = .\+$/ACLOCAL_AMFLAGS = -I m4/g' Makefile.am +ac_meta_files () { + touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog } +do_unpack[postfuncs] += "ac_meta_files" + +aclocal_amflags () { + sed -i 's/ACLOCAL_AMFLAGS = .\+$/ACLOCAL_AMFLAGS = -I m4/g' ${S}/Makefile.am +} +do_patch[postfuncs] += "aclocal_amflags" # Include the ossie autoconf macros EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" From 6b162607c0ce398e98d6917ab628674ff61f1c8b Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:39:40 -0500 Subject: [PATCH 29/35] Added 'native' variables for ossiehome and sdrroot for ease of use --- classes/redhawk-env.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/redhawk-env.bbclass b/classes/redhawk-env.bbclass index fd4db67..c8202d8 100644 --- a/classes/redhawk-env.bbclass +++ b/classes/redhawk-env.bbclass @@ -6,3 +6,6 @@ SDRROOT = "${localstatedir}/redhawk-sdr/sdr" # libs, etc.) OSSIEHOME_STAGED="${STAGING_DIR_TARGET}${OSSIEHOME}" SDRROOT_STAGED="${STAGING_DIR_TARGET}${SDRROOT}" + +OSSIEHOME_STAGED_NATIVE="${STAGING_DIR_NATIVE}${OSSIEHOME}" +SDRROOT_STAGED_NATIVE="${STAGING_DIR_NATIVE}${SDRROOT}" From 0a0105726d28e30786187fd3da10a419c40176d2 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 09:42:23 -0500 Subject: [PATCH 30/35] Switching to 'override' syntax for safer use in recipes --- classes/redhawk-device.bbclass | 2 +- classes/redhawk-entity.bbclass | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/redhawk-device.bbclass b/classes/redhawk-device.bbclass index 2e3e63d..3514e50 100644 --- a/classes/redhawk-device.bbclass +++ b/classes/redhawk-device.bbclass @@ -1,6 +1,6 @@ inherit autotools-brokensep pkgconfig redhawk-entity -DEPENDS += "omniorb-native omniorbpy-native" +DEPENDS_prepend = "omniorb-native omniorbpy-native " NODE_CONFIG_SCRIPT ?= "" do_nodeconfig_patch () { diff --git a/classes/redhawk-entity.bbclass b/classes/redhawk-entity.bbclass index 5b9d9b3..e138f03 100644 --- a/classes/redhawk-entity.bbclass +++ b/classes/redhawk-entity.bbclass @@ -20,8 +20,8 @@ do_configure_prepend() { sed -i 's,${prefix}/dom/deps,${SDR_ROOT}/dom/deps,g' configure.ac } # Basic set of depends -DEPENDS = "redhawk redhawk-native" -RDEPENDS_${PN} = "redhawk" +DEPENDS_prepend = "redhawk redhawk-native " +RDEPENDS_${PN}_prepend = "redhawk " # Needed so that when the python distutils is run it can get the system prefix. From a6b16d2f228c512577b1c40c2df699d9020ffaf3 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 10:03:13 -0500 Subject: [PATCH 31/35] Split configure_prepend into its two actual pieces, config and patch Moving the patch logic into its own task (for that reason, it's not configure). Temporarily removed the processor patching functionality. --- classes/redhawk-entity.bbclass | 40 +++++++++++++++------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/classes/redhawk-entity.bbclass b/classes/redhawk-entity.bbclass index e138f03..fc710f5 100644 --- a/classes/redhawk-entity.bbclass +++ b/classes/redhawk-entity.bbclass @@ -1,29 +1,20 @@ # This file sets OSSIEHOME and other environment variables used by autotools inherit redhawk-oeconf redhawk-sysroot pythonnative -# Needed so that when the python distutils is run it can get the system prefix which, since it's the build system python will be /.../x86_64-linux/usr and replace it with our host systems name. -do_configure_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} - export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" - export PYTHONPATH=${OSSIEHOME_STAGED}/lib/python:${PYTHONPATH} - export PATH="${OSSIEHOME_STAGED}/bin:${PATH}" - - # Common patches among device and component as noted by YLB. - # These were individual patch files but were being tacked on to many recipes. - # This is to reduce some clutter. - sed -i 's/xmldir = $(prefix)/xmldir = $(SDR_ROOT)/g' Makefile.am - sed -i 's/bindir = $(prefix)/bindir = $(SDR_ROOT)/g' Makefile.am - sed -i 's/domdir = $(prefix)/domdir = $(SDR_ROOT)/g' Makefile.am - sed -i 's,${prefix}/dom/deps,${SDR_ROOT}/dom/deps,g' configure.ac -} # Basic set of depends DEPENDS_prepend = "redhawk redhawk-native " RDEPENDS_${PN}_prepend = "redhawk " +do_autotools_patch () { + # Common patches among device and component as noted by YLB. + # These were individual patch files but were being tacked on to many recipes. + # This is to reduce some clutter. + sed -i 's/xmldir = $(prefix)/xmldir = $(SDR_ROOT)/g' ${S}/Makefile.am + sed -i 's/bindir = $(prefix)/bindir = $(SDR_ROOT)/g' ${S}/Makefile.am + sed -i 's/domdir = $(prefix)/domdir = $(SDR_ROOT)/g' ${S}/Makefile.am + sed -i 's,${prefix}/dom/deps,${SDR_ROOT}/dom/deps,g' ${S}/configure.ac + # Needed so that when the python distutils is run it can get the system prefix. do_install_prepend() { export BUILD_SYS=${BUILD_SYS} @@ -33,10 +24,15 @@ do_install_prepend() { export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" export PYTHONPATH=${OSSIEHOME_STAGED}/lib/python:${PYTHONPATH} } +do_patch[postfuncs] += "do_autotools_patch" -do_dynamic_arch_patch () { - find ${S}/../ -name *.spd.xml -exec sed -i "s///g" {} \; - find ${S}/../ -name *.spd.xml -exec sed -i "s///g" {} \; +do_configure_prepend () { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} + export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export PYTHONPATH=${OSSIEHOME_STAGED}/lib/python:${PYTHONPATH} + export PATH="${OSSIEHOME_STAGED}/bin:${PATH}" } -addtask dynamic_arch_patch after do_patch before do_configure From 951ff5cd60e0b8ce2d88016367dffbd9652009e4 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 10:04:54 -0500 Subject: [PATCH 32/35] Added SPD impl patching tool integration Packages produced for the target architecture will now have the implementation modified to not collide with a standard redhawk installation for cpp implementations. This makes it possible to use the scripts/spd_utility as an installer for these new yocto-built implementations into other REDHAWK systems. --- classes/redhawk-entity.bbclass | 25 +++++++++++++++++-------- classes/redhawk-softpkg.bbclass | 5 ++++- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/classes/redhawk-entity.bbclass b/classes/redhawk-entity.bbclass index fc710f5..e148380 100644 --- a/classes/redhawk-entity.bbclass +++ b/classes/redhawk-entity.bbclass @@ -5,6 +5,12 @@ inherit redhawk-oeconf redhawk-sysroot pythonnative DEPENDS_prepend = "redhawk redhawk-native " RDEPENDS_${PN}_prepend = "redhawk " +# Our dynamic do_patch tasks are sensitive to REDHAWK_PROCESSOR and the +# modifications are not repeatable if that variable changes since we're +# post-patching source without patch files. My making unpack sensitive +# to the same variable, changes to it will unpack fresh source so the +# dynamic patches can run according to the change. +do_unpack[vardeps] += "REDHAWK_PROCESSOR" do_autotools_patch () { # Common patches among device and component as noted by YLB. @@ -15,14 +21,11 @@ do_autotools_patch () { sed -i 's/domdir = $(prefix)/domdir = $(SDR_ROOT)/g' ${S}/Makefile.am sed -i 's,${prefix}/dom/deps,${SDR_ROOT}/dom/deps,g' ${S}/configure.ac -# Needed so that when the python distutils is run it can get the system prefix. -do_install_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} - export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" - export PYTHONPATH=${OSSIEHOME_STAGED}/lib/python:${PYTHONPATH} + # Patch the bindir to match what the spd patch will do to the entrypoint + sed -i -r "s,(bindir = .+?cpp)/,\1-${REDHAWK_PROCESSOR}/,g" ${S}/Makefile.am + + # Patch the relationship to any softpkg dependencies + sed -i -r "s/(^RH_SOFTPKG_CXX.+?\[cpp)(\])(.+$)/\1-${REDHAWK_PROCESSOR}\2\3/g" ${S}/configure.ac } do_patch[postfuncs] += "do_autotools_patch" @@ -36,3 +39,9 @@ do_configure_prepend () { export PATH="${OSSIEHOME_STAGED}/bin:${PATH}" } +do_spd_implementation_patch () { + export PYTHONPATH=${OSSIEHOME_STAGED_NATIVE}/lib/python:${PYTHONPATH} + spd_utility -n "${REDHAWK_PROCESSOR}" "${S}/.." +} +do_spd_implementation_patch[cleandirs] += "${S}/../cpp-${REDHAWK_PROCESSOR}" +addtask spd_implementation_patch after do_compile before do_install diff --git a/classes/redhawk-softpkg.bbclass b/classes/redhawk-softpkg.bbclass index 5cdab32..51fc043 100644 --- a/classes/redhawk-softpkg.bbclass +++ b/classes/redhawk-softpkg.bbclass @@ -1,5 +1,8 @@ inherit autotools-brokensep pkgconfig redhawk-entity +do_autotools_patch_append () { + sed -i -r "s/(^RH_SOFTPKG_PREFIX.+?\[cpp)(\])/\1-${REDHAWK_PROCESSOR}\2/g" ${S}/configure.ac +} # Set/append SOFTPKG_PREFIX to the installation directory of your softpkg. # Standard REDHAWK Deps install with a package config as: @@ -11,7 +14,7 @@ inherit autotools-brokensep pkgconfig redhawk-entity SOFTPKG_BASE = "${SDRROOT}/dom/deps" SOFTPKG_PREFIX ?= "${SOFTPKG_BASE}" SOFTPKG_INCLUDEDIR ?= "${SOFTPKG_PREFIX}/include" -SOFTPKG_EPREFIX ?= "${SOFTPKG_PREFIX}/cpp" +SOFTPKG_EPREFIX ?= "${SOFTPKG_PREFIX}/cpp-${REDHAWK_PROCESSOR}" SOFTPKG_LIBDIR ?= "${SOFTPKG_EPREFIX}/lib" EXTRA_OECONF += "\ From 7608e0970aaaccbbc8e366ba46f56b697df29675 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 10:07:48 -0500 Subject: [PATCH 33/35] This variable dependency is not necessary Bitbake picks up that this is a variable dependency of the task, so this is wasted code. --- classes/redhawk-softpkg.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/redhawk-softpkg.bbclass b/classes/redhawk-softpkg.bbclass index 51fc043..e53191d 100644 --- a/classes/redhawk-softpkg.bbclass +++ b/classes/redhawk-softpkg.bbclass @@ -38,4 +38,3 @@ FILES_${PN}-staticdev += "${SOFTPKG_LIBDIR}/*.a" fakeroot do_install_append () { find ${D} -name "*.spd.xml" -exec mv {} ${D}${SOFTPKG_PREFIX} \; } -do_install[vardeps] += "SOFTPKG_PREFIX" \ No newline at end of file From 939434c4b57efb44682f254a9863ef54b01d8944 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 10:08:34 -0500 Subject: [PATCH 34/35] MACHINE_ARCH to HOST_ARCH for REDHAWK_PROCESSOR For some machines like qemuarm64 the former variable is the machine name whereas the host_arch is equivalent to what is returned by uname -m. --- conf/versions/redhawk.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/versions/redhawk.inc b/conf/versions/redhawk.inc index 03b73b8..d9375e7 100644 --- a/conf/versions/redhawk.inc +++ b/conf/versions/redhawk.inc @@ -3,7 +3,7 @@ require redhawk-${REDHAWK_VERSION}.inc # In several places, the processor architecture may not match any available variable, but # will need to match the response of uname in the running system. Patches in this layer # address that need using this variable, which can be overridden as needed. -REDHAWK_PROCESSOR ?= "${MACHINE_ARCH}" +REDHAWK_PROCESSOR ?= "${HOST_ARCH}" REDHAWK_PROCESSOR_rpi ?= "armv7l" REDHAWK_PROCESSOR_zynq ?= "armv7l" REDHAWK_PROCESSOR_zynqmp ?= "aarch64" From ad1ba05fb0b84129b38e9c1a96ddafe02b6f6066 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Fri, 11 Jan 2019 10:43:35 -0500 Subject: [PATCH 35/35] Moving to be inline with meta-oe's location of giflib --- {recipes-deps => recipes-devtools}/giflib/giflib_4.1.6.bb | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {recipes-deps => recipes-devtools}/giflib/giflib_4.1.6.bb (100%) diff --git a/recipes-deps/giflib/giflib_4.1.6.bb b/recipes-devtools/giflib/giflib_4.1.6.bb similarity index 100% rename from recipes-deps/giflib/giflib_4.1.6.bb rename to recipes-devtools/giflib/giflib_4.1.6.bb