From 21f2d45838e390867f7c704ef0f0a7065503169e Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 17 Jul 2017 07:51:54 -0400 Subject: [PATCH 01/24] Version bump for XSD --- recipes-deps/xsd/{xsd_3.3.0-2.bb => xsd_4.0.0.bb} | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) rename recipes-deps/xsd/{xsd_3.3.0-2.bb => xsd_4.0.0.bb} (83%) diff --git a/recipes-deps/xsd/xsd_3.3.0-2.bb b/recipes-deps/xsd/xsd_4.0.0.bb similarity index 83% rename from recipes-deps/xsd/xsd_3.3.0-2.bb rename to recipes-deps/xsd/xsd_4.0.0.bb index b09e94c..6091fd7 100644 --- a/recipes-deps/xsd/xsd_3.3.0-2.bb +++ b/recipes-deps/xsd/xsd_4.0.0.bb @@ -31,14 +31,11 @@ BBCLASSEXTEND = "native" PROVIDES += "${PN}-dev ${PN}-dev-native" SRC_URI = " \ - http://codesynthesis.com/download/xsd/3.3/linux-gnu/x86_64/xsd-3.3.0-x86_64-linux-gnu.tar.bz2;name=xsd330bintarbz2 \ + git://scm.codesynthesis.com/xsd/xsd.git;protocol=git \ " +SRCREV = "94cba986108a0e0f42295572ca42c356d59328d7" -S = "${WORKDIR}/xsd-3.3.0-x86_64-linux-gnu" - -SRC_URI[xsd330bintarbz2.md5sum] = "62cf1291e210eba37738d5a02f7d2990" -SRC_URI[xsd330bintarbz2.sha256sum] = "e964e09394c06a3e50a2ef6bd318aac45018ee1d7cd2955170f70426ef20f716" - +S = "${WORKDIR}/git" # Per http://www.codesynthesis.com/pipermail/xsde-users/2012-October/000535.html # Boris says to get the binary for the host, then cross-compile and install libxsd... @@ -52,5 +49,4 @@ do_install () { do_install_virtclass-native () { install -m 0755 -D ${S}/bin/xsd ${D}${bindir}/xsdcxx -} - +} \ No newline at end of file From 8ad5b0658b6720b89496065485a1192bafef0df5 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 17 Jul 2017 07:59:59 -0400 Subject: [PATCH 02/24] Switching to 'redhawk' referenced version. --- recipes-deps/rtlsdr/{rtlsdr_0.5.3.bb => rtlsdr_0.5.2-4.bb} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename recipes-deps/rtlsdr/{rtlsdr_0.5.3.bb => rtlsdr_0.5.2-4.bb} (82%) diff --git a/recipes-deps/rtlsdr/rtlsdr_0.5.3.bb b/recipes-deps/rtlsdr/rtlsdr_0.5.2-4.bb similarity index 82% rename from recipes-deps/rtlsdr/rtlsdr_0.5.3.bb rename to recipes-deps/rtlsdr/rtlsdr_0.5.2-4.bb index 7d9104c..8a8773b 100644 --- a/recipes-deps/rtlsdr/rtlsdr_0.5.3.bb +++ b/recipes-deps/rtlsdr/rtlsdr_0.5.2-4.bb @@ -7,12 +7,10 @@ DEPENDS = "libusb1" RDEPENDS_${PN} = "libusb1" SRC_URI = "\ - git://git.osmocom.org/rtl-sdr.git;tag=v0.5.3;protocol=git \ + https://github.com/RedhawkSDR/librtlsdr;tag=${PV};protocol=git \ file://01_fix_pkgconfig.patch \ " -PR = "r0" - S = "${WORKDIR}/git" inherit autotools pkgconfig From fee4eb7bcca4a54fe3434949a7bddab50fb50966 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 17 Jul 2017 08:00:31 -0400 Subject: [PATCH 03/24] Version bump to 2.0.6 assets --- recipes-deps/omnievents/omnievents_2.7.1-2.bb | 4 +++ recipes-devices/gpp/gpp_2.0.6.bb | 26 +++++++++++++++++++ .../rtl2832u/files/nodeconfig_2.0.1-5.patch | 20 ++++++++++++++ recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb | 5 ++++ .../usrp-uhd/files/nodeconfig_5.0.0.patch | 20 ++++++++++++++ recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb | 5 ++++ .../redhawk-bulkio/redhawk-bulkio_2.0.6.bb | 12 +++++++++ .../redhawk-burstio/redhawk-burstio_2.0.6.bb | 12 +++++++++ .../redhawk-codegen/redhawk-codegen_2.0.6.bb | 10 +++++++ .../redhawk-core/redhawk-core_2.0.6.bb | 9 +++++++ .../redhawk-frontend_2.3.6.bb | 10 +++++++ 11 files changed, 133 insertions(+) create mode 100644 recipes-deps/omnievents/omnievents_2.7.1-2.bb create mode 100644 recipes-devices/gpp/gpp_2.0.6.bb create mode 100644 recipes-devices/rtl2832u/files/nodeconfig_2.0.1-5.patch create mode 100644 recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb create mode 100644 recipes-devices/usrp-uhd/files/nodeconfig_5.0.0.patch create mode 100644 recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb create mode 100644 recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.6.bb create mode 100644 recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.6.bb create mode 100644 recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.6.bb create mode 100644 recipes-redhawk/redhawk-core/redhawk-core_2.0.6.bb create mode 100644 recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.6.bb diff --git a/recipes-deps/omnievents/omnievents_2.7.1-2.bb b/recipes-deps/omnievents/omnievents_2.7.1-2.bb new file mode 100644 index 0000000..25e582b --- /dev/null +++ b/recipes-deps/omnievents/omnievents_2.7.1-2.bb @@ -0,0 +1,4 @@ +SRCTAG = "2.7.1-2" +PREFERRED_VERSION_omniorb = "4.2.0" +include omnievents.inc + diff --git a/recipes-devices/gpp/gpp_2.0.6.bb b/recipes-devices/gpp/gpp_2.0.6.bb new file mode 100644 index 0000000..2c1ea3a --- /dev/null +++ b/recipes-devices/gpp/gpp_2.0.6.bb @@ -0,0 +1,26 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=${PV};protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/GPP/cpp" + +PREFERRED_VERSION_redhawk-bulkio = "2.0.6" + +SRC_URI_append = "\ + file://01_Clear_AMFLAGS_GPP_NO_TEST.patch \ + file://02_armv7l_default_2.0.4.patch \ + file://configure-gpp_post-2.0.4 \ + file://04_GPP_spd_armv7l.patch;patchdir=${WORKDIR}/git/GPP \ +" + +# ################################################ +# End user-controlled variables to adjust the node +# ################################################ +RH_GPP_MCASTNIC ?= "" +RH_GPP_NODE_NAME ?= "DevMgr-GPP-${MACHINE}" +RH_GPP_NAME ?= "GPP-${TARGET_ARCH}" +# ################################################ + +include gpp.inc +include gpp_install_append_post_2.0.4.inc + diff --git a/recipes-devices/rtl2832u/files/nodeconfig_2.0.1-5.patch b/recipes-devices/rtl2832u/files/nodeconfig_2.0.1-5.patch new file mode 100644 index 0000000..1ed9702 --- /dev/null +++ b/recipes-devices/rtl2832u/files/nodeconfig_2.0.1-5.patch @@ -0,0 +1,20 @@ +--- git/nodeconfig.py 2016-03-09 14:41:47.482999800 -0500 ++++ git-patched/nodeconfig.py 2016-03-09 14:43:45.513263853 -0500 +@@ -122,7 +122,7 @@ + compfiles = [{'id':RTL2832U_componentfile, 'localfile':os.path.join('/devices', 'rh', 'RTL2832U', 'RTL2832U.spd.xml')}] + else: + compfiles = [{'id':RTL2832U_componentfile, 'localfile':os.path.join('/nodes', self.options.nodename.replace('.','/'), 'RTL2832U', 'RTL2832U.spd.xml')}] +- compplacements = [{'refid':RTL2832U_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.RTL2832U_' + self.hostname.replace('.', '_')}]}] ++ compplacements = [{'refid':RTL2832U_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.RTL2832U'}]}] + + ##################### + # DeviceManager files +@@ -230,7 +230,7 @@ + from optparse import OptionParser + parser = OptionParser() + #parser.usage = "%s [options] [simple_prop1 simple_value1]..." +- parser.add_option("--domainname", dest="domainname", default=None, ++ parser.add_option("--domainname", dest="domainname", default="REDHAWK_DEV", + help="Must give a domain name") + parser.add_option("--rtlname", dest="name", default="", + help="Name of the targeted RTL") diff --git a/recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb b/recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb new file mode 100644 index 0000000..0f3b7fb --- /dev/null +++ b/recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb @@ -0,0 +1,5 @@ +SRCTAG = "${PV}" +PREFERRED_VERSION_redhawk-bulkio = "2.0.6" +PREFERRED_VERSION_redhawk-frontend = "2.3.6" + +include rtl2832u.inc diff --git a/recipes-devices/usrp-uhd/files/nodeconfig_5.0.0.patch b/recipes-devices/usrp-uhd/files/nodeconfig_5.0.0.patch new file mode 100644 index 0000000..d90d512 --- /dev/null +++ b/recipes-devices/usrp-uhd/files/nodeconfig_5.0.0.patch @@ -0,0 +1,20 @@ +--- git/nodeconfig.py 2016-03-10 07:01:00.251851153 -0500 ++++ git-patched/nodeconfig.py 2016-03-10 07:04:01.358334653 -0500 +@@ -121,7 +121,7 @@ + compfiles = [{'id':USRP_UHD_componentfile, 'localfile':os.path.join('/devices', 'rh', 'USRP_UHD', 'USRP_UHD.spd.xml')}] + else: + compfiles = [{'id':USRP_UHD_componentfile, 'localfile':os.path.join('/nodes', self.options.nodename.replace('.','/'), 'USRP_UHD', 'USRP_UHD.spd.xml')}] +- compplacements = [{'refid':USRP_UHD_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.USRP_UHD_' + self.hostname.replace('.', '_')}]}] ++ compplacements = [{'refid':USRP_UHD_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.USRP_UHD'}]}] + + ##################### + # DeviceManager files +@@ -229,7 +229,7 @@ + from optparse import OptionParser + parser = OptionParser() + parser.usage = "%s [options] [simple_prop1 simple_value1]..." +- parser.add_option("--domainname", dest="domainname", default=None, ++ parser.add_option("--domainname", dest="domainname", default="REDHAWK_DEV", + help="Must give a domainname") + parser.add_option("--usrptype", dest="type", default="", + help="The hardware series identifier (usrp1, usrp2, b200, x300, ...)") diff --git a/recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb b/recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb new file mode 100644 index 0000000..172a1b9 --- /dev/null +++ b/recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb @@ -0,0 +1,5 @@ +SRCTAG = "${PV}" +PREFERRED_VERSION_redhawk-bulkio = "2.0.6" +PREFERRED_VERSION_redhawk-frontend = "2.3.6" +include usrp-uhd.inc + diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.6.bb b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.6.bb new file mode 100644 index 0000000..fa78741 --- /dev/null +++ b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.6.bb @@ -0,0 +1,12 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/bulkioInterfaces" + +PREFERRED_VERSION_redhawk-core = "2.0.6" + +INSANE_SKIP_${PN}-dbg += "libdir" + +include redhawk-bulkio.inc + diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.6.bb b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.6.bb new file mode 100644 index 0000000..928b59b --- /dev/null +++ b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.6.bb @@ -0,0 +1,12 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/burstioInterfaces" + +PREFERRED_VERSION_redhawk-core = "2.0.6" + +INSANE_SKIP_${PN}-dbg += "libdir" + +include redhawk-burstio.inc + diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.6.bb b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.6.bb new file mode 100644 index 0000000..19fda8e --- /dev/null +++ b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.6.bb @@ -0,0 +1,10 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/redhawk-codegen" + +PREFERRED_VERSION_redhawk-core = "2.0.6" + +include redhawk-codegen.inc + diff --git a/recipes-redhawk/redhawk-core/redhawk-core_2.0.6.bb b/recipes-redhawk/redhawk-core/redhawk-core_2.0.6.bb new file mode 100644 index 0000000..65449b1 --- /dev/null +++ b/recipes-redhawk/redhawk-core/redhawk-core_2.0.6.bb @@ -0,0 +1,9 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/redhawk/src" + +PREFERRED_VERSION_omniorb = "4.2.0" + +include redhawk-core.inc diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.6.bb b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.6.bb new file mode 100644 index 0000000..0ce46a0 --- /dev/null +++ b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.6.bb @@ -0,0 +1,10 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/frontendInterfaces" + +PREFERRED_VERSION_redhawk-bulkio = "2.0.6" + +include redhawk-frontend.inc + From aa149d61a9aef9f7d11cf11959acbf95a065bea5 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 17 Jul 2017 15:18:37 -0400 Subject: [PATCH 04/24] Removed old patches --- .../files/01_OSSIEHOME_prefix.patch | 41 --------- .../files/02_Ossie_Check_fix.patch | 13 --- .../files/02_Remove_Tests.patch | 83 ------------------- .../files/04_Remove_x86_DomMgr.patch | 13 --- .../05_Remove_Custom_Ossie_Check_BulkIO.patch | 13 --- .../05_Remove_Custom_Ossie_Check_GPP.patch | 13 --- .../files/06_Fix_Idl_prefix.patch | 13 --- .../files/06_Force_Install_to_SDR.patch | 16 ---- 8 files changed, 205 deletions(-) delete mode 100644 recipes-components/redhawk-siggen/files/01_OSSIEHOME_prefix.patch delete mode 100644 recipes-components/redhawk-siggen/files/02_Ossie_Check_fix.patch delete mode 100644 recipes-components/redhawk-siggen/files/02_Remove_Tests.patch delete mode 100644 recipes-components/redhawk-siggen/files/04_Remove_x86_DomMgr.patch delete mode 100644 recipes-components/redhawk-siggen/files/05_Remove_Custom_Ossie_Check_BulkIO.patch delete mode 100644 recipes-components/redhawk-siggen/files/05_Remove_Custom_Ossie_Check_GPP.patch delete mode 100644 recipes-components/redhawk-siggen/files/06_Fix_Idl_prefix.patch delete mode 100644 recipes-components/redhawk-siggen/files/06_Force_Install_to_SDR.patch diff --git a/recipes-components/redhawk-siggen/files/01_OSSIEHOME_prefix.patch b/recipes-components/redhawk-siggen/files/01_OSSIEHOME_prefix.patch deleted file mode 100644 index f9aaa5b..0000000 --- a/recipes-components/redhawk-siggen/files/01_OSSIEHOME_prefix.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git src/acinclude/ossie.m4 src/acinclude/ossie.m4 -index 450c285..19fabfc 100644 ---- src/acinclude/ossie.m4 -+++ src/acinclude/ossie.m4 -@@ -38,11 +38,6 @@ AC_DEFUN([OSSIE_OSSIEHOME], - fi - ) - -- dnl Check if this is a cross, if so prepend the sysroot to the ossie home -- AS_IF([test "x$cross_compiling" = "xyes"], [ -- CROSS_SYSROOT=`$CC --print-sysroot` -- ossie_cv_ossie_home=${CROSS_SYSROOT}${ossie_cv_ossie_home} -- ]) - ]) - AC_SUBST(OSSIE_HOME, $ossie_cv_ossie_home) - ]) -@@ -66,20 +61,12 @@ else - fi - ]) - --dnl use OSSIEHOME as the default prefix unless --prefix is provided -+dnl Changed so that --prefix is ignored as the OSSIEHOME since bitbake passes in --prefix by default - AC_DEFUN([OSSIE_OSSIEHOME_AS_PREFIX], - [ -- AS_IF([test "x${prefix}" = "xNONE"], [ -- dnl Prefix wasn't provided, we need to use ossie home -- AC_REQUIRE([OSSIE_OSSIEHOME]) -- AS_IF([test "x${ossie_cv_ossie_home}" = "xNONE"], [ -- AC_MSG_ERROR([ossie root directory is not set; this is not expected]) -- ]) -- dnl Use ossie home value for prefix -- ac_default_prefix=${ossie_cv_ossie_home} -- prefix=${ossie_cv_ossie_home} -- AC_MSG_NOTICE(using ${ossie_cv_ossie_home} as installation prefix) -- ]) -+ ac_default_prefix=${ossie_cv_ossie_home} -+ prefix=${ossie_cv_ossie_home} -+ AC_MSG_NOTICE(using ${ossie_cv_ossie_home} as installation prefix) - ]) - - dnl A variant on OSSIE_SDRROOT for use *only* when OSSIE_OSSIEHOME_AS_PREFIX is being used. Priorities: diff --git a/recipes-components/redhawk-siggen/files/02_Ossie_Check_fix.patch b/recipes-components/redhawk-siggen/files/02_Ossie_Check_fix.patch deleted file mode 100644 index caeb240..0000000 --- a/recipes-components/redhawk-siggen/files/02_Ossie_Check_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git cpp/configure.ac cpp/configure.ac -index 3bc0713..82db78b 100644 ---- cpp/configure.ac -+++ cpp/configure.ac -@@ -23,7 +23,7 @@ AC_PROG_CXX - AC_PROG_INSTALL - - AC_CORBA_ORB --OSSIE_CHECK_OSSIE -+PKG_CHECK_MODULES([ossie], [ossie >= 1.10.0]) - OSSIE_SDRROOT_AS_PREFIX - - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/recipes-components/redhawk-siggen/files/02_Remove_Tests.patch b/recipes-components/redhawk-siggen/files/02_Remove_Tests.patch deleted file mode 100644 index 25435cf..0000000 --- a/recipes-components/redhawk-siggen/files/02_Remove_Tests.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git src/Makefile.am src/Makefile.am -index d5ab063..e8668a0 100644 ---- src/Makefile.am -+++ src/Makefile.am -@@ -34,7 +34,7 @@ if HAVE_JAVASUPPORT - OMNIJNI = omnijni - endif - --SUBDIRS = acinclude etc $(OMNIJNI) base control xml idl testing -+SUBDIRS = acinclude etc $(OMNIJNI) base control xml idl - - # Install makefile fragments - amdir = $(datadir)/aminclude/redhawk -@@ -43,6 +43,3 @@ am_DATA = aminclude/jarfile.am aminclude/idlj.am - pkgconfigdir = $(libdir)/pkgconfig - dist_pkgconfig_DATA = ossie.pc - --test: -- cd testing; ./runtests.py -- -diff --git src/configure.ac src/configure.ac -index 2477ed6..55206a2 100644 ---- src/configure.ac -+++ src/configure.ac -@@ -22,7 +22,7 @@ dnl Update this version number immedately after a release - AC_INIT([ossie],[1.10.1]) - #AM_INIT_AUTOMAKE(nostdinc) - # allows filenames over 99 characters long during dist --AM_INIT_AUTOMAKE([1.9 tar-pax]) -+AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects]) - dnl Update these verion numbers immedately before a release - dnl - dnl The version number is in the format "current:revision:age" -@@ -274,48 +274,7 @@ AC_CONFIG_FILES(Makefile \ - base/parser/Makefile \ - idl/Makefile \ - xml/Makefile \ -- tools/LogEventAppender/Makefile \ -- testing/Makefile \ -- testing/_unitTestHelpers/buildconfig.py \ -- testing/sdr/dev/devices/ExecutableDevice/Makefile \ -- testing/sdr/dev/devices/BasicTestDevice_cpp/BasicTestDevice_cpp_impl1/Makefile \ -- testing/sdr/dev/devices/BasicTestDevice_java/java/Makefile \ -- testing/sdr/dev/devices/CppTestDevice/cpp/Makefile \ -- testing/sdr/dev/devices/BasicDevWithExecParam_cpp/BasicDevWithExecParam_cpp_impl1/Makefile \ -- testing/sdr/dev/devices/JavaTestDevice/java/Makefile \ -- testing/sdr/dev/devices/SimpleDevice/SimpleDevice_cpp_impl1/Makefile \ -- testing/sdr/dev/devices/props_test_device/props_test_device_cpp_impl1/Makefile \ -- testing/sdr/dev/devices/issue_111_cpp/cpp/Makefile \ -- testing/sdr/dev/devices/issue_111_java/java/Makefile \ -- testing/sdr/dev/devices/PersonaDevice/cpp/Makefile \ -- testing/sdr/dev/devices/ProgrammableDevice/cpp/Makefile \ -- testing/sdr/dev/services/BasicService_java/java/Makefile \ -- testing/sdr/dom/components/CppCallbacks/cpp/Makefile \ -- testing/sdr/dom/components/TestCppProps/Makefile \ -- testing/sdr/dom/components/TestJavaProps/Makefile \ -- testing/sdr/dom/components/TestLegacyJavaProps/Makefile \ -- testing/sdr/dom/components/TestJavaPropsRange/java/Makefile \ -- testing/sdr/dom/components/linkedLibraryTest/Makefile \ -- testing/sdr/dom/components/TestCppsoftpkgDeps/Makefile \ -- testing/sdr/dom/components/javaDep/javaDep/Makefile \ -- testing/sdr/dom/components/HardLimit/HardLimit_java_impl1/Makefile \ -- testing/sdr/dom/components/SimpleComponent/SimpleComponent_cpp_impl1/Makefile \ -- testing/sdr/dom/components/BasicAC/basicac_java_impl1/Makefile \ -- testing/sdr/dom/components/BasicAC/BasicAC_cpp_impl1/Makefile \ -- testing/sdr/dom/components/MessageReceiverCpp/Makefile \ -- testing/sdr/dom/components/MessageSenderCpp/Makefile \ -- testing/sdr/dom/components/EventSend/EventSend_java_impl1/Makefile \ -- testing/sdr/dom/components/EventReceive/EventReceive_java_impl1/Makefile \ -- testing/sdr/dom/components/PropertyChangeEventsCpp/Makefile \ -- testing/sdr/dom/components/PropertyChangeEventsJava/PropertyChangeEventsJava_java_impl1/Makefile \ -- testing/sdr/dom/components/ticket2093/cpp/Makefile \ -- testing/sdr/dom/components/TestComplexProps/cpp/Makefile \ -- testing/sdr/dom/components/TestComplexProps/java/Makefile \ -- testing/sdr/dom/components/TestCppPropsRange/cpp/Makefile \ -- testing/sdr/dom/components/TestAllPropTypes/cpp/Makefile \ -- testing/sdr/dom/components/TestAllPropTypes/java/Makefile \ -- testing/sdr/dom/components/TestLoggingAPI/cpp/Makefile \ -- testing/sdr/dom/components/TestLoggingAPI/java/Makefile ) -+ tools/LogEventAppender/Makefile ) - - AC_OUTPUT - diff --git a/recipes-components/redhawk-siggen/files/04_Remove_x86_DomMgr.patch b/recipes-components/redhawk-siggen/files/04_Remove_x86_DomMgr.patch deleted file mode 100644 index 9a51dca..0000000 --- a/recipes-components/redhawk-siggen/files/04_Remove_x86_DomMgr.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git src/control/sdr/dommgr/DomainManager.spd.xml src/control/sdr/dommgr/DomainManager.spd.xml -index 1e87193..cea8d85 100644 ---- src/control/sdr/dommgr/DomainManager.spd.xml -+++ src/control/sdr/dommgr/DomainManager.spd.xml -@@ -36,8 +36,6 @@ with this program. If not, see http://www.gnu.org/licenses/. - - /mgr/DomainManager - -- -- - - - diff --git a/recipes-components/redhawk-siggen/files/05_Remove_Custom_Ossie_Check_BulkIO.patch b/recipes-components/redhawk-siggen/files/05_Remove_Custom_Ossie_Check_BulkIO.patch deleted file mode 100644 index 10f69b5..0000000 --- a/recipes-components/redhawk-siggen/files/05_Remove_Custom_Ossie_Check_BulkIO.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git configure.ac configure.ac -index 5135790..3807b2f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,7 @@ AC_PROG_LIBTOOL - - AM_PATH_PYTHON([2.3]) - --OSSIE_CHECK_OSSIE -+PKG_CHECK_MODULES([ossie], [ossie >= 1.10.0]) - OSSIE_OSSIEHOME_AS_PREFIX - OSSIE_PYTHON_INSTALL_SCHEME - diff --git a/recipes-components/redhawk-siggen/files/05_Remove_Custom_Ossie_Check_GPP.patch b/recipes-components/redhawk-siggen/files/05_Remove_Custom_Ossie_Check_GPP.patch deleted file mode 100644 index c7dd06f..0000000 --- a/recipes-components/redhawk-siggen/files/05_Remove_Custom_Ossie_Check_GPP.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git python/configure.ac python/configure.ac -index 1fc8ab2..040ce5b 100644 ---- python/configure.ac -+++ python/configure.ac -@@ -25,7 +25,7 @@ AM_INIT_AUTOMAKE(nostdinc) - AC_PROG_INSTALL - - AC_CORBA_ORB --OSSIE_CHECK_OSSIE -+PKG_CHECK_MODULES([ossie], [ossie >= 1.10.0]) - OSSIE_SDRROOT_AS_PREFIX - AM_PATH_PYTHON([2.3]) - diff --git a/recipes-components/redhawk-siggen/files/06_Fix_Idl_prefix.patch b/recipes-components/redhawk-siggen/files/06_Fix_Idl_prefix.patch deleted file mode 100644 index 09fcf7c..0000000 --- a/recipes-components/redhawk-siggen/files/06_Fix_Idl_prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git src/ossie.pc.in src/ossie.pc.in -index 86a4a40..f778a1d 100644 ---- src/ossie.pc.in -+++ src/ossie.pc.in -@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=${prefix}/include - extraincludedir=${prefix}/include/ossie --idldir=${prefix}/share/idl -+idldir=${exec_prefix}/share/idl - javadir=@javadir@ - classpath=${javadir}/ossie.jar:${javadir}/CFInterfaces.jar:${javadir}/log4j-1.2.15.jar:${javadir}/apache-commons-lang-2.4.jar - diff --git a/recipes-components/redhawk-siggen/files/06_Force_Install_to_SDR.patch b/recipes-components/redhawk-siggen/files/06_Force_Install_to_SDR.patch deleted file mode 100644 index 85243ed..0000000 --- a/recipes-components/redhawk-siggen/files/06_Force_Install_to_SDR.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git python/Makefile.am python/Makefile.am -index 8266a77..35383d0 100644 ---- python/Makefile.am -+++ python/Makefile.am -@@ -20,9 +20,9 @@ - - # vim: noet: softtabstop=0 - --xmldir = $(prefix)/dev/devices/GPP/ -+xmldir = $(SDR_ROOT)/dev/devices/GPP/ - dist_xml_DATA = ../GPP.prf.xml ../GPP.scd.xml ../GPP.spd.xml --devdir = $(prefix)/dev/devices/GPP/python/ -+devdir = $(SDR_ROOT)/dev/devices/GPP/python/ - - distclean-local: - rm -f config.* From fdbe35ebe6fdeac40128e7a4c3577b215d53f13d Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 17 Jul 2017 15:20:22 -0400 Subject: [PATCH 05/24] Added top-level REDHAWK repository include file to simplify other recipes that are delivered via that repo --- recipes-core/include/redhawk-repo.inc | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 recipes-core/include/redhawk-repo.inc diff --git a/recipes-core/include/redhawk-repo.inc b/recipes-core/include/redhawk-repo.inc new file mode 100644 index 0000000..26a64c7 --- /dev/null +++ b/recipes-core/include/redhawk-repo.inc @@ -0,0 +1,7 @@ +REDHAWK_VERSION = "2.0.6" + +SRC_URI = "gitsm://github.com/RedhawkSDR/redhawk.git;tag=${REDHAWK_VERSION};branch=master-2.0;protocol=git" + +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/redhawk-core-framework/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" \ No newline at end of file From e3b27b1bab10ae2920f5fe45dcab09da00a792ab Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 17 Jul 2017 15:21:08 -0400 Subject: [PATCH 06/24] Updated to 2.0.6's version (2.0.1) --- .../files/01_Remove_x86_and_Impls.patch | 21 ++++-------- .../files/04_Prefix_to_SDRROOT.patch | 21 +++++++----- .../redhawk-siggen/redhawk-siggen_2.0.1.bb | 33 +++++++++---------- 3 files changed, 34 insertions(+), 41 deletions(-) diff --git a/recipes-components/redhawk-siggen/files/01_Remove_x86_and_Impls.patch b/recipes-components/redhawk-siggen/files/01_Remove_x86_and_Impls.patch index 4f26d4e..42b67ea 100644 --- a/recipes-components/redhawk-siggen/files/01_Remove_x86_and_Impls.patch +++ b/recipes-components/redhawk-siggen/files/01_Remove_x86_and_Impls.patch @@ -2,10 +2,13 @@ diff --git SigGen.spd.xml SigGen.spd.xml index 2fba222..4d305d5 100644 --- a/SigGen.spd.xml +++ b/SigGen.spd.xml -@@ -29,17 +29,6 @@ program. If not, see http://www.gnu.org/licenses/. - - - +@@ -39,30 +39,5 @@ + + + +- +- +- - - The implementation contains descriptive information about the template for a software component. - @@ -16,16 +19,6 @@ index 2fba222..4d305d5 100644 - - - -- - - The implementation contains descriptive information about the template for a software component. - -@@ -50,19 +39,5 @@ program. If not, see http://www.gnu.org/licenses/. - - - -- -- - - - The implementation contains descriptive information about the template for a software component. diff --git a/recipes-components/redhawk-siggen/files/04_Prefix_to_SDRROOT.patch b/recipes-components/redhawk-siggen/files/04_Prefix_to_SDRROOT.patch index 2ada5ff..42c4e82 100644 --- a/recipes-components/redhawk-siggen/files/04_Prefix_to_SDRROOT.patch +++ b/recipes-components/redhawk-siggen/files/04_Prefix_to_SDRROOT.patch @@ -2,16 +2,19 @@ diff --git cpp/Makefile.am cpp/Makefile.am index b436b35..cc3403e 100644 --- cpp/Makefile.am +++ cpp/Makefile.am -@@ -17,10 +17,10 @@ +@@ -17,12 +17,12 @@ # - - ossieName = SigGen --bindir = $(prefix)/dom/components/SigGen/cpp/ -+bindir = $(SDR_ROOT)/dom/components/SigGen/cpp/ + + ossieName = rh.SigGen +-bindir = $(prefix)/dom/components/rh/SigGen/cpp/ ++bindir = $(SDR_ROOT)/dom/components/rh/SigGen/cpp/ bin_PROGRAMS = SigGen --xmldir = $(prefix)/dom/components/SigGen/ -+xmldir = $(SDR_ROOT)/dom/components/SigGen/ - dist_xml_DATA = ../SigGen.prf.xml ../SigGen.scd.xml ../SigGen.spd.xml +-xmldir = $(prefix)/dom/components/rh/SigGen/ ++xmldir = $(SDR_ROOT)/dom/components/rh/SigGen/ + dist_xml_DATA = ../SigGen.scd.xml ../SigGen.prf.xml ../SigGen.spd.xml +-ACLOCAL_AMFLAGS = -I m4 -I${OSSIEHOME}/share/aclocal/ossie ++ACLOCAL_AMFLAGS = -I m4 + AUTOMAKE_OPTIONS = subdir-objects + - distclean-local: diff --git a/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb b/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb index 5dde3df..9083b07 100644 --- a/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb +++ b/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb @@ -1,27 +1,24 @@ DESCRIPTION = "REDHAWK Core Framework SigGen" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +include recipes-core/include/redhawk-repo.inc +inherit redhawk-component DEPENDS = "redhawk-bulkio" RDEPENDS_${PN} = "redhawk-bulkio" -SRC_URI = "git://github.com/RedhawkSDR/SigGen.git;tag=2.0.1;protocol=git \ -file://01_Remove_x86_and_Impls.patch;patchdir=.. \ -file://03_Add_Missing_Files.patch; \ -file://02_Ossie_Check_fix.patch; \ -file://04_Prefix_to_SDRROOT.patch; \ -" - -SRCREV = "eb19c78d10e579d267d3f796f39eae922fc65f0b" +PR = "r1" -PR = "r0" - -S = "${WORKDIR}/git/cpp" - -inherit redhawk-component redhawk-sysroot +SRC_URI_append = " \ + file://01_Remove_x86_and_Impls.patch;patchdir=.. \ + file://03_Add_Missing_Files.patch; \ + file://04_Prefix_to_SDRROOT.patch; \ +" -FILES_${PN} += "${SDRROOT}/*" -FILES_${PN}-dbg +="${SDRROOT}/dom/components/SigGen/cpp/.debug/SigGen" +S = "${WORKDIR}/git/redhawk-components/SigGen/cpp" +FILES_${PN} += "\ + ${SDRROOT}/dom/components/rh/SigGen/*.xml \ + ${SDRROOT}/dom/components/rh/SigGen/cpp/SigGen \ + " +FILES_${PN}-dbg += "${SDRROOT}/dom/components/rh/SigGen/cpp/.debug" From ad961ae668246fdc9cd8502216a924dd3125b5fb Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Mon, 17 Jul 2017 15:46:30 -0400 Subject: [PATCH 07/24] Corrected recipe, now 4.0 installs correctly and redhawk-* can compile with it --- recipes-deps/xsd/files/elements.patch | 58 +++++++++++++++++++++++++++ recipes-deps/xsd/xsd_4.0.0.bb | 31 +++++++++----- 2 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 recipes-deps/xsd/files/elements.patch diff --git a/recipes-deps/xsd/files/elements.patch b/recipes-deps/xsd/files/elements.patch new file mode 100644 index 0000000..1502551 --- /dev/null +++ b/recipes-deps/xsd/files/elements.patch @@ -0,0 +1,58 @@ +diff --git a/xsd/libxsd/xsd/cxx/parser/expat/elements.txx b/xsd/libxsd/xsd/cxx/parser/expat/elements.txx +index ef9adb7..8df4d67 100644 +--- a/xsd/libxsd/xsd/cxx/parser/expat/elements.txx ++++ b/xsd/libxsd/xsd/cxx/parser/expat/elements.txx +@@ -279,7 +279,7 @@ namespace xsd + { + parser_auto_ptr parser (XML_ParserCreateNS (0, XML_Char (' '))); + +- if (parser == 0) ++ if (parser.get () == 0) + throw std::bad_alloc (); + + if (system_id || public_id) +diff --git a/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx b/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx +index 86e7a73..c03bf1a 100644 +--- a/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx ++++ b/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx +@@ -51,7 +51,9 @@ namespace xsd + } + }; + +- typedef std::unique_ptr parser_auto_ptr; ++ typedef ++ std::unique_ptr ++ parser_auto_ptr; + #else + // Simple auto pointer for Expat's XML_Parser object. + // +diff --git a/xsd/libxsd/xsd/cxx/parser/expat/elements.txx b/xsd/libxsd/xsd/cxx/parser/expat/elements.txx +index d3fc0d9..ef9adb7 100644 +--- a/xsd/libxsd/xsd/cxx/parser/expat/elements.txx ++++ b/xsd/libxsd/xsd/cxx/parser/expat/elements.txx +@@ -283,9 +283,10 @@ namespace xsd + throw std::bad_alloc (); + + if (system_id || public_id) +- parse_begin (parser, system_id ? *system_id : *public_id, eh); ++ parse_begin ( ++ parser.get (), system_id ? *system_id : *public_id, eh); + else +- parse_begin (parser, eh); ++ parse_begin (parser.get (), eh); + + // Temporarily unset the exception failbit. Also clear the + // fail bit when we reset the old state if it was caused +@@ -310,8 +311,10 @@ namespace xsd + break; + } + +- if (XML_Parse ( +- parser, buf, is.gcount (), is.eof ()) == XML_STATUS_ERROR) ++ if (XML_Parse (parser.get (), ++ buf, ++ is.gcount (), ++ is.eof ()) == XML_STATUS_ERROR) + { + r = false; + break; \ No newline at end of file diff --git a/recipes-deps/xsd/xsd_4.0.0.bb b/recipes-deps/xsd/xsd_4.0.0.bb index 6091fd7..dc8db27 100644 --- a/recipes-deps/xsd/xsd_4.0.0.bb +++ b/recipes-deps/xsd/xsd_4.0.0.bb @@ -22,31 +22,44 @@ DESCRIPTION = "XSD Libraries for XML parsing" SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=79e31466c4d9f3a85f2f987c11ebcd83" +LIC_FILES_CHKSUM = "file://xsd/LICENSE;md5=79e31466c4d9f3a85f2f987c11ebcd83" DEPENDS = "" -DEPENDS_virtclass-native = "xsd-dev" +DEPENDS_virtclass-native = "xerces-c-native xsd-dev" BBCLASSEXTEND = "native" PROVIDES += "${PN}-dev ${PN}-dev-native" -SRC_URI = " \ - git://scm.codesynthesis.com/xsd/xsd.git;protocol=git \ - " -SRCREV = "94cba986108a0e0f42295572ca42c356d59328d7" +SRC_URI = "\ + http://www.codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2 \ + file://elements.patch \ + " +SRC_URI[md5sum] = "ae64d7fcd258addc9b045fe3f96208bb" +SRC_URI[sha256sum] = "eca52a9c8f52cdbe2ae4e364e4a909503493a0d51ea388fc6c9734565a859817" -S = "${WORKDIR}/git" + +S = "${WORKDIR}/xsd-4.0.0+dep" # Per http://www.codesynthesis.com/pipermail/xsde-users/2012-October/000535.html # Boris says to get the binary for the host, then cross-compile and install libxsd... # However libxsd is header-only, so this is really just making the executable visible # to the host and the headers installed on the target. +do_configure () { + : +} +do_compile () { + : +} do_install () { install -d ${D}${includedir} - cp -r ${S}/libxsd/xsd ${D}${includedir}/xsd + cp -r ${S}/xsd/libxsd/xsd ${D}${includedir}/xsd +} + +do_compile_virtclass-native () { + oe_runmake } do_install_virtclass-native () { - install -m 0755 -D ${S}/bin/xsd ${D}${bindir}/xsdcxx + install -m 0755 -D ${S}/xsd/xsd/xsd ${D}${bindir}/xsdcxx } \ No newline at end of file From a8d0830983e0df563c299734e4c76bb2e2aabad1 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Tue, 18 Jul 2017 12:39:11 -0400 Subject: [PATCH 08/24] Minor update to SigGen and entity class to move towards using PACKAGE_ARCH for the implementations and SPD --- classes/redhawk-entity.bbclass | 15 ++++++++ .../files/01_Remove_x86_and_Impls.patch | 35 ------------------- .../redhawk-siggen/redhawk-siggen_2.0.1.bb | 1 - 3 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 recipes-components/redhawk-siggen/files/01_Remove_x86_and_Impls.patch diff --git a/classes/redhawk-entity.bbclass b/classes/redhawk-entity.bbclass index 9c0c08a..bd8c82d 100644 --- a/classes/redhawk-entity.bbclass +++ b/classes/redhawk-entity.bbclass @@ -19,3 +19,18 @@ do_install_prepend() { export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" export PYTHONPATH=${OSSIEHOME_STAGED}/lib/python:${PYTHONPATH} } + +# Dynamic architecture patch for whatever ${PACKAGE_ARCH} is set to. +# 1. This takes whatever is ${NODE_CONFIG_SCRIPT} and find where it hard-codes the architecture look-up, +# replacing it for ${PACKAGE_ARCH} +# 2. This changes processor name x86_64 and replaces it with ${PACKAGE_ARCH}. +# 3. This removes processor name x86. +NODE_CONFIG_SCRIPT ?= "" +do_dynamic_arch_patch () { + if ! [ -z ${NODE_CONFIG_SCRIPT} ] ; then + sed -i "s/tmp_proc_map.get(tmp_uname_p, 'x86')/'${PACKAGE_ARCH}'/g" ${S}/${NODE_CONFIG_SCRIPT} + fi + sed -i "s///g" ${S}/../*.spd.xml + sed -i "s///g" ${S}/../*.spd.xml +} +addtask dynamic_arch_patch after do_patch before do_configure diff --git a/recipes-components/redhawk-siggen/files/01_Remove_x86_and_Impls.patch b/recipes-components/redhawk-siggen/files/01_Remove_x86_and_Impls.patch deleted file mode 100644 index 42b67ea..0000000 --- a/recipes-components/redhawk-siggen/files/01_Remove_x86_and_Impls.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git SigGen.spd.xml SigGen.spd.xml -index 2fba222..4d305d5 100644 ---- a/SigGen.spd.xml -+++ b/SigGen.spd.xml -@@ -39,30 +39,5 @@ - - - -- -- -- -- -- The implementation contains descriptive information about the template for a software component. -- -- -- python/SigGen.py -- -- -- -- -- -- -- -- The implementation contains descriptive information about the template for a software component. -- -- -- java/startJava.sh -- -- -- -- -- -- - - diff --git a/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb b/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb index 9083b07..29af887 100644 --- a/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb +++ b/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb @@ -9,7 +9,6 @@ RDEPENDS_${PN} = "redhawk-bulkio" PR = "r1" SRC_URI_append = " \ - file://01_Remove_x86_and_Impls.patch;patchdir=.. \ file://03_Add_Missing_Files.patch; \ file://04_Prefix_to_SDRROOT.patch; \ " From 3bbdb619bb7713d226ab545ae232fbb952a4068f Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:23:24 -0400 Subject: [PATCH 09/24] Updated RTL-SDR to use the common redhawk source tree --- recipes-deps/rtlsdr/rtlsdr_0.5.2-4.bb | 16 ---------------- recipes-deps/rtlsdr/rtlsdr_0.5.2.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 recipes-deps/rtlsdr/rtlsdr_0.5.2-4.bb create mode 100644 recipes-deps/rtlsdr/rtlsdr_0.5.2.bb diff --git a/recipes-deps/rtlsdr/rtlsdr_0.5.2-4.bb b/recipes-deps/rtlsdr/rtlsdr_0.5.2-4.bb deleted file mode 100644 index 8a8773b..0000000 --- a/recipes-deps/rtlsdr/rtlsdr_0.5.2-4.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Driver for RTL-SDR device" -HOMEPAGE = "http://sdr.osmocom.org/trac/wiki/rtl-sdr" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "libusb1" -RDEPENDS_${PN} = "libusb1" - -SRC_URI = "\ - https://github.com/RedhawkSDR/librtlsdr;tag=${PV};protocol=git \ - file://01_fix_pkgconfig.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/recipes-deps/rtlsdr/rtlsdr_0.5.2.bb b/recipes-deps/rtlsdr/rtlsdr_0.5.2.bb new file mode 100644 index 0000000..17b317e --- /dev/null +++ b/recipes-deps/rtlsdr/rtlsdr_0.5.2.bb @@ -0,0 +1,20 @@ +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" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "libusb1" +RDEPENDS_${PN} = "libusb1" + +PR = "r4" + +SRC_URI_append = "\ + file://01_fix_pkgconfig.patch \ + " + +S = "${WORKDIR}/git/redhawk-dependencies/librtlsdr" From f831088b79c020d11b61024c696d60ae47a867eb Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:25:14 -0400 Subject: [PATCH 10/24] Reduced support to required version of REDHAWK 2.0.6 (4.2.0) --- .../files/pyPrefixIsPrefix-4.1.6.patch | 13 --- ...fix-4.2.0.patch => pyPrefixIsPrefix.patch} | 0 .../omniorb/files/rm_LongDouble-4.1.6.patch | 71 ---------------- ...Double-4.2.0.patch => rm_LongDouble.patch} | 0 recipes-deps/omniorb/omniorb.inc | 82 ------------------ recipes-deps/omniorb/omniorb_4.1.6.bb | 8 -- recipes-deps/omniorb/omniorb_4.2.0.bb | 85 ++++++++++++++++++- 7 files changed, 82 insertions(+), 177 deletions(-) delete mode 100644 recipes-deps/omniorb/files/pyPrefixIsPrefix-4.1.6.patch rename recipes-deps/omniorb/files/{pyPrefixIsPrefix-4.2.0.patch => pyPrefixIsPrefix.patch} (100%) delete mode 100644 recipes-deps/omniorb/files/rm_LongDouble-4.1.6.patch rename recipes-deps/omniorb/files/{rm_LongDouble-4.2.0.patch => rm_LongDouble.patch} (100%) delete mode 100644 recipes-deps/omniorb/omniorb.inc delete mode 100644 recipes-deps/omniorb/omniorb_4.1.6.bb diff --git a/recipes-deps/omniorb/files/pyPrefixIsPrefix-4.1.6.patch b/recipes-deps/omniorb/files/pyPrefixIsPrefix-4.1.6.patch deleted file mode 100644 index 11a8299..0000000 --- a/recipes-deps/omniorb/files/pyPrefixIsPrefix-4.1.6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tool/omniidl/cxx/dir.mk b/src/tool/omniidl/cxx/dir.mk -index 91f4bf3..793889c 100644 ---- a/src/tool/omniidl/cxx/dir.mk -+++ b/src/tool/omniidl/cxx/dir.mk -@@ -73,7 +73,7 @@ idlc = $(patsubst %,$(BinPattern),idlc) - - 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 := "" diff --git a/recipes-deps/omniorb/files/pyPrefixIsPrefix-4.2.0.patch b/recipes-deps/omniorb/files/pyPrefixIsPrefix.patch similarity index 100% rename from recipes-deps/omniorb/files/pyPrefixIsPrefix-4.2.0.patch rename to recipes-deps/omniorb/files/pyPrefixIsPrefix.patch diff --git a/recipes-deps/omniorb/files/rm_LongDouble-4.1.6.patch b/recipes-deps/omniorb/files/rm_LongDouble-4.1.6.patch deleted file mode 100644 index 6d78401..0000000 --- a/recipes-deps/omniorb/files/rm_LongDouble-4.1.6.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/include/omniORB4/CORBA_sysdep_auto.h b/include/omniORB4/CORBA_sysdep_auto.h -index 6488977..16b9dc7 100644 ---- a/include/omniORB4/CORBA_sysdep_auto.h -+++ b/include/omniORB4/CORBA_sysdep_auto.h -@@ -83,12 +83,10 @@ - - - #if !defined(OMNIORB_DISABLE_LONGDOUBLE) - # if defined(SIZEOF_LONG_DOUBLE) && (SIZEOF_LONG_DOUBLE == 16) --# 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 _CORBA_LONGDOUBLE_DECL long double - # endif - #endif - -diff --git a/include/omniORB4/CORBA_sysdep_trad.h b/include/omniORB4/CORBA_sysdep_trad.h -index f320967..de29220 100644 ---- a/include/omniORB4/CORBA_sysdep_trad.h -+++ b/include/omniORB4/CORBA_sysdep_trad.h -@@ -205,7 +205,6 @@ - - // GCC claims to support long long on all platforms - # define HAS_LongLong --# define HAS_LongDouble - # define _CORBA_LONGLONG_DECL long long - # define _CORBA_ULONGLONG_DECL unsigned long long - # define _CORBA_LONGDOUBLE_DECL long double -@@ -257,7 +256,6 @@ - # define _CORBA_LONGDOUBLE_DECL long double - # define _CORBA_LONGLONG_CONST(x) (x##LL) - --# define HAS_LongDouble - - - #elif defined(_MSC_VER) -@@ -290,7 +288,6 @@ - - # define HAVE_STRTOULL - --# define HAS_LongDouble - # define HAS_LongLong - # define _CORBA_LONGDOUBLE_DECL long double - # define _CORBA_LONGLONG_DECL long long -@@ -325,7 +322,6 @@ - # define HAS_Cplusplus_const_cast - # define OMNI_REQUIRES_FQ_BASE_CTOR - # define HAS_LongLong --# define HAS_LongDouble - # define _CORBA_LONGLONG_DECL long long - # define _CORBA_ULONGLONG_DECL unsigned long long - # define _CORBA_LONGDOUBLE_DECL long double -@@ -350,7 +346,6 @@ - # define HAS_Cplusplus_Namespace - # define HAS_Std_Namespace - # define HAS_LongLong --# define HAS_LongDouble - # define _CORBA_LONGLONG_DECL long long - # define _CORBA_ULONGLONG_DECL unsigned long long - # define _CORBA_LONGDOUBLE_DECL long double -@@ -370,7 +365,6 @@ - # define _CORBA_ULONGLONG_DECL unsigned long long - # define _CORBA_LONGLONG_CONST(x) (x##LL) - # if defined(_FPWIDETYPES) --# define HAS_LongDouble - # define _CORBA_LONGDOUBLE_DECL long double - # endif - # ifndef HAVE_STD diff --git a/recipes-deps/omniorb/files/rm_LongDouble-4.2.0.patch b/recipes-deps/omniorb/files/rm_LongDouble.patch similarity index 100% rename from recipes-deps/omniorb/files/rm_LongDouble-4.2.0.patch rename to recipes-deps/omniorb/files/rm_LongDouble.patch diff --git a/recipes-deps/omniorb/omniorb.inc b/recipes-deps/omniorb/omniorb.inc deleted file mode 100644 index 2d55328..0000000 --- a/recipes-deps/omniorb/omniorb.inc +++ /dev/null @@ -1,82 +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 = "OmniORB High Performance ORB" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=75b02c2872421380bbd47781d2bd75d3" - -DEPENDS += "omniorb-native python" -DEPENDS_virtclass-native += "python-native" - -RDEPENDS_${PN}-python += "python" -PACKAGES += "${PN}-python" -PROVIDES += "${PN}-python" - -SRC_URI_append = "\ - file://omniORB.cfg \ - file://omniORB-cross.patch \ - file://omniORB_embedded_appl.patch \ - file://pyPrefixIsPrefix-${PV}.patch \ - file://fixPythonShebang.patch \ - file://rm_LongDouble-${PV}.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 -# and idl files -INSANE_SKIP_${PN}-python += "dev-so" -FILES_${PN}-dev += "${datadir}/idl/omniORB/* ${datadir}/idl/omniORB/cos/*" - -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}" - -inherit autotools pkgconfig pythonnative - -CONFFILES_${PN} += "/etc/omniORB.cfg" - -do_compile () { - export TOOLBINDIR=${STAGING_BINDIR_NATIVE} - oe_runmake -} - -do_compile_virtclass-native () { - oe_runmake -} - -do_install () { - # Set a variable that the Makefiles obey for install. - autotools_do_install - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/omniORB.cfg ${D}${sysconfdir}/omniORB.cfg -} - -BBCLASSEXTEND = "native" - -NATIVE_INSTALL_WORKS = "1" - diff --git a/recipes-deps/omniorb/omniorb_4.1.6.bb b/recipes-deps/omniorb/omniorb_4.1.6.bb deleted file mode 100644 index 54ad966..0000000 --- a/recipes-deps/omniorb/omniorb_4.1.6.bb +++ /dev/null @@ -1,8 +0,0 @@ -SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORB-4.1.6.tar.bz2;name=omniORB416tarbz2" -SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORB-4.1.6.tar.bz2;name=omniORB416tarbz2" - -SRC_URI[omniORB416tarbz2.md5sum] = "44990f8139c349b53ab43110de6c629b" -SRC_URI[omniORB416tarbz2.sha256sum] = "749c5e615130c804e40f4028104c1f98469613ff32a7f81562d06e669ba0b2c1" - -include omniorb.inc - diff --git a/recipes-deps/omniorb/omniorb_4.2.0.bb b/recipes-deps/omniorb/omniorb_4.2.0.bb index 0d4db2e..7ffed4d 100644 --- a/recipes-deps/omniorb/omniorb_4.2.0.bb +++ b/recipes-deps/omniorb/omniorb_4.2.0.bb @@ -1,8 +1,87 @@ -SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORB-4.2.0.tar.bz2;name=omniORB420tarbz2" -SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORB-4.2.0.tar.bz2;name=omniORB420tarbz2" +# +# 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 = "OmniORB High Performance ORB" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=75b02c2872421380bbd47781d2bd75d3" + +DEPENDS += "omniorb-native python" +DEPENDS_virtclass-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 = "${SRC_URI_BASE}" +SRC_URI_virtclass-native = "${SRC_URI_BASE}" SRC_URI[omniORB420tarbz2.md5sum] = "f1e104d0a2df92829c1b37a853f4805d" SRC_URI[omniORB420tarbz2.sha256sum] = "74c273fc997c2881b128feb52182dbe067acfecc4cf37475f43c104338eba8bc" -include omniorb.inc +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 \ +" + +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 +# and idl files +INSANE_SKIP_${PN}-python += "dev-so" +FILES_${PN}-dev += "${datadir}/idl/omniORB/* ${datadir}/idl/omniORB/cos/*" + +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}" + +inherit autotools pkgconfig pythonnative + +CONFFILES_${PN} += "/etc/omniORB.cfg" + +do_compile () { + export TOOLBINDIR=${STAGING_BINDIR_NATIVE} + oe_runmake +} + +do_compile_virtclass-native () { + oe_runmake +} + +do_install () { + # Set a variable that the Makefiles obey for install. + autotools_do_install + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/omniORB.cfg ${D}${sysconfdir}/omniORB.cfg +} + +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" From e7fbeeefb0a08c68faed364d1167ea13de704aaf Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:27:03 -0400 Subject: [PATCH 11/24] Reduced version support to OmniORB 4.2.0 --- .../files/omniORBpy_modules_dir.mk-3.6.patch | 11 --- ...0.patch => omniORBpy_modules_dir.mk.patch} | 0 ...ch => omniORBpy_modules_ziop_dir.mk.patch} | 0 recipes-deps/omniorbpy/omniorbpy_3.6.bb | 10 -- recipes-deps/omniorbpy/omniorbpy_4.2.0.bb | 91 ++++++++++++++++++- 5 files changed, 87 insertions(+), 25 deletions(-) delete mode 100644 recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-3.6.patch rename recipes-deps/omniorbpy/files/{omniORBpy_modules_dir.mk-4.2.0.patch => omniORBpy_modules_dir.mk.patch} (100%) rename recipes-deps/omniorbpy/files/{omniORBpy_modules_ziop_dir.mk-4.2.0.patch => omniORBpy_modules_ziop_dir.mk.patch} (100%) delete mode 100644 recipes-deps/omniorbpy/omniorbpy_3.6.bb diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-3.6.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-3.6.patch deleted file mode 100644 index 5497a14..0000000 --- a/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-3.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- omniORBpy-3.4/modules/dir.mk 2006-08-08 07:57:20.000000000 -0400 -+++ omniORBpy-3.4.new/modules/dir.mk 2011-03-15 23:49:24.795249306 -0400 -@@ -76,7 +76,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-4.2.0.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk.patch similarity index 100% rename from recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-4.2.0.patch rename to recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk.patch diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk-4.2.0.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk.patch similarity index 100% rename from recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk-4.2.0.patch rename to recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk.patch diff --git a/recipes-deps/omniorbpy/omniorbpy_3.6.bb b/recipes-deps/omniorbpy/omniorbpy_3.6.bb deleted file mode 100644 index 6174ea4..0000000 --- a/recipes-deps/omniorbpy/omniorbpy_3.6.bb +++ /dev/null @@ -1,10 +0,0 @@ -SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORBpy-3.6.tar.bz2;name=omniORBpytarbz2" -SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORBpy-3.6.tar.bz2;name=omniORBpytarbz2" - -SRC_URI[omniORBpytarbz2.md5sum] = "a7ab4789b913313f18a1171ff7a140b7" -SRC_URI[omniORBpytarbz2.sha256sum] = "b845eef13b56dfb47c98d65636ede5155ed4b84b2a64e35831b94668878af7c7" - -PREFERRED_VERSION_omniorb = "4.1.6" - -include omniorbpy.inc - diff --git a/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb b/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb index b5b8a74..87b4b05 100644 --- a/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb +++ b/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb @@ -1,11 +1,94 @@ -SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORBpy-4.2.0.tar.bz2;name=omniORBpytarbz2" -SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORBpy-4.2.0.tar.bz2;name=omniORBpytarbz2" +# +# 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_modules_ziop_dir.mk-4.2.0.patch" +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_DIR_TARGET}/usr" +EXTRA_OECONF_virtclass-native = "--with-omniorb=${STAGING_DIR_NATIVE}/usr" + + +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" -include omniorbpy.inc +NATIVE_INSTALL_WORKS = "1" From 8121b21e29a76f66d4279d7f472aaa16463063d9 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:28:34 -0400 Subject: [PATCH 12/24] Reduced version support to REDHAWK 2.0.6 required version (2.7.1 R2) --- recipes-deps/omnievents/files/aclocal.d.patch | 11 ---- recipes-deps/omnievents/omnievents.inc | 66 ------------------- recipes-deps/omnievents/omnievents_2.7.0.bb | 4 -- recipes-deps/omnievents/omnievents_2.7.1-2.bb | 4 -- recipes-deps/omnievents/omnievents_2.7.1.bb | 65 +++++++++++++++++- 5 files changed, 63 insertions(+), 87 deletions(-) delete mode 100644 recipes-deps/omnievents/files/aclocal.d.patch delete mode 100644 recipes-deps/omnievents/omnievents.inc delete mode 100644 recipes-deps/omnievents/omnievents_2.7.0.bb delete mode 100644 recipes-deps/omnievents/omnievents_2.7.1-2.bb diff --git a/recipes-deps/omnievents/files/aclocal.d.patch b/recipes-deps/omnievents/files/aclocal.d.patch deleted file mode 100644 index 725afe4..0000000 --- a/recipes-deps/omnievents/files/aclocal.d.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nuar git/aclocal.d/ACX_PTHREAD.m4 git-patch/aclocal.d/ACX_PTHREAD.m4 ---- git/aclocal.d/ACX_PTHREAD.m4 2016-02-12 12:04:54.522537144 -0500 -+++ git-patch/aclocal.d/ACX_PTHREAD.m4 2016-02-12 13:07:21.451239363 -0500 -@@ -239,4 +239,5 @@ - $2 - fi - AC_LANG_RESTORE --])dnl ACX_PTHREAD -\ No newline at end of file -+])dnl ACX_PTHREAD -+ diff --git a/recipes-deps/omnievents/omnievents.inc b/recipes-deps/omnievents/omnievents.inc deleted file mode 100644 index ed3b0e4..0000000 --- a/recipes-deps/omnievents/omnievents.inc +++ /dev/null @@ -1,66 +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 = "OmniEvents" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=68ad62c64cc6c620126241fd429e68fe" -DEPENDS += "omniorb boost" - -# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -SRCTAG ?= "" -SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" - -SRC_URI = "git://github.com/redhawksdr/omniEvents.git;${SRCTAGARG};protocol=git \ - file://omniEvents.patch \ - file://config.mk.patch \ -" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF="\ - --with-omniorb=${STAGING_DIR}/${MACHINE}/usr \ - --with-boost=${STAGING_DIR}/${MACHINE}/usr \ - " - -# Over-write default multi-threaded build temporarily. -PARALLEL_MAKE = "" - -do_configure_append () { - # omniEvents isn't quite as auto-tooled as omniNames so its build - # in OE is a bit more involved; we have to manually copy sources, make files, etc. - # At this point, we're in the build folder. - cp -r ../git/Makefile ../git/idl ../git/src ../git/contrib ../git/tools ../git/examples . -} - -do_compile () { - export IDL=${STAGING_DIR}/${BUILD_SYS}/usr/bin/omniidl - export IDL_COS_DIR=${STAGING_DIR}/${BUILD_SYS}/usr/share/idl/omniORB - oe_runmake -} - -do_install () { - # Set a variable that the Makefiles obey for install. - autotools_do_install -} - diff --git a/recipes-deps/omnievents/omnievents_2.7.0.bb b/recipes-deps/omnievents/omnievents_2.7.0.bb deleted file mode 100644 index b4b5a65..0000000 --- a/recipes-deps/omnievents/omnievents_2.7.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -SRCTAG = "2.7.0" -PREFERRED_VERSION_omniorb = "4.1.6" -include omnievents.inc - diff --git a/recipes-deps/omnievents/omnievents_2.7.1-2.bb b/recipes-deps/omnievents/omnievents_2.7.1-2.bb deleted file mode 100644 index 25e582b..0000000 --- a/recipes-deps/omnievents/omnievents_2.7.1-2.bb +++ /dev/null @@ -1,4 +0,0 @@ -SRCTAG = "2.7.1-2" -PREFERRED_VERSION_omniorb = "4.2.0" -include omnievents.inc - diff --git a/recipes-deps/omnievents/omnievents_2.7.1.bb b/recipes-deps/omnievents/omnievents_2.7.1.bb index 8ba5b4f..eb88522 100644 --- a/recipes-deps/omnievents/omnievents_2.7.1.bb +++ b/recipes-deps/omnievents/omnievents_2.7.1.bb @@ -1,4 +1,65 @@ -SRCTAG = "2.7.1" +# +# 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 = "OmniEvents" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=68ad62c64cc6c620126241fd429e68fe" +DEPENDS += "omniorb boost" + PREFERRED_VERSION_omniorb = "4.2.0" -include omnievents.inc +PR = "r2" + +SRC_URI = "git://github.com/redhawksdr/omniEvents.git;tag=2.7.1-2;protocol=git \ + file://omniEvents.patch \ + file://config.mk.patch \ +" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF="\ + --with-omniorb=${STAGING_DIR}/${MACHINE}/usr \ + --with-boost=${STAGING_DIR}/${MACHINE}/usr \ + " + +# Over-write default multi-threaded build temporarily. +PARALLEL_MAKE = "" + +do_configure_append () { + # omniEvents isn't quite as auto-tooled as omniNames so its build + # in OE is a bit more involved; we have to manually copy sources, make files, etc. + # At this point, we're in the build folder. + cp -r ../git/Makefile ../git/idl ../git/src ../git/contrib ../git/tools ../git/examples . +} + +do_compile () { + export IDL=${STAGING_DIR}/${BUILD_SYS}/usr/bin/omniidl + export IDL_COS_DIR=${STAGING_DIR}/${BUILD_SYS}/usr/share/idl/omniORB + oe_runmake +} + +do_install () { + # Set a variable that the Makefiles obey for install. + autotools_do_install +} From 865a43fd14e0ad54ded1e1bfd430ca8575fc5043 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:33:11 -0400 Subject: [PATCH 13/24] Removed previous version support, added 2.0.6 and use of common REDHAWK source repo --- .../gpp/files/01_Clear_AMFLAGS_GPP.patch | 10 --- .../files/01_Clear_AMFLAGS_GPP_NO_TEST.patch | 13 +++- .../gpp/files/02_armv7l_default_2.0.4.patch | 11 --- .../files/02_armv7l_default_pre-2.0.4.patch | 31 -------- .../gpp/files/04_GPP_spd_armv7l.patch | 11 --- ...configure-gpp_post-2.0.4 => configure-gpp} | 0 .../gpp/files/configure-gpp_pre-2.0.4 | 14 ---- recipes-devices/gpp/gpp.inc | 70 ----------------- recipes-devices/gpp/gpp_2.0.1.bb | 13 ---- recipes-devices/gpp/gpp_2.0.3.bb | 13 ---- recipes-devices/gpp/gpp_2.0.4.bb | 26 ------- recipes-devices/gpp/gpp_2.0.5.bb | 26 ------- recipes-devices/gpp/gpp_2.0.6.bb | 75 ++++++++++++++++--- .../gpp/gpp_install_append_post_2.0.4.inc | 13 ---- .../gpp/gpp_install_append_pre_2.0.4.inc | 12 --- 15 files changed, 76 insertions(+), 262 deletions(-) delete mode 100644 recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP.patch delete mode 100644 recipes-devices/gpp/files/02_armv7l_default_2.0.4.patch delete mode 100644 recipes-devices/gpp/files/02_armv7l_default_pre-2.0.4.patch delete mode 100644 recipes-devices/gpp/files/04_GPP_spd_armv7l.patch rename recipes-devices/gpp/files/{configure-gpp_post-2.0.4 => configure-gpp} (100%) delete mode 100755 recipes-devices/gpp/files/configure-gpp_pre-2.0.4 delete mode 100644 recipes-devices/gpp/gpp.inc delete mode 100644 recipes-devices/gpp/gpp_2.0.1.bb delete mode 100644 recipes-devices/gpp/gpp_2.0.3.bb delete mode 100644 recipes-devices/gpp/gpp_2.0.4.bb delete mode 100644 recipes-devices/gpp/gpp_2.0.5.bb delete mode 100644 recipes-devices/gpp/gpp_install_append_post_2.0.4.inc delete mode 100644 recipes-devices/gpp/gpp_install_append_pre_2.0.4.inc diff --git a/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP.patch b/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP.patch deleted file mode 100644 index b43e963..0000000 --- a/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cpp/Makefile.am 2016-03-02 09:05:26.527853099 -0500 -+++ cpp-patched/Makefile.am 2016-03-02 09:05:57.701963985 -0500 -@@ -24,7 +24,6 @@ - - xmldir = $(prefix)/dev/devices/GPP/ - dist_xml_DATA = ../GPP.scd.xml ../GPP.prf.xml ../GPP.spd.xml --ACLOCAL_AMFLAGS = -I m4 -I${OSSIEHOME}/share/aclocal/ossie - - distclean-local: - rm -f config.* diff --git a/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP_NO_TEST.patch b/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP_NO_TEST.patch index 815ddd0..7de2b8f 100644 --- a/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP_NO_TEST.patch +++ b/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP_NO_TEST.patch @@ -1,8 +1,16 @@ --- cpp/Makefile.am 2017-01-09 15:40:57.047135798 -0500 +++ cpp-patched/Makefile.am 2017-01-09 15:48:45.716371407 -0500 -@@ -24,15 +24,6 @@ +@@ -18,21 +18,13 @@ + # along with this program. If not, see http://www.gnu.org/licenses/. + # + ossieName = GPP +-bindir = $(prefix)/dev/devices/GPP/cpp/ ++bindir = $(SDR_ROOT)/dev/devices/GPP/cpp/ + bin_PROGRAMS = GPP + dist_bin_SCRIPTS = gpp_setup - xmldir = $(prefix)/dev/devices/GPP/ +-xmldir = $(prefix)/dev/devices/GPP/ ++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 - @@ -13,6 +21,7 @@ - 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.* diff --git a/recipes-devices/gpp/files/02_armv7l_default_2.0.4.patch b/recipes-devices/gpp/files/02_armv7l_default_2.0.4.patch deleted file mode 100644 index 4ef5d3a..0000000 --- a/recipes-devices/gpp/files/02_armv7l_default_2.0.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cpp/gpp_setup 2017-01-09 15:15:39.216102148 -0500 -+++ cpp-patched/gpp_setup 2017-01-09 15:16:25.909848851 -0500 -@@ -90,7 +90,7 @@ - 'i686':'x86', - 'x86_64':'x86_64', - 'armv7l':'armv7l'} -- self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, 'x86') -+ self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, 'armv7l') - - - diff --git a/recipes-devices/gpp/files/02_armv7l_default_pre-2.0.4.patch b/recipes-devices/gpp/files/02_armv7l_default_pre-2.0.4.patch deleted file mode 100644 index c45a4c8..0000000 --- a/recipes-devices/gpp/files/02_armv7l_default_pre-2.0.4.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- cpp/devconfig.py 2016-03-09 11:18:45.081892203 -0500 -+++ cpp-patched/devconfig.py 2016-03-09 11:49:18.403838466 -0500 -@@ -63,7 +63,7 @@ - 'i686':'x86', - 'x86_64':'x86_64', - 'armv7l':'armv7l'} -- self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, 'x86') -+ self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, 'armv7l') - - self._gather_java_information() - self._gather_python_information() ---- cpp/create_node.py 2016-03-09 12:33:32.141934365 -0500 -+++ cpp-patched/create_node.py 2016-03-09 12:37:17.582789626 -0500 -@@ -92,7 +92,7 @@ - 'i686':'x86', - 'x86_64':'x86_64', - 'armv7l':'armv7l'} -- self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, 'x86') -+ self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, 'armv7l') - - self._gather_java_information() - self._gather_python_information() -@@ -254,7 +254,7 @@ - compfiles = [{'id':GPP_componentfile, 'localfile':os.path.join('/devices', 'GPP', 'GPP.spd.xml')}] - else: - compfiles = [{'id':GPP_componentfile, 'localfile':os.path.join('/nodes', self.options.nodename, 'GPP', 'GPP.spd.xml')}] -- compplacements = [{'refid':GPP_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'GPP_' + self.hostname.replace('.', '_')}]}] -+ compplacements = [{'refid':GPP_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'GPP'}]}] - if self.options.noevents: - connections = [] - else: diff --git a/recipes-devices/gpp/files/04_GPP_spd_armv7l.patch b/recipes-devices/gpp/files/04_GPP_spd_armv7l.patch deleted file mode 100644 index 2a35630..0000000 --- a/recipes-devices/gpp/files/04_GPP_spd_armv7l.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- git/GPP.spd.xml 2016-07-21 18:49:56.849885062 +0000 -+++ git/GPP.spd.xml-patched 2016-07-21 19:28:42.551009097 +0000 -@@ -40,7 +40,6 @@ - - - -- -- -+ - - diff --git a/recipes-devices/gpp/files/configure-gpp_post-2.0.4 b/recipes-devices/gpp/files/configure-gpp similarity index 100% rename from recipes-devices/gpp/files/configure-gpp_post-2.0.4 rename to recipes-devices/gpp/files/configure-gpp diff --git a/recipes-devices/gpp/files/configure-gpp_pre-2.0.4 b/recipes-devices/gpp/files/configure-gpp_pre-2.0.4 deleted file mode 100755 index 6fc42bd..0000000 --- a/recipes-devices/gpp/files/configure-gpp_pre-2.0.4 +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: configure-gpp -# Required-Start: -# Required-Stop: -# Default-Start: S -# Default-Stop: -### END INIT INFO - -echo "Configuring GPP" -source /etc/profile -cd $SDRROOT/dev/devices/GPP -cpp/devconfig.py --location=./ --mcastnic=MCASTNIC - diff --git a/recipes-devices/gpp/gpp.inc b/recipes-devices/gpp/gpp.inc deleted file mode 100644 index 111932f..0000000 --- a/recipes-devices/gpp/gpp.inc +++ /dev/null @@ -1,70 +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 Core Framework GPP" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM ?= "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -# ################################################ -# End user-controlled variables to adjust the node -# ################################################ -RH_GPP_MCASTNIC ?= "" -RH_GPP_NODE_NAME ?= "DevMgr-GPP" -# ################################################ - -DEPENDS = "redhawk-bulkio" -RDEPENDS_${PN} = "redhawk-bulkio" - -# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -SRCTAG ?= "" -SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" - -SRC_URI ?= "git://github.com/RedhawkSDR/framework-GPP.git;${SRCTAGARG};protocol=git" - -SRC_URI_append = "\ - file://03_Add_Missing_Files.patch \ - file://05_GPP_ps_e.patch \ -" - -S ?= "${WORKDIR}/git/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. -inherit autotools-brokensep pkgconfig pythonnative redhawk-device - -FILES_${PN} += "${SDRROOT}/*" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" - -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" -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 GPP needs to be setup once it's running on the embedded system. -# This ensures the script is added to init.d and the XML files are linked -# to the volatile filesystem. -inherit update-rc.d -INITSCRIPT_NAME = "configure-gpp" -INITSCRIPT_PARAMS = "defaults 98" - diff --git a/recipes-devices/gpp/gpp_2.0.1.bb b/recipes-devices/gpp/gpp_2.0.1.bb deleted file mode 100644 index 321f8ff..0000000 --- a/recipes-devices/gpp/gpp_2.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SRCTAG = "2.0.1" -PREFERRED_VERSION_redhawk-bulkio = "2.0.1" - -SRC_URI_append = "\ - file://01_Clear_AMFLAGS_GPP.patch \ - file://02_armv7l_default_pre-2.0.4.patch \ - file://configure-gpp_pre-2.0.4 \ - file://04_GPP_spd_armv7l.patch;patchdir=${WORKDIR}/git \ -" - -include gpp.inc -include gpp_install_append_pre_2.0.4.inc - diff --git a/recipes-devices/gpp/gpp_2.0.3.bb b/recipes-devices/gpp/gpp_2.0.3.bb deleted file mode 100644 index 8358fd4..0000000 --- a/recipes-devices/gpp/gpp_2.0.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -SRCTAG = "2.0.3" -PREFERRED_VERSION_redhawk-bulkio = "2.0.3" - -SRC_URI_append = "\ - file://01_Clear_AMFLAGS_GPP.patch \ - file://02_armv7l_default_pre-2.0.4.patch \ - file://configure-gpp_pre-2.0.4 \ - file://04_GPP_spd_armv7l.patch;patchdir=${WORKDIR}/git \ -" - -include gpp.inc -include gpp_install_append_pre_2.0.4.inc - diff --git a/recipes-devices/gpp/gpp_2.0.4.bb b/recipes-devices/gpp/gpp_2.0.4.bb deleted file mode 100644 index 8af8912..0000000 --- a/recipes-devices/gpp/gpp_2.0.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/GPP/cpp" - -PREFERRED_VERSION_redhawk-bulkio = "2.0.4" - -SRC_URI_append = "\ - file://01_Clear_AMFLAGS_GPP_NO_TEST.patch \ - file://02_armv7l_default_2.0.4.patch \ - file://configure-gpp_post-2.0.4 \ - file://04_GPP_spd_armv7l.patch;patchdir=${WORKDIR}/git/GPP \ -" - -# ################################################ -# End user-controlled variables to adjust the node -# ################################################ -RH_GPP_MCASTNIC ?= "" -RH_GPP_NODE_NAME ?= "DevMgr-GPP-${MACHINE}" -RH_GPP_NAME ?= "GPP-${TARGET_ARCH}" -# ################################################ - -include gpp.inc -include gpp_install_append_post_2.0.4.inc - diff --git a/recipes-devices/gpp/gpp_2.0.5.bb b/recipes-devices/gpp/gpp_2.0.5.bb deleted file mode 100644 index 202497d..0000000 --- a/recipes-devices/gpp/gpp_2.0.5.bb +++ /dev/null @@ -1,26 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.5;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/GPP/cpp" - -PREFERRED_VERSION_redhawk-bulkio = "2.0.5" - -SRC_URI_append = "\ - file://01_Clear_AMFLAGS_GPP_NO_TEST.patch \ - file://02_armv7l_default_2.0.4.patch \ - file://configure-gpp_post-2.0.4 \ - file://04_GPP_spd_armv7l.patch;patchdir=${WORKDIR}/git/GPP \ -" - -# ################################################ -# End user-controlled variables to adjust the node -# ################################################ -RH_GPP_MCASTNIC ?= "" -RH_GPP_NODE_NAME ?= "DevMgr-GPP-${MACHINE}" -RH_GPP_NAME ?= "GPP-${TARGET_ARCH}" -# ################################################ - -include gpp.inc -include gpp_install_append_post_2.0.4.inc - diff --git a/recipes-devices/gpp/gpp_2.0.6.bb b/recipes-devices/gpp/gpp_2.0.6.bb index 2c1ea3a..603aac6 100644 --- a/recipes-devices/gpp/gpp_2.0.6.bb +++ b/recipes-devices/gpp/gpp_2.0.6.bb @@ -1,26 +1,81 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=${PV};protocol=git" +# +# 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/. +# -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" +DESCRIPTION = "REDHAWK Core Framework GPP" -S = "${WORKDIR}/git/GPP/cpp" +include recipes-core/include/redhawk-repo.inc +DEPENDS = "redhawk-bulkio" +RDEPENDS_${PN} = "redhawk-bulkio" PREFERRED_VERSION_redhawk-bulkio = "2.0.6" +PR = "r2" + SRC_URI_append = "\ + file://configure-gpp \ file://01_Clear_AMFLAGS_GPP_NO_TEST.patch \ - file://02_armv7l_default_2.0.4.patch \ - file://configure-gpp_post-2.0.4 \ - file://04_GPP_spd_armv7l.patch;patchdir=${WORKDIR}/git/GPP \ + file://03_Add_Missing_Files.patch \ + file://05_GPP_ps_e.patch \ " # ################################################ # End user-controlled variables to adjust the node # ################################################ RH_GPP_MCASTNIC ?= "" -RH_GPP_NODE_NAME ?= "DevMgr-GPP-${MACHINE}" -RH_GPP_NAME ?= "GPP-${TARGET_ARCH}" +RH_GPP_NODE_NAME ?= "DevMgr-GPP" +RH_GPP_NAME ?= "GPP-${PACKAGE_ARCH}" # ################################################ -include gpp.inc -include gpp_install_append_post_2.0.4.inc +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. +inherit autotools-brokensep pkgconfig pythonnative redhawk-device + +FILES_${PN} += "${SDRROOT}/*" + +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" +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 GPP needs to be setup once it's running on the embedded system. +# This ensures the script is added to init.d and the XML files are linked +# to the volatile filesystem. +inherit update-rc.d +INITSCRIPT_NAME = "configure-gpp" +INITSCRIPT_PARAMS = "defaults 98" + +NODE_CONFIG_SCRIPT = "gpp_setup" +# Install the script +do_install_append() { + install -d ${D}/etc/init.d + sed -i "s|MCASTNIC|${RH_GPP_MCASTNIC}|g" ${WORKDIR}/configure-gpp + install -m 0755 ${WORKDIR}/configure-gpp ${D}/etc/init.d/configure-gpp + + # Run node creator (containing just this device) + ${D}${SDRROOT}/dev/devices/GPP/cpp/gpp_setup \ + --sdrroot="${D}${SDRROOT}" \ + --nodename="${RH_GPP_NODE_NAME}" \ + --gppname="${RH_GPP_NAME}" +} diff --git a/recipes-devices/gpp/gpp_install_append_post_2.0.4.inc b/recipes-devices/gpp/gpp_install_append_post_2.0.4.inc deleted file mode 100644 index 545be71..0000000 --- a/recipes-devices/gpp/gpp_install_append_post_2.0.4.inc +++ /dev/null @@ -1,13 +0,0 @@ - -# Install the script -do_install_append() { - install -d ${D}/etc/init.d - sed -i "s|MCASTNIC|${RH_GPP_MCASTNIC}|g" ${WORKDIR}/configure-gpp_post-2.0.4 - install -m 0755 ${WORKDIR}/configure-gpp_post-2.0.4 ${D}/etc/init.d/configure-gpp - - # Run node creator (containing just this device) - ${D}${SDRROOT}/dev/devices/GPP/cpp/gpp_setup \ - --sdrroot="${D}${SDRROOT}" \ - --nodename="${RH_GPP_NODE_NAME}" \ - --gppname="${RH_GPP_NAME}" -} diff --git a/recipes-devices/gpp/gpp_install_append_pre_2.0.4.inc b/recipes-devices/gpp/gpp_install_append_pre_2.0.4.inc deleted file mode 100644 index 6a60dd6..0000000 --- a/recipes-devices/gpp/gpp_install_append_pre_2.0.4.inc +++ /dev/null @@ -1,12 +0,0 @@ - -# Install the script -do_install_append() { - install -d ${D}/etc/init.d - sed -i "s|MCASTNIC|${RH_GPP_MCASTNIC}|g" ${WORKDIR}/configure-gpp_pre-2.0.4 - install -m 0755 ${WORKDIR}/configure-gpp_pre-2.0.4 ${D}/etc/init.d/configure-gpp - - # Run create_node - ${D}${SDRROOT}/dev/devices/GPP/cpp/create_node.py \ - --sdrroot="${D}${SDRROOT}" \ - --nodename="${RH_GPP_NODE_NAME}" -} From d3fcc5f38fe52ff87b3ea7c5b447bc78d7c5d01e Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:34:22 -0400 Subject: [PATCH 14/24] Removed previous versions, added support for 2.0.1 R5 from REDHAWK 2.0.6 common source repo --- ...econfig_2.0.1-5.patch => nodeconfig.patch} | 0 .../rtl2832u/files/nodeconfig_2.0.0.patch | 29 ------- .../rtl2832u/files/nodeconfig_2.0.1.patch | 20 ----- recipes-devices/rtl2832u/rtl2832u.inc | 83 ------------------- recipes-devices/rtl2832u/rtl2832u_2.0.0.bb | 4 - recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb | 5 -- recipes-devices/rtl2832u/rtl2832u_2.0.1.bb | 82 +++++++++++++++++- 7 files changed, 79 insertions(+), 144 deletions(-) rename recipes-devices/rtl2832u/files/{nodeconfig_2.0.1-5.patch => nodeconfig.patch} (100%) delete mode 100644 recipes-devices/rtl2832u/files/nodeconfig_2.0.0.patch delete mode 100644 recipes-devices/rtl2832u/files/nodeconfig_2.0.1.patch delete mode 100644 recipes-devices/rtl2832u/rtl2832u.inc delete mode 100644 recipes-devices/rtl2832u/rtl2832u_2.0.0.bb delete mode 100644 recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb diff --git a/recipes-devices/rtl2832u/files/nodeconfig_2.0.1-5.patch b/recipes-devices/rtl2832u/files/nodeconfig.patch similarity index 100% rename from recipes-devices/rtl2832u/files/nodeconfig_2.0.1-5.patch rename to recipes-devices/rtl2832u/files/nodeconfig.patch diff --git a/recipes-devices/rtl2832u/files/nodeconfig_2.0.0.patch b/recipes-devices/rtl2832u/files/nodeconfig_2.0.0.patch deleted file mode 100644 index 2c8e5f4..0000000 --- a/recipes-devices/rtl2832u/files/nodeconfig_2.0.0.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- git/nodeconfig.py 2016-03-09 14:41:47.482999800 -0500 -+++ git-patched/nodeconfig.py 2016-03-09 14:43:45.513263853 -0500 -@@ -122,7 +122,7 @@ - compfiles = [{'id':RTL2832U_componentfile, 'localfile':os.path.join('/devices', 'rh', 'RTL2832U', 'RTL2832U.spd.xml')}] - else: - compfiles = [{'id':RTL2832U_componentfile, 'localfile':os.path.join('/nodes', self.options.nodename.replace('.','/'), 'RTL2832U', 'RTL2832U.spd.xml')}] -- compplacements = [{'refid':RTL2832U_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.RTL2832U_' + self.hostname.replace('.', '_')}]}] -+ compplacements = [{'refid':RTL2832U_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.RTL2832U'}]}] - - ##################### - # DeviceManager files -@@ -208,7 +208,7 @@ - # Set the parameters for the target_device - for struct in _prf.get_struct(): - if struct.get_name() in "target_device": -- for simple in struct.get_props(): -+ for simple in struct.get_simple(): - if simple.get_name() in self.props: - simple.set_value(str(self.props[simple.get_name()])) - -@@ -230,7 +230,7 @@ - from optparse import OptionParser - parser = OptionParser() - #parser.usage = "%s [options] [simple_prop1 simple_value1]..." -- parser.add_option("--domainname", dest="domainname", default=None, -+ parser.add_option("--domainname", dest="domainname", default="REDHAWK_DEV", - help="Must give a domain name") - parser.add_option("--rtlname", dest="name", default="", - help="Name of the targeted RTL") diff --git a/recipes-devices/rtl2832u/files/nodeconfig_2.0.1.patch b/recipes-devices/rtl2832u/files/nodeconfig_2.0.1.patch deleted file mode 100644 index 1ed9702..0000000 --- a/recipes-devices/rtl2832u/files/nodeconfig_2.0.1.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- git/nodeconfig.py 2016-03-09 14:41:47.482999800 -0500 -+++ git-patched/nodeconfig.py 2016-03-09 14:43:45.513263853 -0500 -@@ -122,7 +122,7 @@ - compfiles = [{'id':RTL2832U_componentfile, 'localfile':os.path.join('/devices', 'rh', 'RTL2832U', 'RTL2832U.spd.xml')}] - else: - compfiles = [{'id':RTL2832U_componentfile, 'localfile':os.path.join('/nodes', self.options.nodename.replace('.','/'), 'RTL2832U', 'RTL2832U.spd.xml')}] -- compplacements = [{'refid':RTL2832U_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.RTL2832U_' + self.hostname.replace('.', '_')}]}] -+ compplacements = [{'refid':RTL2832U_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.RTL2832U'}]}] - - ##################### - # DeviceManager files -@@ -230,7 +230,7 @@ - from optparse import OptionParser - parser = OptionParser() - #parser.usage = "%s [options] [simple_prop1 simple_value1]..." -- parser.add_option("--domainname", dest="domainname", default=None, -+ parser.add_option("--domainname", dest="domainname", default="REDHAWK_DEV", - help="Must give a domain name") - parser.add_option("--rtlname", dest="name", default="", - help="Name of the targeted RTL") diff --git a/recipes-devices/rtl2832u/rtl2832u.inc b/recipes-devices/rtl2832u/rtl2832u.inc deleted file mode 100644 index c22a01b..0000000 --- a/recipes-devices/rtl2832u/rtl2832u.inc +++ /dev/null @@ -1,83 +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 Device for the RTL2832U" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "GPL-3.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=92aadbd9e4b26926809a4e97460613d5" - -# ################################################ -# End user-controlled variables to adjust the node -# ################################################ -RH_RTL2832U_NAME ?= "" -RH_RTL2832U_VENDOR ?= "" -RH_RTL2832U_PRODUCT ?= "" -RH_RTL2832U_SERIAL ?= "" -RH_RTL2832U_INDEX ?= "" -RH_RTL2832U_NODE_NAME ?= "DevMgr-RTL2832U" -# ################################################ - - -DEPENDS = "redhawk-frontend redhawk-bulkio rtlsdr" -RDEPENDS_${PN} = "redhawk-frontend rtlsdr" - -# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -SRCTAG ?= "" -SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" - -SRC_URI = "git://github.com/RedhawkSDR/RTL2832U.git;${SRCTAGARG};protocol=git \ - file://Add_Missing_Files.patch \ - file://Fix_rtl_version_constraint.patch \ - file://Clear_AMFLAGS.patch \ - file://nodeconfig_${PV}.patch \ -" - -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. -inherit autotools-brokensep pkgconfig pythonnative redhawk-device - -FILES_${PN} += "${SDRROOT}/*" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" - -EXTRA_OECONF += "--prefix=${SDRROOT}" -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" - -# Link nodeconfig.py into the source directory so we can patch it. -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 -} - -# Install the template node -do_install_append () { - ${D}${SDRROOT}/dev/devices/rh/RTL2832U/nodeconfig.py \ - --sdrroot="${D}${SDRROOT}" \ - --nodename="DevMgr-${MACHINE}-RTL2832U" \ - --rtlname="${RH_RTL2832U_NAME}" \ - --rtlvendor="${RH_RTL2832U_VENDOR}" \ - --rtlproduct="${RH_RTL2832U_PRODUCT}" \ - --rtlserial="${RH_RTL2832U_SERIAL}" \ - --rtlindex="${RH_RTL2832U_INDEX}" \ - --inplace -} - diff --git a/recipes-devices/rtl2832u/rtl2832u_2.0.0.bb b/recipes-devices/rtl2832u/rtl2832u_2.0.0.bb deleted file mode 100644 index 8c91f83..0000000 --- a/recipes-devices/rtl2832u/rtl2832u_2.0.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -SRCTAG = "2.0.0" -PREFERRED_VERSION_redhawk-bulkio = "2.0.0" - -include rtl2832u.inc diff --git a/recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb b/recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb deleted file mode 100644 index 0f3b7fb..0000000 --- a/recipes-devices/rtl2832u/rtl2832u_2.0.1-5.bb +++ /dev/null @@ -1,5 +0,0 @@ -SRCTAG = "${PV}" -PREFERRED_VERSION_redhawk-bulkio = "2.0.6" -PREFERRED_VERSION_redhawk-frontend = "2.3.6" - -include rtl2832u.inc diff --git a/recipes-devices/rtl2832u/rtl2832u_2.0.1.bb b/recipes-devices/rtl2832u/rtl2832u_2.0.1.bb index f52d80f..13fef37 100644 --- a/recipes-devices/rtl2832u/rtl2832u_2.0.1.bb +++ b/recipes-devices/rtl2832u/rtl2832u_2.0.1.bb @@ -1,4 +1,80 @@ -SRCTAG = "2.0.1" -PREFERRED_VERSION_redhawk-bulkio = "2.0.3" +# +# 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/. +# -include rtl2832u.inc +DESCRIPTION = "REDHAWK Device for the RTL2832U" +DEPENDS = "redhawk-frontend redhawk-bulkio rtlsdr" +RDEPENDS_${PN} = "redhawk-frontend rtlsdr" + +PREFERRED_VERSION_redhawk-bulkio = "2.0.6" +PREFERRED_VERSION_redhawk-frontend = "2.3.6" + +PR = "r5" + +include recipes-core/include/redhawk-repo.inc + +# ################################################ +# End user-controlled variables to adjust the node +# ################################################ +RH_RTL2832U_NAME ?= "" +RH_RTL2832U_VENDOR ?= "" +RH_RTL2832U_PRODUCT ?= "" +RH_RTL2832U_SERIAL ?= "" +RH_RTL2832U_INDEX ?= "" +RH_RTL2832U_NODE_NAME ?= "DevMgr-RTL2832U" +# ################################################ + +SRC_URI_append = "\ + file://Add_Missing_Files.patch \ + file://Fix_rtl_version_constraint.patch \ + file://Clear_AMFLAGS.patch \ + file://nodeconfig.patch \ +" + +S = "${WORKDIR}/git/redhawk-devices/RTL2832U/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. +inherit autotools-brokensep pkgconfig pythonnative redhawk-device + +FILES_${PN} += "${SDRROOT}/*" +INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" + +EXTRA_OECONF += "--prefix=${SDRROOT}" +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" + +# Link nodeconfig.py into the source directory so we can patch it. +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 +} + +# Install the template node +do_install_append () { + ${D}${SDRROOT}/dev/devices/rh/RTL2832U/nodeconfig.py \ + --sdrroot="${D}${SDRROOT}" \ + --nodename="DevMgr-${MACHINE}-RTL2832U" \ + --rtlname="${RH_RTL2832U_NAME}" \ + --rtlvendor="${RH_RTL2832U_VENDOR}" \ + --rtlproduct="${RH_RTL2832U_PRODUCT}" \ + --rtlserial="${RH_RTL2832U_SERIAL}" \ + --rtlindex="${RH_RTL2832U_INDEX}" \ + --inplace +} From 34608b8f482e92fa631bb5064ed71ffb54da684f Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:35:37 -0400 Subject: [PATCH 15/24] Removed previous version support, added 5.0.0 R2 from common REDHAWK Reo --- ...odeconfig_4.0.1.patch => nodeconfig.patch} | 0 .../usrp-uhd/files/nodeconfig_4.0.0.patch | 29 ------- .../usrp-uhd/files/nodeconfig_5.0.0.patch | 20 ----- recipes-devices/usrp-uhd/usrp-uhd.inc | 87 ------------------- recipes-devices/usrp-uhd/usrp-uhd_4.0.0.bb | 5 -- recipes-devices/usrp-uhd/usrp-uhd_4.0.1.bb | 5 -- recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb | 84 +++++++++++++++++- 7 files changed, 82 insertions(+), 148 deletions(-) rename recipes-devices/usrp-uhd/files/{nodeconfig_4.0.1.patch => nodeconfig.patch} (100%) delete mode 100644 recipes-devices/usrp-uhd/files/nodeconfig_4.0.0.patch delete mode 100644 recipes-devices/usrp-uhd/files/nodeconfig_5.0.0.patch delete mode 100644 recipes-devices/usrp-uhd/usrp-uhd.inc delete mode 100644 recipes-devices/usrp-uhd/usrp-uhd_4.0.0.bb delete mode 100644 recipes-devices/usrp-uhd/usrp-uhd_4.0.1.bb diff --git a/recipes-devices/usrp-uhd/files/nodeconfig_4.0.1.patch b/recipes-devices/usrp-uhd/files/nodeconfig.patch similarity index 100% rename from recipes-devices/usrp-uhd/files/nodeconfig_4.0.1.patch rename to recipes-devices/usrp-uhd/files/nodeconfig.patch diff --git a/recipes-devices/usrp-uhd/files/nodeconfig_4.0.0.patch b/recipes-devices/usrp-uhd/files/nodeconfig_4.0.0.patch deleted file mode 100644 index d0b9fff..0000000 --- a/recipes-devices/usrp-uhd/files/nodeconfig_4.0.0.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- git/nodeconfig.py 2016-03-10 07:01:00.251851153 -0500 -+++ git-patched/nodeconfig.py 2016-03-10 07:04:01.358334653 -0500 -@@ -121,7 +121,7 @@ - compfiles = [{'id':USRP_UHD_componentfile, 'localfile':os.path.join('/devices', 'rh', 'USRP_UHD', 'USRP_UHD.spd.xml')}] - else: - compfiles = [{'id':USRP_UHD_componentfile, 'localfile':os.path.join('/nodes', self.options.nodename.replace('.','/'), 'USRP_UHD', 'USRP_UHD.spd.xml')}] -- compplacements = [{'refid':USRP_UHD_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.USRP_UHD_' + self.hostname.replace('.', '_')}]}] -+ compplacements = [{'refid':USRP_UHD_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.USRP_UHD'}]}] - - ##################### - # DeviceManager files -@@ -207,7 +207,7 @@ - # Set the parameters for the target_device - for struct in _prf.get_struct(): - if struct.get_name() in "target_device": -- for simple in struct.get_props(): -+ for simple in struct.get_simple(): - if simple.get_name() in self.props: - simple.set_value(str(self.props[simple.get_name()])) - -@@ -229,7 +229,7 @@ - from optparse import OptionParser - parser = OptionParser() - parser.usage = "%s [options] [simple_prop1 simple_value1]..." -- parser.add_option("--domainname", dest="domainname", default=None, -+ parser.add_option("--domainname", dest="domainname", default="REDHAWK_DEV", - help="Must give a domainname") - parser.add_option("--usrptype", dest="type", default="", - help="The hardware series identifier (usrp1, usrp2, b200, x300, ...)") diff --git a/recipes-devices/usrp-uhd/files/nodeconfig_5.0.0.patch b/recipes-devices/usrp-uhd/files/nodeconfig_5.0.0.patch deleted file mode 100644 index d90d512..0000000 --- a/recipes-devices/usrp-uhd/files/nodeconfig_5.0.0.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- git/nodeconfig.py 2016-03-10 07:01:00.251851153 -0500 -+++ git-patched/nodeconfig.py 2016-03-10 07:04:01.358334653 -0500 -@@ -121,7 +121,7 @@ - compfiles = [{'id':USRP_UHD_componentfile, 'localfile':os.path.join('/devices', 'rh', 'USRP_UHD', 'USRP_UHD.spd.xml')}] - else: - compfiles = [{'id':USRP_UHD_componentfile, 'localfile':os.path.join('/nodes', self.options.nodename.replace('.','/'), 'USRP_UHD', 'USRP_UHD.spd.xml')}] -- compplacements = [{'refid':USRP_UHD_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.USRP_UHD_' + self.hostname.replace('.', '_')}]}] -+ compplacements = [{'refid':USRP_UHD_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.USRP_UHD'}]}] - - ##################### - # DeviceManager files -@@ -229,7 +229,7 @@ - from optparse import OptionParser - parser = OptionParser() - parser.usage = "%s [options] [simple_prop1 simple_value1]..." -- parser.add_option("--domainname", dest="domainname", default=None, -+ parser.add_option("--domainname", dest="domainname", default="REDHAWK_DEV", - help="Must give a domainname") - parser.add_option("--usrptype", dest="type", default="", - help="The hardware series identifier (usrp1, usrp2, b200, x300, ...)") diff --git a/recipes-devices/usrp-uhd/usrp-uhd.inc b/recipes-devices/usrp-uhd/usrp-uhd.inc deleted file mode 100644 index 0837fe9..0000000 --- a/recipes-devices/usrp-uhd/usrp-uhd.inc +++ /dev/null @@ -1,87 +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 Device for the USRP UHD" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "GPL-3.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -# NOTE: This recipe requires the USRP UHD driver and hardware installed -# which is provided by the meta-sdr layer which relies on meta-ettus. - -# ################################################ -# End user-controlled variables to adjust the node -# ################################################ -RH_USRP_UHD_TYPE ?= "e3x0" -RH_USRP_UHD_NAME ?= "" -RH_USRP_UHD_IP ?= "" -RH_USRP_UHD_SERIAL ?= "" -RH_USRP_UHD_NODE_NAME ?= "DevMgr-USRP_UHD" -# ################################################ - -DEPENDS = "redhawk-bulkio redhawk-frontend uhd" -RDEPENDS_${PN} = "redhawk-bulkio redhawk-frontend uhd" - -# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -SRCTAG ?= "" -SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" - -SRC_URI = "git://github.com/RedhawkSDR/USRP_UHD.git;${SRCTAGARG};protocol=git \ - file://Add_Missing_Files.patch \ - file://nodeconfig_${PV}.patch \ - file://Clear_AMFLAGS.patch \ - file://remove_x86.patch \ -" - -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. -inherit autotools-brokensep pkgconfig pythonnative redhawk-device - -EXTRA_OECONF += "--prefix=${SDRROOT}" -EXTRA_AUTORECONF += "-I ${STAGING_DIR}/${MACHINE}${OSSIEHOME}/share/aclocal/ossie" - -FILES_${PN} += "${SDRROOT}/*" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" - - -# Link nodeconfig.py and SPD into the source directory so we can patch it. -addtask link_nodeconfig before do_patch after do_unpack -do_link_nodeconfig () { - mv ${S}/../nodeconfig.py \ - ${S}/../USRP_UHD.spd.xml \ - ${S} - ln -sf ${S}/nodeconfig.py ${S}/../nodeconfig.py - ln -sf ${S}/USRP_UHD.spd.xml ${S}/../USRP_UHD.spd.xml -} - -# Install the template node -do_install_append () { - ${D}${SDRROOT}/dev/devices/rh/USRP_UHD/nodeconfig.py \ - --sdrroot="${D}${SDRROOT}" \ - --nodename="${RH_USRP_UHD_NODE_NAME}" \ - --usrptype="${RH_USRP_UHD_TYPE}" \ - --usrpip="${RH_USRP_UHD_IP}" \ - --usrpname="${RH_USRP_UHD_IP}" \ - --usrpserial="${RH_USRP_UHD_SERIAL}" \ - --inplace \ -} - diff --git a/recipes-devices/usrp-uhd/usrp-uhd_4.0.0.bb b/recipes-devices/usrp-uhd/usrp-uhd_4.0.0.bb deleted file mode 100644 index e5484af..0000000 --- a/recipes-devices/usrp-uhd/usrp-uhd_4.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -SRCTAG = "4.0.0-3" -PREFERRED_VERSION_redhawk-bulkio = "2.0.3" -PREFERRED_VERSION_redhawk-frontend = "2.3.2" -include usrp-uhd.inc - diff --git a/recipes-devices/usrp-uhd/usrp-uhd_4.0.1.bb b/recipes-devices/usrp-uhd/usrp-uhd_4.0.1.bb deleted file mode 100644 index 4b63dbe..0000000 --- a/recipes-devices/usrp-uhd/usrp-uhd_4.0.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -SRCTAG = "4.0.1" -PREFERRED_VERSION_redhawk-bulkio = "2.0.3" -PREFERRED_VERSION_redhawk-frontend = "2.3.3" -include usrp-uhd.inc - diff --git a/recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb b/recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb index 172a1b9..2484d37 100644 --- a/recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb +++ b/recipes-devices/usrp-uhd/usrp-uhd_5.0.0.bb @@ -1,5 +1,85 @@ -SRCTAG = "${PV}" +# +# 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 Device for the USRP UHD" +DEPENDS = "redhawk-bulkio redhawk-frontend uhd" +RDEPENDS_${PN} = "redhawk-bulkio redhawk-frontend uhd" + PREFERRED_VERSION_redhawk-bulkio = "2.0.6" PREFERRED_VERSION_redhawk-frontend = "2.3.6" -include usrp-uhd.inc +PR = "4" + +include recipes-core/include/redhawk-repo.inc + +# NOTE: This recipe requires the USRP UHD driver and hardware installed +# which is provided by the meta-sdr layer which relies on meta-ettus. + +# ################################################ +# End user-controlled variables to adjust the node +# ################################################ +RH_USRP_UHD_TYPE ?= "e3x0" +RH_USRP_UHD_NAME ?= "" +RH_USRP_UHD_IP ?= "" +RH_USRP_UHD_SERIAL ?= "" +RH_USRP_UHD_NODE_NAME ?= "DevMgr-USRP_UHD" +# ################################################ + +SRC_URI_append = "\ + file://Add_Missing_Files.patch \ + file://nodeconfig.patch \ + file://Clear_AMFLAGS.patch \ + file://remove_x86.patch \ +" + +S = "${WORKDIR}/git/redhawk-devices/USRP_UHD/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. +inherit autotools-brokensep pkgconfig pythonnative redhawk-device + +EXTRA_OECONF += "--prefix=${SDRROOT}" +EXTRA_AUTORECONF += "-I ${STAGING_DIR}/${MACHINE}${OSSIEHOME}/share/aclocal/ossie" + +FILES_${PN} += "${SDRROOT}/*" +INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" + + +# Link nodeconfig.py and SPD into the source directory so we can patch it. +addtask link_nodeconfig before do_patch after do_unpack +do_link_nodeconfig () { + mv ${S}/../nodeconfig.py \ + ${S}/../USRP_UHD.spd.xml \ + ${S} + ln -sf ${S}/nodeconfig.py ${S}/../nodeconfig.py + ln -sf ${S}/USRP_UHD.spd.xml ${S}/../USRP_UHD.spd.xml +} + +# Install the template node +do_install_append () { + ${D}${SDRROOT}/dev/devices/rh/USRP_UHD/nodeconfig.py \ + --sdrroot="${D}${SDRROOT}" \ + --nodename="${RH_USRP_UHD_NODE_NAME}" \ + --usrptype="${RH_USRP_UHD_TYPE}" \ + --usrpip="${RH_USRP_UHD_IP}" \ + --usrpname="${RH_USRP_UHD_IP}" \ + --usrpserial="${RH_USRP_UHD_SERIAL}" \ + --inplace \ +} From 6f24fca86ceda00e771b34b475c7ef663a786db3 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:37:33 -0400 Subject: [PATCH 16/24] Switched to sysroot class so that staging is supported (in the event someone wants to call node-merge during the build. --- recipes-devices/node-deployer/node-deployer_1.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4b3b993..b0e256f 100644 --- a/recipes-devices/node-deployer/node-deployer_1.0.0.bb +++ b/recipes-devices/node-deployer/node-deployer_1.0.0.bb @@ -43,7 +43,7 @@ RH_NODE_NAME ?= "DevMgr-${MACHINE}-ALL" # Import the SDRROOT (and OSSIEHOME) locations -inherit redhawk-env +inherit redhawk-sysroot PACKAGES = "${PN}" FILES_${PN} = " \ From 0bd9cc568167129bb16a03d400de7dbbe8a76d5f Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:41:37 -0400 Subject: [PATCH 17/24] Bumped to 2.0.0 R1 for REDHAWK 2.0.6 and used common repo, dropped most patches. --- .../files/01_OSSIEHOME_prefix.patch | 41 --------- .../redhawk-dsp/files/02_Remove_Tests.patch | 83 ------------------- .../files/04_Remove_x86_DomMgr.patch | 13 --- .../05_Remove_Custom_Ossie_Check_BulkIO.patch | 13 --- .../05_Remove_Custom_Ossie_Check_GPP.patch | 13 --- .../redhawk-dsp/files/06_Fix_Idl_prefix.patch | 13 --- .../files/06_Force_Install_to_SDR.patch | 16 ---- ...ng_Files.patch => Add_Missing_Files.patch} | 0 .../redhawk-dsp/redhawk-dsp_2.0.0.bb | 16 ++-- 9 files changed, 7 insertions(+), 201 deletions(-) delete mode 100644 recipes-softpkg/redhawk-dsp/files/01_OSSIEHOME_prefix.patch delete mode 100644 recipes-softpkg/redhawk-dsp/files/02_Remove_Tests.patch delete mode 100644 recipes-softpkg/redhawk-dsp/files/04_Remove_x86_DomMgr.patch delete mode 100644 recipes-softpkg/redhawk-dsp/files/05_Remove_Custom_Ossie_Check_BulkIO.patch delete mode 100644 recipes-softpkg/redhawk-dsp/files/05_Remove_Custom_Ossie_Check_GPP.patch delete mode 100644 recipes-softpkg/redhawk-dsp/files/06_Fix_Idl_prefix.patch delete mode 100644 recipes-softpkg/redhawk-dsp/files/06_Force_Install_to_SDR.patch rename recipes-softpkg/redhawk-dsp/files/{03_Add_Missing_Files.patch => Add_Missing_Files.patch} (100%) diff --git a/recipes-softpkg/redhawk-dsp/files/01_OSSIEHOME_prefix.patch b/recipes-softpkg/redhawk-dsp/files/01_OSSIEHOME_prefix.patch deleted file mode 100644 index f9aaa5b..0000000 --- a/recipes-softpkg/redhawk-dsp/files/01_OSSIEHOME_prefix.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git src/acinclude/ossie.m4 src/acinclude/ossie.m4 -index 450c285..19fabfc 100644 ---- src/acinclude/ossie.m4 -+++ src/acinclude/ossie.m4 -@@ -38,11 +38,6 @@ AC_DEFUN([OSSIE_OSSIEHOME], - fi - ) - -- dnl Check if this is a cross, if so prepend the sysroot to the ossie home -- AS_IF([test "x$cross_compiling" = "xyes"], [ -- CROSS_SYSROOT=`$CC --print-sysroot` -- ossie_cv_ossie_home=${CROSS_SYSROOT}${ossie_cv_ossie_home} -- ]) - ]) - AC_SUBST(OSSIE_HOME, $ossie_cv_ossie_home) - ]) -@@ -66,20 +61,12 @@ else - fi - ]) - --dnl use OSSIEHOME as the default prefix unless --prefix is provided -+dnl Changed so that --prefix is ignored as the OSSIEHOME since bitbake passes in --prefix by default - AC_DEFUN([OSSIE_OSSIEHOME_AS_PREFIX], - [ -- AS_IF([test "x${prefix}" = "xNONE"], [ -- dnl Prefix wasn't provided, we need to use ossie home -- AC_REQUIRE([OSSIE_OSSIEHOME]) -- AS_IF([test "x${ossie_cv_ossie_home}" = "xNONE"], [ -- AC_MSG_ERROR([ossie root directory is not set; this is not expected]) -- ]) -- dnl Use ossie home value for prefix -- ac_default_prefix=${ossie_cv_ossie_home} -- prefix=${ossie_cv_ossie_home} -- AC_MSG_NOTICE(using ${ossie_cv_ossie_home} as installation prefix) -- ]) -+ ac_default_prefix=${ossie_cv_ossie_home} -+ prefix=${ossie_cv_ossie_home} -+ AC_MSG_NOTICE(using ${ossie_cv_ossie_home} as installation prefix) - ]) - - dnl A variant on OSSIE_SDRROOT for use *only* when OSSIE_OSSIEHOME_AS_PREFIX is being used. Priorities: diff --git a/recipes-softpkg/redhawk-dsp/files/02_Remove_Tests.patch b/recipes-softpkg/redhawk-dsp/files/02_Remove_Tests.patch deleted file mode 100644 index 25435cf..0000000 --- a/recipes-softpkg/redhawk-dsp/files/02_Remove_Tests.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git src/Makefile.am src/Makefile.am -index d5ab063..e8668a0 100644 ---- src/Makefile.am -+++ src/Makefile.am -@@ -34,7 +34,7 @@ if HAVE_JAVASUPPORT - OMNIJNI = omnijni - endif - --SUBDIRS = acinclude etc $(OMNIJNI) base control xml idl testing -+SUBDIRS = acinclude etc $(OMNIJNI) base control xml idl - - # Install makefile fragments - amdir = $(datadir)/aminclude/redhawk -@@ -43,6 +43,3 @@ am_DATA = aminclude/jarfile.am aminclude/idlj.am - pkgconfigdir = $(libdir)/pkgconfig - dist_pkgconfig_DATA = ossie.pc - --test: -- cd testing; ./runtests.py -- -diff --git src/configure.ac src/configure.ac -index 2477ed6..55206a2 100644 ---- src/configure.ac -+++ src/configure.ac -@@ -22,7 +22,7 @@ dnl Update this version number immedately after a release - AC_INIT([ossie],[1.10.1]) - #AM_INIT_AUTOMAKE(nostdinc) - # allows filenames over 99 characters long during dist --AM_INIT_AUTOMAKE([1.9 tar-pax]) -+AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects]) - dnl Update these verion numbers immedately before a release - dnl - dnl The version number is in the format "current:revision:age" -@@ -274,48 +274,7 @@ AC_CONFIG_FILES(Makefile \ - base/parser/Makefile \ - idl/Makefile \ - xml/Makefile \ -- tools/LogEventAppender/Makefile \ -- testing/Makefile \ -- testing/_unitTestHelpers/buildconfig.py \ -- testing/sdr/dev/devices/ExecutableDevice/Makefile \ -- testing/sdr/dev/devices/BasicTestDevice_cpp/BasicTestDevice_cpp_impl1/Makefile \ -- testing/sdr/dev/devices/BasicTestDevice_java/java/Makefile \ -- testing/sdr/dev/devices/CppTestDevice/cpp/Makefile \ -- testing/sdr/dev/devices/BasicDevWithExecParam_cpp/BasicDevWithExecParam_cpp_impl1/Makefile \ -- testing/sdr/dev/devices/JavaTestDevice/java/Makefile \ -- testing/sdr/dev/devices/SimpleDevice/SimpleDevice_cpp_impl1/Makefile \ -- testing/sdr/dev/devices/props_test_device/props_test_device_cpp_impl1/Makefile \ -- testing/sdr/dev/devices/issue_111_cpp/cpp/Makefile \ -- testing/sdr/dev/devices/issue_111_java/java/Makefile \ -- testing/sdr/dev/devices/PersonaDevice/cpp/Makefile \ -- testing/sdr/dev/devices/ProgrammableDevice/cpp/Makefile \ -- testing/sdr/dev/services/BasicService_java/java/Makefile \ -- testing/sdr/dom/components/CppCallbacks/cpp/Makefile \ -- testing/sdr/dom/components/TestCppProps/Makefile \ -- testing/sdr/dom/components/TestJavaProps/Makefile \ -- testing/sdr/dom/components/TestLegacyJavaProps/Makefile \ -- testing/sdr/dom/components/TestJavaPropsRange/java/Makefile \ -- testing/sdr/dom/components/linkedLibraryTest/Makefile \ -- testing/sdr/dom/components/TestCppsoftpkgDeps/Makefile \ -- testing/sdr/dom/components/javaDep/javaDep/Makefile \ -- testing/sdr/dom/components/HardLimit/HardLimit_java_impl1/Makefile \ -- testing/sdr/dom/components/SimpleComponent/SimpleComponent_cpp_impl1/Makefile \ -- testing/sdr/dom/components/BasicAC/basicac_java_impl1/Makefile \ -- testing/sdr/dom/components/BasicAC/BasicAC_cpp_impl1/Makefile \ -- testing/sdr/dom/components/MessageReceiverCpp/Makefile \ -- testing/sdr/dom/components/MessageSenderCpp/Makefile \ -- testing/sdr/dom/components/EventSend/EventSend_java_impl1/Makefile \ -- testing/sdr/dom/components/EventReceive/EventReceive_java_impl1/Makefile \ -- testing/sdr/dom/components/PropertyChangeEventsCpp/Makefile \ -- testing/sdr/dom/components/PropertyChangeEventsJava/PropertyChangeEventsJava_java_impl1/Makefile \ -- testing/sdr/dom/components/ticket2093/cpp/Makefile \ -- testing/sdr/dom/components/TestComplexProps/cpp/Makefile \ -- testing/sdr/dom/components/TestComplexProps/java/Makefile \ -- testing/sdr/dom/components/TestCppPropsRange/cpp/Makefile \ -- testing/sdr/dom/components/TestAllPropTypes/cpp/Makefile \ -- testing/sdr/dom/components/TestAllPropTypes/java/Makefile \ -- testing/sdr/dom/components/TestLoggingAPI/cpp/Makefile \ -- testing/sdr/dom/components/TestLoggingAPI/java/Makefile ) -+ tools/LogEventAppender/Makefile ) - - AC_OUTPUT - diff --git a/recipes-softpkg/redhawk-dsp/files/04_Remove_x86_DomMgr.patch b/recipes-softpkg/redhawk-dsp/files/04_Remove_x86_DomMgr.patch deleted file mode 100644 index 9a51dca..0000000 --- a/recipes-softpkg/redhawk-dsp/files/04_Remove_x86_DomMgr.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git src/control/sdr/dommgr/DomainManager.spd.xml src/control/sdr/dommgr/DomainManager.spd.xml -index 1e87193..cea8d85 100644 ---- src/control/sdr/dommgr/DomainManager.spd.xml -+++ src/control/sdr/dommgr/DomainManager.spd.xml -@@ -36,8 +36,6 @@ with this program. If not, see http://www.gnu.org/licenses/. - - /mgr/DomainManager - -- -- - - - diff --git a/recipes-softpkg/redhawk-dsp/files/05_Remove_Custom_Ossie_Check_BulkIO.patch b/recipes-softpkg/redhawk-dsp/files/05_Remove_Custom_Ossie_Check_BulkIO.patch deleted file mode 100644 index 10f69b5..0000000 --- a/recipes-softpkg/redhawk-dsp/files/05_Remove_Custom_Ossie_Check_BulkIO.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git configure.ac configure.ac -index 5135790..3807b2f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,7 @@ AC_PROG_LIBTOOL - - AM_PATH_PYTHON([2.3]) - --OSSIE_CHECK_OSSIE -+PKG_CHECK_MODULES([ossie], [ossie >= 1.10.0]) - OSSIE_OSSIEHOME_AS_PREFIX - OSSIE_PYTHON_INSTALL_SCHEME - diff --git a/recipes-softpkg/redhawk-dsp/files/05_Remove_Custom_Ossie_Check_GPP.patch b/recipes-softpkg/redhawk-dsp/files/05_Remove_Custom_Ossie_Check_GPP.patch deleted file mode 100644 index c7dd06f..0000000 --- a/recipes-softpkg/redhawk-dsp/files/05_Remove_Custom_Ossie_Check_GPP.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git python/configure.ac python/configure.ac -index 1fc8ab2..040ce5b 100644 ---- python/configure.ac -+++ python/configure.ac -@@ -25,7 +25,7 @@ AM_INIT_AUTOMAKE(nostdinc) - AC_PROG_INSTALL - - AC_CORBA_ORB --OSSIE_CHECK_OSSIE -+PKG_CHECK_MODULES([ossie], [ossie >= 1.10.0]) - OSSIE_SDRROOT_AS_PREFIX - AM_PATH_PYTHON([2.3]) - diff --git a/recipes-softpkg/redhawk-dsp/files/06_Fix_Idl_prefix.patch b/recipes-softpkg/redhawk-dsp/files/06_Fix_Idl_prefix.patch deleted file mode 100644 index 09fcf7c..0000000 --- a/recipes-softpkg/redhawk-dsp/files/06_Fix_Idl_prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git src/ossie.pc.in src/ossie.pc.in -index 86a4a40..f778a1d 100644 ---- src/ossie.pc.in -+++ src/ossie.pc.in -@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=${prefix}/include - extraincludedir=${prefix}/include/ossie --idldir=${prefix}/share/idl -+idldir=${exec_prefix}/share/idl - javadir=@javadir@ - classpath=${javadir}/ossie.jar:${javadir}/CFInterfaces.jar:${javadir}/log4j-1.2.15.jar:${javadir}/apache-commons-lang-2.4.jar - diff --git a/recipes-softpkg/redhawk-dsp/files/06_Force_Install_to_SDR.patch b/recipes-softpkg/redhawk-dsp/files/06_Force_Install_to_SDR.patch deleted file mode 100644 index 85243ed..0000000 --- a/recipes-softpkg/redhawk-dsp/files/06_Force_Install_to_SDR.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git python/Makefile.am python/Makefile.am -index 8266a77..35383d0 100644 ---- python/Makefile.am -+++ python/Makefile.am -@@ -20,9 +20,9 @@ - - # vim: noet: softtabstop=0 - --xmldir = $(prefix)/dev/devices/GPP/ -+xmldir = $(SDR_ROOT)/dev/devices/GPP/ - dist_xml_DATA = ../GPP.prf.xml ../GPP.scd.xml ../GPP.spd.xml --devdir = $(prefix)/dev/devices/GPP/python/ -+devdir = $(SDR_ROOT)/dev/devices/GPP/python/ - - distclean-local: - rm -f config.* diff --git a/recipes-softpkg/redhawk-dsp/files/03_Add_Missing_Files.patch b/recipes-softpkg/redhawk-dsp/files/Add_Missing_Files.patch similarity index 100% rename from recipes-softpkg/redhawk-dsp/files/03_Add_Missing_Files.patch rename to recipes-softpkg/redhawk-dsp/files/Add_Missing_Files.patch diff --git a/recipes-softpkg/redhawk-dsp/redhawk-dsp_2.0.0.bb b/recipes-softpkg/redhawk-dsp/redhawk-dsp_2.0.0.bb index 96e1b86..4f05ff0 100644 --- a/recipes-softpkg/redhawk-dsp/redhawk-dsp_2.0.0.bb +++ b/recipes-softpkg/redhawk-dsp/redhawk-dsp_2.0.0.bb @@ -1,20 +1,18 @@ DESCRIPTION = "REDHAWK Core Framework GPP" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +include recipes-core/include/redhawk-repo.inc DEPENDS = "redhawk-bulkio" RDEPENDS_${PN} = "redhawk-bulkio" +PREFERRED_VERSION_redhawk-bulkio = "2.0.6" -SRC_URI = " \ - git://github.com/RedhawkSDR/dsp.git;tag=2.0.0;protocol=git \ - file://03_Add_Missing_Files.patch \ +SRC_URI_append = " \ + file://Add_Missing_Files.patch \ " -SRCREV = "2b3dfb93b5f836e66768f582312e4266cae52cd6" - -S = "${WORKDIR}/git/cpp" +PR = "r1" +S = "${WORKDIR}/git/redhawk-sharedlibs/dsp/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. From 8fb0137207a27a41c49dfa145f2cd6abc9ea331f Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:44:35 -0400 Subject: [PATCH 18/24] Modified class defs to use sysroot to aid staging for follow-on recipes, and added @rodrigo455's fix for softpkg dependencies (fixes #7) Thanks! --- classes/redhawk-component.bbclass | 6 +++++- classes/redhawk-device.bbclass | 2 +- classes/redhawk-entity.bbclass | 3 ++- classes/redhawk-env.bbclass | 2 +- classes/redhawk-oeconf.bbclass | 5 ++++- classes/redhawk-waveform.bbclass | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/classes/redhawk-component.bbclass b/classes/redhawk-component.bbclass index dd95bdb..b5d7668 100644 --- a/classes/redhawk-component.bbclass +++ b/classes/redhawk-component.bbclass @@ -2,5 +2,9 @@ # 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 pythonnative redhawk-entity redhawk-sysroot +inherit autotools-brokensep pkgconfig pythonnative redhawk-entity +# To support softpkg dependencies +CACHED_CONFIGUREVARS += "\ + ossie_cv_sdr_root=${SDRROOT_STAGED} \ + " diff --git a/classes/redhawk-device.bbclass b/classes/redhawk-device.bbclass index dd95bdb..801420d 100644 --- a/classes/redhawk-device.bbclass +++ b/classes/redhawk-device.bbclass @@ -2,5 +2,5 @@ # 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 pythonnative redhawk-entity redhawk-sysroot +inherit autotools-brokensep pkgconfig pythonnative redhawk-entity diff --git a/classes/redhawk-entity.bbclass b/classes/redhawk-entity.bbclass index bd8c82d..8d9daf3 100644 --- a/classes/redhawk-entity.bbclass +++ b/classes/redhawk-entity.bbclass @@ -1,5 +1,5 @@ # This file sets OSSIEHOME and other environment variables used by autotools -inherit redhawk-oeconf +inherit redhawk-oeconf redhawk-sysroot # 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() { @@ -8,6 +8,7 @@ do_configure_prepend() { 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} } # Needed so that when the python distutils is run it can get the system prefix. diff --git a/classes/redhawk-env.bbclass b/classes/redhawk-env.bbclass index e71dd85..547ef0b 100644 --- a/classes/redhawk-env.bbclass +++ b/classes/redhawk-env.bbclass @@ -2,7 +2,7 @@ OSSIEHOME = "${prefix}/local/redhawk-sdr/core" SDRROOT = "${prefix}/local/redhawk-sdr/sdr" -# STAGED Versions of thse variables (where machine-specific versions are temporarily held, +# STAGED Versions of these variables (where machine-specific versions are temporarily held, # libs, etc.) OSSIEHOME_STAGED="${STAGING_DIR}/${MACHINE}${OSSIEHOME}" SDRROOT_STAGED="${STAGING_DIR}/${MACHINE}${SDRROOT}" diff --git a/classes/redhawk-oeconf.bbclass b/classes/redhawk-oeconf.bbclass index c678173..c8c71e0 100644 --- a/classes/redhawk-oeconf.bbclass +++ b/classes/redhawk-oeconf.bbclass @@ -1,6 +1,9 @@ inherit redhawk-env -CACHED_CONFIGUREVARS += "ossie_cv_ossie_home=${OSSIEHOME} ac_cv_pymod_ossie=yes" +CACHED_CONFIGUREVARS += "\ + ossie_cv_ossie_home=${OSSIEHOME} \ + ac_cv_pymod_ossie=yes \ + " EXTRA_OECONF += "\ --with-ossie=${OSSIEHOME} \ diff --git a/classes/redhawk-waveform.bbclass b/classes/redhawk-waveform.bbclass index 9bf05ee..16edb2a 100644 --- a/classes/redhawk-waveform.bbclass +++ b/classes/redhawk-waveform.bbclass @@ -1,5 +1,5 @@ -inherit redhawk-env +inherit redhawk-sysroot FILES_${PN} += "${SDRROOT}/dom/waveforms/*" From ea4a04668bde6f780663ef4a6fc0adf6ee1e8c60 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:46:45 -0400 Subject: [PATCH 19/24] Bumped to version in REDHAWK 2.0.6 with common repo. Removed arch packages in lieu of supporting PACKAGE_ARCH as a way to designate the architecture type of the target system. --- .../files/Remove_x86_DomMgr.patch | 13 -- .../files/arm_based_device_manager.patch | 21 --- .../gcc_fix_ApplicationFactory_impl.patch | 15 -- .../redhawk-core/files/package_arch.patch | 147 ++++++++++++++++++ recipes-redhawk/redhawk-core/redhawk-core.inc | 138 ---------------- .../redhawk-core/redhawk-core_2.0.1.bb | 9 -- .../redhawk-core/redhawk-core_2.0.3.bb | 9 -- .../redhawk-core/redhawk-core_2.0.4.bb | 11 -- .../redhawk-core/redhawk-core_2.0.5.bb | 11 -- .../redhawk-core/redhawk-core_2.0.6.bb | 136 +++++++++++++++- 10 files changed, 279 insertions(+), 231 deletions(-) delete mode 100644 recipes-redhawk/redhawk-core/files/Remove_x86_DomMgr.patch delete mode 100644 recipes-redhawk/redhawk-core/files/arm_based_device_manager.patch delete mode 100644 recipes-redhawk/redhawk-core/files/gcc_fix_ApplicationFactory_impl.patch create mode 100644 recipes-redhawk/redhawk-core/files/package_arch.patch delete mode 100644 recipes-redhawk/redhawk-core/redhawk-core.inc delete mode 100644 recipes-redhawk/redhawk-core/redhawk-core_2.0.1.bb delete mode 100644 recipes-redhawk/redhawk-core/redhawk-core_2.0.3.bb delete mode 100644 recipes-redhawk/redhawk-core/redhawk-core_2.0.4.bb delete mode 100644 recipes-redhawk/redhawk-core/redhawk-core_2.0.5.bb diff --git a/recipes-redhawk/redhawk-core/files/Remove_x86_DomMgr.patch b/recipes-redhawk/redhawk-core/files/Remove_x86_DomMgr.patch deleted file mode 100644 index 9a51dca..0000000 --- a/recipes-redhawk/redhawk-core/files/Remove_x86_DomMgr.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git src/control/sdr/dommgr/DomainManager.spd.xml src/control/sdr/dommgr/DomainManager.spd.xml -index 1e87193..cea8d85 100644 ---- src/control/sdr/dommgr/DomainManager.spd.xml -+++ src/control/sdr/dommgr/DomainManager.spd.xml -@@ -36,8 +36,6 @@ with this program. If not, see http://www.gnu.org/licenses/. - - /mgr/DomainManager - -- -- - - - diff --git a/recipes-redhawk/redhawk-core/files/arm_based_device_manager.patch b/recipes-redhawk/redhawk-core/files/arm_based_device_manager.patch deleted file mode 100644 index c022311..0000000 --- a/recipes-redhawk/redhawk-core/files/arm_based_device_manager.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git src/control/sdr/devmgr/DeviceManager.spd.xml src/control/sdr/devmgr/DeviceManager.spd.xml -index c5f1b76..e6d8f84 100644 ---- src/control/sdr/devmgr/DeviceManager.spd.xml -+++ src/control/sdr/devmgr/DeviceManager.spd.xml -@@ -54,4 +54,16 @@ with this program. If not, see http://www.gnu.org/licenses/. - - - -+ -+ armv7l Implementation of a Device Manager -+ -+ -+ -+ -+ -+ DeviceManager -+ -+ -+ -+ - diff --git a/recipes-redhawk/redhawk-core/files/gcc_fix_ApplicationFactory_impl.patch b/recipes-redhawk/redhawk-core/files/gcc_fix_ApplicationFactory_impl.patch deleted file mode 100644 index a3bae58..0000000 --- a/recipes-redhawk/redhawk-core/files/gcc_fix_ApplicationFactory_impl.patch +++ /dev/null @@ -1,15 +0,0 @@ -# Patch provided from http://stackoverflow.com/questions/38571741 -# user bhilburn -diff --git src-a/control/sdr/dommgr/ApplicationFactory_impl.cpp src-b/control/sdr/dommgr/ApplicationFactory_impl.cpp -index d370519..92699e0 100644 ---- src-a/control/sdr/dommgr/ApplicationFactory_impl.cpp -+++ src-b/control/sdr/dommgr/ApplicationFactory_impl.cpp -@@ -194,7 +194,7 @@ void ApplicationFactory_impl::ValidateSPD(CF::FileManager_ptr fileMgr, - const bool require_prf, - const bool require_scd) { - SoftPkg pkg; -- ValidateSPD(fileMgr, pkg, false, false ); -+ ValidateSPD(fileMgr, pkg, sfw_profile, require_prf, require_scd); - } - - void ApplicationFactory_impl::ValidateSPD(CF::FileManager_ptr fileMgr, diff --git a/recipes-redhawk/redhawk-core/files/package_arch.patch b/recipes-redhawk/redhawk-core/files/package_arch.patch new file mode 100644 index 0000000..6b08e87 --- /dev/null +++ b/recipes-redhawk/redhawk-core/files/package_arch.patch @@ -0,0 +1,147 @@ +diff -Nuar src/control/sdr/devmgr/DeviceManager.Linux.armv7l.prf.xml src/control/sdr/devmgr/DeviceManager.Linux.armv7l.prf.xml +--- src/control/sdr/devmgr/DeviceManager.Linux.armv7l.prf.xml 2017-07-18 10:11:02.381201718 -0400 ++++ src/control/sdr/devmgr/DeviceManager.Linux.armv7l.prf.xml 1969-12-31 19:00:00.000000000 -0500 +@@ -1,47 +0,0 @@ +- +- +- +- +- +- +- +- +- SCA required property describing the Operating System +- +- Linux +- +- +- +- +- +- SCA required property describing the CPU type +- +- armv7l +- +- +- +- +diff -Nuar src/control/sdr/devmgr/DeviceManager.Linux.embedded.prf.xml src/control/sdr/devmgr/DeviceManager.Linux.embedded.prf.xml +--- src/control/sdr/devmgr/DeviceManager.Linux.embedded.prf.xml 1969-12-31 19:00:00.000000000 -0500 ++++ src/control/sdr/devmgr/DeviceManager.Linux.embedded.prf.xml 2017-07-18 10:13:05.031852986 -0400 +@@ -0,0 +1,47 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ SCA required property describing the Operating System ++ ++ Linux ++ ++ ++ ++ ++ ++ SCA required property describing the CPU type ++ ++ BB_PACKAGE_ARCH ++ ++ ++ ++ +diff -Nuar src/control/sdr/devmgr/DeviceManager.spd.xml src/control/sdr/devmgr/DeviceManager.spd.xml +--- src/control/sdr/devmgr/DeviceManager.spd.xml 2017-07-18 10:11:02.381201718 -0400 ++++ src/control/sdr/devmgr/DeviceManager.spd.xml 2017-07-18 10:19:36.184929989 -0400 +@@ -54,4 +54,16 @@ + + + ++ ++ BB_PACKAGE_ARCH Implementation of a Device Manager ++ ++ ++ ++ ++ ++ DeviceManager ++ ++ ++ ++ + +diff -Nuar src/control/sdr/devmgr/Makefile.am src/control/sdr/devmgr/Makefile.am +--- src/control/sdr/devmgr/Makefile.am 2017-07-18 10:11:02.382201723 -0400 ++++ src/control/sdr/devmgr/Makefile.am 2017-07-18 10:20:36.497250386 -0400 +@@ -19,7 +19,7 @@ + # + + devmgrdir = $(SDR_ROOT)/dev/mgr +-dist_devmgr_DATA = DeviceManager.spd.xml DeviceManager.scd.xml DeviceManager.prf.xml DeviceManager.Linux.x86.prf.xml DeviceManager.Linux.x86_64.prf.xml DeviceManager.Linux.armv7l.prf.xml ++dist_devmgr_DATA = DeviceManager.spd.xml DeviceManager.scd.xml DeviceManager.prf.xml DeviceManager.Linux.x86.prf.xml DeviceManager.Linux.x86_64.prf.xml DeviceManager.Linux.embedded.prf.xml + devmgr_PROGRAMS = DeviceManager + + DeviceManager_SOURCES = main.cpp spdSupport.cpp DeviceManager_impl.cpp +diff -Nuar src/control/sdr/dommgr/DomainManager.spd.xml src/control/sdr/dommgr/DomainManager.spd.xml +--- src/control/sdr/dommgr/DomainManager.spd.xml 2017-07-18 10:11:02.385201739 -0400 ++++ src/control/sdr/dommgr/DomainManager.spd.xml 2017-07-18 10:21:20.971488349 -0400 +@@ -36,8 +36,7 @@ + + /mgr/DomainManager + +- +- ++ + + + diff --git a/recipes-redhawk/redhawk-core/redhawk-core.inc b/recipes-redhawk/redhawk-core/redhawk-core.inc deleted file mode 100644 index 6aa6a3d..0000000 --- a/recipes-redhawk/redhawk-core/redhawk-core.inc +++ /dev/null @@ -1,138 +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 Core Framework" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -# 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 pythonnative redhawk-sysroot redhawk-oeconf - -DEPENDS = "omniorbpy omniorbpy-native 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" - -# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -SRCTAG ?= "" -SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" - -SRC_URI ?= "git://github.com/redhawksdr/framework-core.git;${SRCTAGARG};protocol=git" - -SRC_URI_append = "\ - file://OSSIEHOME_global_prefix.patch \ - file://Remove_Tests.patch \ - file://Add_Missing_Files.patch \ - file://Remove_x86_DomMgr.patch \ - file://Fix_Idl_prefix.patch \ - file://arm_based_device_manager.patch \ - file://remove_csh_scripts.patch \ - file://allow_idl_dir_set.patch \ - file://gcc_fix_nodebooter.patch \ - file://gcc_fix_applicationSupport.patch \ -" - -S ?= "${WORKDIR}/git/src" - -EXTRA_OECONF += "\ - --with-sdr=${SDRROOT} \ - --disable-java \ - --with-expat=${STAGING_DIR_TARGET}/usr \ - idldir=${STAGING_DIR_TARGET}/usr/share/idl/omniORB \ - OMNICOS_IDLDIR=${STAGING_DIR_TARGET}/usr/share/idl/omniORB/COS \ - --with-boost-regex=boost_regex \ - --disable-log4cxx \ - " - -CXXFLAGS += "-fpermissive" - -PACKAGES += "${PN}-python" -PROVIDES += "${PN}-python" - - -FILES_${PN}-dbg += " \ - ${SDRROOT}/dev/mgr/.debug \ - ${SDRROOT}/dom/mgr/.debug \ - ${OSSIEHOME}/lib/.debug \ - ${OSSIEHOME}/bin/.debug \ -" - -FILES_${PN}-python += " \ - ${OSSIEHOME}/lib/python \ - ${OSSIEHOME}/bin/sdrlint \ - ${OSSIEHOME}/bin/prf2py.py \ - ${OSSIEHOME}/bin/cleanns \ - ${OSSIEHOME}/bin/redhawk-softpkg \ - ${OSSIEHOME}/bin/rh_net_diag \ - ${OSSIEHOME}/bin/rhlauncher \ - ${OSSIEHOME}/bin/nodeCleanup.py \ - ${OSSIEHOME}/bin/cleanomni \ - ${OSSIEHOME}/bin/scaclt \ - ${OSSIEHOME}/bin/qtbrowse \ - ${OSSIEHOME}/bin/py2prf \ - ${OSSIEHOME}/bin/eventviewer \ - ${OSSIEHOME}/bin/cleanes \ -" - -FILES_${PN} += " \ - ${OSSIEHOME}/lib/lib*.so.* \ - ${OSSIEHOME}/bin/nodeBooter \ - /etc/* \ - ${SDRROOT}/* \ -" - -FILES_${PN}-staticdev += " \ - ${OSSIEHOME}/lib/lib*.a \ - ${OSSIEHOME}/lib/lib*.la \ -" - -FILES_${PN}-dev += " \ - ${OSSIEHOME}/lib/lib*.so \ - ${OSSIEHOME}/share \ - ${OSSIEHOME}/include \ - ${OSSIEHOME}/lib/pkgconfig \ -" - -INSANE_SKIP_${PN} += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" - -# 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} -} - -# Because we're using non-standard locations, we have to describe our locations -# to autotools -# Get the things from /etc (sysconfdir) -redhawk_core_etc_sysroot () { - sysroot_stage_dir ${D}${sysconfdir}/bash_completion.d \ - ${SYSROOT_DESTDIR}${sysconfdir}/bash_completion.d - sysroot_stage_dir ${D}${sysconfdir}/ld.so.conf.d \ - ${SYSROOT_DESTDIR}${sysconfdir}/ld.so.conf.d - sysroot_stage_dir ${D}${sysconfdir}/profile.d \ - ${SYSROOT_DESTDIR}${sysconfdir}/profile.d -} - -SYSROOT_PREPROCESS_FUNCS += "redhawk_core_etc_sysroot" - diff --git a/recipes-redhawk/redhawk-core/redhawk-core_2.0.1.bb b/recipes-redhawk/redhawk-core/redhawk-core_2.0.1.bb deleted file mode 100644 index 6fe329a..0000000 --- a/recipes-redhawk/redhawk-core/redhawk-core_2.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SRCTAG = "2.0.1" -PREFERRED_VERSION_omniorb = "4.1.6" - -SRC_URI_append = "\ - file://gcc_fix_ApplicationFactory_impl.patch \ -" - -include redhawk-core.inc - diff --git a/recipes-redhawk/redhawk-core/redhawk-core_2.0.3.bb b/recipes-redhawk/redhawk-core/redhawk-core_2.0.3.bb deleted file mode 100644 index 8057b83..0000000 --- a/recipes-redhawk/redhawk-core/redhawk-core_2.0.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -SRCTAG = "2.0.3" -PREFERRED_VERSION_omniorb = "4.1.6" - -SRC_URI_append = "\ - file://gcc_fix_ApplicationFactory_impl.patch \ -" - -include redhawk-core.inc - diff --git a/recipes-redhawk/redhawk-core/redhawk-core_2.0.4.bb b/recipes-redhawk/redhawk-core/redhawk-core_2.0.4.bb deleted file mode 100644 index 66100d7..0000000 --- a/recipes-redhawk/redhawk-core/redhawk-core_2.0.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/redhawk/src" - -PREFERRED_VERSION_omniorb = "4.2.0" - -include redhawk-core.inc - - diff --git a/recipes-redhawk/redhawk-core/redhawk-core_2.0.5.bb b/recipes-redhawk/redhawk-core/redhawk-core_2.0.5.bb deleted file mode 100644 index 27dbcb3..0000000 --- a/recipes-redhawk/redhawk-core/redhawk-core_2.0.5.bb +++ /dev/null @@ -1,11 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.5;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/redhawk/src" - -PREFERRED_VERSION_omniorb = "4.2.0" - -include redhawk-core.inc - - diff --git a/recipes-redhawk/redhawk-core/redhawk-core_2.0.6.bb b/recipes-redhawk/redhawk-core/redhawk-core_2.0.6.bb index 65449b1..aae767e 100644 --- a/recipes-redhawk/redhawk-core/redhawk-core_2.0.6.bb +++ b/recipes-redhawk/redhawk-core/redhawk-core_2.0.6.bb @@ -1,9 +1,137 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" +# +# 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/. +# -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" +DESCRIPTION = "REDHAWK Core Framework" -S = "${WORKDIR}/git/redhawk/src" +include recipes-core/include/redhawk-repo.inc + +PR = "r2" + +DEPENDS = "omniorbpy omniorbpy-native 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" + +PACKAGES += "${PN}-python" +PROVIDES += "${PN}-python" PREFERRED_VERSION_omniorb = "4.2.0" -include redhawk-core.inc +SRC_URI_append = "\ + file://Add_Missing_Files.patch \ + file://package_arch.patch \ + file://Fix_Idl_prefix.patch \ + file://OSSIEHOME_global_prefix.patch \ + file://Remove_Tests.patch \ + file://allow_idl_dir_set.patch \ + file://gcc_fix_applicationSupport.patch \ + file://gcc_fix_nodebooter.patch \ + file://remove_csh_scripts.patch \ +" + +S = "${WORKDIR}/git/redhawk-core-framework/redhawk/src" + +# 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 pythonnative redhawk-oeconf redhawk-sysroot + +EXTRA_OECONF += "\ + --with-sdr=${SDRROOT} \ + --disable-java \ + --with-expat=${STAGING_DIR_TARGET}/usr \ + idldir=${STAGING_DIR_TARGET}/usr/share/idl/omniORB \ + OMNICOS_IDLDIR=${STAGING_DIR_TARGET}/usr/share/idl/omniORB/COS \ + --with-boost-regex=boost_regex \ + --disable-log4cxx \ + " + +CXXFLAGS += "-fpermissive" + +FILES_${PN}-dbg += " \ + ${SDRROOT}/dev/mgr/.debug \ + ${SDRROOT}/dom/mgr/.debug \ + ${OSSIEHOME}/lib/.debug \ + ${OSSIEHOME}/bin/.debug \ +" + +FILES_${PN}-python += " \ + ${OSSIEHOME}/lib/python \ + ${OSSIEHOME}/bin/sdrlint \ + ${OSSIEHOME}/bin/prf2py.py \ + ${OSSIEHOME}/bin/cleanns \ + ${OSSIEHOME}/bin/redhawk-softpkg \ + ${OSSIEHOME}/bin/rh_net_diag \ + ${OSSIEHOME}/bin/rhlauncher \ + ${OSSIEHOME}/bin/nodeCleanup.py \ + ${OSSIEHOME}/bin/cleanomni \ + ${OSSIEHOME}/bin/scaclt \ + ${OSSIEHOME}/bin/qtbrowse \ + ${OSSIEHOME}/bin/py2prf \ + ${OSSIEHOME}/bin/eventviewer \ + ${OSSIEHOME}/bin/cleanes \ +" + +FILES_${PN} += " \ + ${OSSIEHOME}/lib/lib*.so.* \ + ${OSSIEHOME}/bin/nodeBooter \ + /etc/* \ + ${SDRROOT}/* \ +" + +FILES_${PN}-staticdev += " \ + ${OSSIEHOME}/lib/lib*.a \ + ${OSSIEHOME}/lib/lib*.la \ +" + +FILES_${PN}-dev += " \ + ${OSSIEHOME}/lib/lib*.so \ + ${OSSIEHOME}/share \ + ${OSSIEHOME}/include \ + ${OSSIEHOME}/lib/pkgconfig \ +" + +INSANE_SKIP_${PN} += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" + +do_package_arch_patch () { + find ${S} -type f -exec sed -i "s/BB_PACKAGE_ARCH/${PACKAGE_ARCH}/g" {} \; +} +addtask package_arch_patch after do_patch before do_configure + +# 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} +} + +# Because we're using non-standard locations, we have to describe our locations +# to autotools +# Get the things from /etc (sysconfdir) +redhawk_core_etc_sysroot () { + sysroot_stage_dir ${D}${sysconfdir}/bash_completion.d \ + ${SYSROOT_DESTDIR}${sysconfdir}/bash_completion.d + sysroot_stage_dir ${D}${sysconfdir}/ld.so.conf.d \ + ${SYSROOT_DESTDIR}${sysconfdir}/ld.so.conf.d + sysroot_stage_dir ${D}${sysconfdir}/profile.d \ + ${SYSROOT_DESTDIR}${sysconfdir}/profile.d +} + +SYSROOT_PREPROCESS_FUNCS += "redhawk_core_etc_sysroot" From 5abd03c444ba078551e519a25a626c9b35946df9 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:47:42 -0400 Subject: [PATCH 20/24] Removed previous versions, added support for REDHAWK 2.0.6 and common repo. --- .../redhawk-bulkio/redhawk-bulkio.inc | 103 ------------------ .../redhawk-bulkio/redhawk-bulkio_2.0.1.bb | 5 - .../redhawk-bulkio/redhawk-bulkio_2.0.2.bb | 6 - .../redhawk-bulkio/redhawk-bulkio_2.0.4.bb | 12 -- .../redhawk-bulkio/redhawk-bulkio_2.0.5.bb | 12 -- .../redhawk-bulkio/redhawk-bulkio_2.0.6.bb | 97 ++++++++++++++++- 6 files changed, 92 insertions(+), 143 deletions(-) delete mode 100644 recipes-redhawk/redhawk-bulkio/redhawk-bulkio.inc delete mode 100644 recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.1.bb delete mode 100644 recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.2.bb delete mode 100644 recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.4.bb delete mode 100644 recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.5.bb diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio.inc b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio.inc deleted file mode 100644 index d3b8c5e..0000000 --- a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio.inc +++ /dev/null @@ -1,103 +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 Framework BulkIO Interfaces" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -DEPENDS = "redhawk-core" -RDEPENDS_${PN} = "redhawk-core" -RDEPENDS_${PN}-python = "redhawk-core-python" - -PACKAGES += "${PN}-python" -PROVIDES += "${PN}-python" - -# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -SRCTAG ?= "" -SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" - -SRC_URI ?= "git://github.com/RedhawkSDR/framework-bulkioInterfaces.git;${SRCTAGARG};protocol=git" - -SRC_URI_append = "\ - file://subdir_objects.patch \ - file://Add_Missing_Files.patch \ -" - -S ?= "${WORKDIR}/git" - -# 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 pythonnative redhawk-sysroot redhawk-oeconf - -FILES_${PN}-python += " \ - ${OSSIEHOME}/lib/python \ -" - -FILES_${PN} += " \ - ${OSSIEHOME}/lib/lib*.so.* \ -" - -FILES_${PN}-dbg += " \ - ${OSSIEHOME}/lib/.debug \ -" - -FILES_${PN}-dev += " \ - ${OSSIEHOME}/lib/lib*.so \ - ${OSSIEHOME}/include \ - ${OSSIEHOME}/share/* \ - ${OSSIEHOME}/lib/pkgconfig \ -" - -FILES_${PN}-staticdev += " \ - ${OSSIEHOME}/lib/*.a \ - ${OSSIEHOME}/lib/lib*.la \ -" - -INSANE_SKIP_${PN} += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" - -EXTRA_OECONF += "\ - --disable-java \ - --disable-log4cxx \ - --with-boost-system=boost_system \ - " - -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" - -CXXFLAGS += "-fpermissive" - -# 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}" -} - -# 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} -} - diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.1.bb b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.1.bb deleted file mode 100644 index bfb3171..0000000 --- a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -SRCTAG = "2.0.1" -PREFERRED_VERSION_redhawk-core = "2.0.1" - -include redhawk-bulkio.inc - diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.2.bb b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.2.bb deleted file mode 100644 index 8fa0a94..0000000 --- a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRCTAG = "2.0.2" -PREFERRED_VERSION_redhawk-core = "2.0.2" -INSANE_SKIP_${PN}-dbg += "libdir" - -include redhawk-bulkio.inc - diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.4.bb b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.4.bb deleted file mode 100644 index 8a07c20..0000000 --- a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/bulkioInterfaces" - -PREFERRED_VERSION_redhawk-core = "2.0.4" - -INSANE_SKIP_${PN}-dbg += "libdir" - -include redhawk-bulkio.inc - diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.5.bb b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.5.bb deleted file mode 100644 index 5f4ec97..0000000 --- a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.5;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/bulkioInterfaces" - -PREFERRED_VERSION_redhawk-core = "2.0.5" - -INSANE_SKIP_${PN}-dbg += "libdir" - -include redhawk-bulkio.inc - diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.6.bb b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.6.bb index fa78741..eda8d15 100644 --- a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.6.bb +++ b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.6.bb @@ -1,12 +1,99 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" +# +# 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/. +# -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" +DESCRIPTION = "REDHAWK Framework BulkIO Interfaces" -S = "${WORKDIR}/git/bulkioInterfaces" +include recipes-core/include/redhawk-repo.inc -PREFERRED_VERSION_redhawk-core = "2.0.6" +PR = "r2" +DEPENDS = "redhawk-core" +RDEPENDS_${PN} = "redhawk-core" +RDEPENDS_${PN}-python = "redhawk-core-python" +PREFERRED_VERSION_redhawk-core = "${REDHAWK_VERSION}" + +PACKAGES += "${PN}-python" +PROVIDES += "${PN}-python" + +SRC_URI_append = "\ + file://subdir_objects.patch \ + file://Add_Missing_Files.patch \ +" + +S = "${WORKDIR}/git/redhawk-core-framework/bulkioInterfaces" + +# 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 pythonnative redhawk-oeconf redhawk-sysroot + +FILES_${PN}-python += " \ + ${OSSIEHOME}/lib/python \ +" + +FILES_${PN} += " \ + ${OSSIEHOME}/lib/lib*.so.* \ +" + +FILES_${PN}-dbg += " \ + ${OSSIEHOME}/lib/.debug \ +" + +FILES_${PN}-dev += " \ + ${OSSIEHOME}/lib/lib*.so \ + ${OSSIEHOME}/include \ + ${OSSIEHOME}/share/* \ + ${OSSIEHOME}/lib/pkgconfig \ +" + +FILES_${PN}-staticdev += " \ + ${OSSIEHOME}/lib/*.a \ + ${OSSIEHOME}/lib/lib*.la \ +" + +INSANE_SKIP_${PN} += "libdir" INSANE_SKIP_${PN}-dbg += "libdir" -include redhawk-bulkio.inc +EXTRA_OECONF += "\ + --disable-java \ + --disable-log4cxx \ + --with-boost-system=boost_system \ + " + +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" + +CXXFLAGS += "-fpermissive" + +# 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}" +} + +# 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} +} From 78f1a7e3d51d0e39108c0dbfc0f6dd024ba7b415 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:49:05 -0400 Subject: [PATCH 21/24] Removed previous versions, added support for REDHAWK 2.0.6 and common repo. --- .../redhawk-burstio/redhawk-burstio.inc | 106 ------------------ .../redhawk-burstio/redhawk-burstio_2.0.1.bb | 5 - .../redhawk-burstio/redhawk-burstio_2.0.2.bb | 6 - .../redhawk-burstio/redhawk-burstio_2.0.4.bb | 12 -- .../redhawk-burstio/redhawk-burstio_2.0.5.bb | 12 -- .../redhawk-burstio/redhawk-burstio_2.0.6.bb | 101 ++++++++++++++++- 6 files changed, 96 insertions(+), 146 deletions(-) delete mode 100644 recipes-redhawk/redhawk-burstio/redhawk-burstio.inc delete mode 100644 recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.1.bb delete mode 100644 recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.2.bb delete mode 100644 recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.4.bb delete mode 100644 recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.5.bb diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio.inc b/recipes-redhawk/redhawk-burstio/redhawk-burstio.inc deleted file mode 100644 index f4aff44..0000000 --- a/recipes-redhawk/redhawk-burstio/redhawk-burstio.inc +++ /dev/null @@ -1,106 +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 Framework BulkIO Interfaces" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -DEPENDS = "redhawk-bulkio" -RDEPENDS_${PN} = "redhawk-bulkio" -RDEPENDS_${PN}-python = "redhawk-bulkio-python" - -PACKAGES += "${PN}-python" -PROVIDES += "${PN}-python" - -# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -SRCTAG ?= "" -SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" - -SRC_URI ?= "git://github.com/RedhawkSDR/burstIOInterfaces.git;${SRCTAGARG};protocol=git" - -SRC_URI_append = "\ - file://subdir_objects.patch \ - file://makefile.am.patch \ - file://IDLDIR.patch \ -" - -S ?= "${WORKDIR}/git" - -# 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 pythonnative redhawk-sysroot redhawk-oeconf - - -FILES_${PN}-python += " \ - ${OSSIEHOME}/lib/python \ -" - -FILES_${PN} += " \ - ${OSSIEHOME}/lib/lib*.so.* \ -" - -FILES_${PN}-dbg += " \ - ${OSSIEHOME}/lib/.debug \ -" - -FILES_${PN}-dev += " \ - ${OSSIEHOME}/lib/lib*.so \ - ${OSSIEHOME}/include \ - ${OSSIEHOME}/share/* \ - ${OSSIEHOME}/lib/pkgconfig \ -" - -FILES_${PN}-staticdev += " \ - ${OSSIEHOME}/lib/*.a \ - ${OSSIEHOME}/lib/lib*.la \ -" - -INSANE_SKIP_${PN} += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" - - -EXTRA_OECONF += "\ - -disable-java \ - --with-boost-system=boost_system \ - " -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" - -CXXFLAGS += "-fpermissive" - -PARALLEL_MAKE = "" - -# 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 STAGING_BASE=${STAGING_DIR}/${MACHINE} - export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" -} - -# 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} -} diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.1.bb b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.1.bb deleted file mode 100644 index 9c34ca6..0000000 --- a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -SRCTAG = "2.0.1" -PREFERRED_VERSION_redhawk-core = "2.0.1" - -include redhawk-burstio.inc - diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.2.bb b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.2.bb deleted file mode 100644 index 53efc95..0000000 --- a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRCTAG = "2.0.2" -PREFERRED_VERSION_redhawk-core = "2.0.2" -INSANE_SKIP_${PN}-dbg += "libdir" - -include redhawk-burstio.inc - diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.4.bb b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.4.bb deleted file mode 100644 index 0212d77..0000000 --- a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/burstioInterfaces" - -PREFERRED_VERSION_redhawk-core = "2.0.4" - -INSANE_SKIP_${PN}-dbg += "libdir" - -include redhawk-burstio.inc - diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.5.bb b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.5.bb deleted file mode 100644 index 5238df6..0000000 --- a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.5;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/burstioInterfaces" - -PREFERRED_VERSION_redhawk-core = "2.0.5" - -INSANE_SKIP_${PN}-dbg += "libdir" - -include redhawk-burstio.inc - diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.6.bb b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.6.bb index 928b59b..c80e9d2 100644 --- a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.6.bb +++ b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.6.bb @@ -1,12 +1,103 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" +# +# 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/. +# -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" +DESCRIPTION = "REDHAWK Framework BurstIO Interfaces" -S = "${WORKDIR}/git/burstioInterfaces" +include recipes-core/include/redhawk-repo.inc -PREFERRED_VERSION_redhawk-core = "2.0.6" +PR = "r2" +DEPENDS = "redhawk-bulkio" +RDEPENDS_${PN} = "redhawk-bulkio" +RDEPENDS_${PN}-python = "redhawk-bulkio-python" +PREFERRED_VERSION_redhawk-core = "${REDHAWK_VERSION}" + +PACKAGES += "${PN}-python" +PROVIDES += "${PN}-python" + +SRC_URI_append = "\ + file://subdir_objects.patch \ + file://makefile.am.patch \ + file://IDLDIR.patch \ +" + +S = "${WORKDIR}/git/redhawk-core-framework/burstioInterfaces" + +# 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 pythonnative redhawk-oeconf redhawk-sysroot + + +FILES_${PN}-python += " \ + ${OSSIEHOME}/lib/python \ +" + +FILES_${PN} += " \ + ${OSSIEHOME}/lib/lib*.so.* \ +" + +FILES_${PN}-dbg += " \ + ${OSSIEHOME}/lib/.debug \ +" + +FILES_${PN}-dev += " \ + ${OSSIEHOME}/lib/lib*.so \ + ${OSSIEHOME}/include \ + ${OSSIEHOME}/share/* \ + ${OSSIEHOME}/lib/pkgconfig \ +" + +FILES_${PN}-staticdev += " \ + ${OSSIEHOME}/lib/*.a \ + ${OSSIEHOME}/lib/lib*.la \ +" + +INSANE_SKIP_${PN} += "libdir" INSANE_SKIP_${PN}-dbg += "libdir" -include redhawk-burstio.inc + +EXTRA_OECONF += "\ + -disable-java \ + --with-boost-system=boost_system \ + " +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" + +CXXFLAGS += "-fpermissive" + +PARALLEL_MAKE = "" + +# 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 STAGING_BASE=${STAGING_DIR}/${MACHINE} + export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" +} + +# 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} +} From 1427b2164b14341bc6fd31f5a335464be8d18f1b Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:49:56 -0400 Subject: [PATCH 22/24] Removed previous versions, added support for REDHAWK 2.0.6 and common repo. --- .../redhawk-codegen/redhawk-codegen.inc | 53 ------------------- .../redhawk-codegen/redhawk-codegen_2.0.1.bb | 5 -- .../redhawk-codegen/redhawk-codegen_2.0.2.bb | 5 -- .../redhawk-codegen/redhawk-codegen_2.0.4.bb | 10 ---- .../redhawk-codegen/redhawk-codegen_2.0.5.bb | 10 ---- .../redhawk-codegen/redhawk-codegen_2.0.6.bb | 49 +++++++++++++++-- 6 files changed, 44 insertions(+), 88 deletions(-) delete mode 100644 recipes-redhawk/redhawk-codegen/redhawk-codegen.inc delete mode 100644 recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.1.bb delete mode 100644 recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.2.bb delete mode 100644 recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.4.bb delete mode 100644 recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.5.bb diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen.inc b/recipes-redhawk/redhawk-codegen/redhawk-codegen.inc deleted file mode 100644 index 4cbedb5..0000000 --- a/recipes-redhawk/redhawk-codegen/redhawk-codegen.inc +++ /dev/null @@ -1,53 +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 Codegen" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -DEPENDS = "redhawk-core" -RDEPENDS_${PN} = "redhawk-core python" - -# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -SRCTAG ?= "" -SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" - -SRC_URI ?= "git://github.com/RedhawkSDR/framework-codegen.git;${SRCTAGARG};protocol=git" - -S ?= "${WORKDIR}/git" - -# Recipe concept based on: http://stackoverflow.com/questions/16090550/building-python-packages - -# This is a python package -inherit setuptools redhawk-env - -do_configure_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} -} - -BBCLASSEXTEND = "native" - -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/site.py* -} diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.1.bb b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.1.bb deleted file mode 100644 index 1509596..0000000 --- a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -SRCTAG = "2.0.1" -PREFERRED_VERSION_redhawk-core = "2.0.1" - -include redhawk-codegen.inc - diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.2.bb b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.2.bb deleted file mode 100644 index fc76428..0000000 --- a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -SRCTAG = "2.0.2" -PREFERRED_VERSION_redhawk-core = "2.0.2" - -include redhawk-codegen.inc - diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.4.bb b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.4.bb deleted file mode 100644 index 9a93aef..0000000 --- a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/redhawk-codegen" - -PREFERRED_VERSION_redhawk-core = "2.0.4" - -include redhawk-codegen.inc - diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.5.bb b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.5.bb deleted file mode 100644 index 73612b2..0000000 --- a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.5;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/redhawk-codegen" - -PREFERRED_VERSION_redhawk-core = "2.0.5" - -include redhawk-codegen.inc - diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.6.bb b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.6.bb index 19fda8e..78be265 100644 --- a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.6.bb +++ b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.6.bb @@ -1,10 +1,49 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" +# +# 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/. +# -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" +DESCRIPTION = "REDHAWK Codegen" -S = "${WORKDIR}/git/redhawk-codegen" +include recipes-core/include/redhawk-repo.inc -PREFERRED_VERSION_redhawk-core = "2.0.6" +PR = "r2" -include redhawk-codegen.inc +DEPENDS = "redhawk-core" +RDEPENDS_${PN} = "redhawk-core python" +PREFERRED_VERSION_redhawk-core = "${REDHAWK_VERSION}" +S = "${WORKDIR}/git/redhawk-core-framework/redhawk-codegen" + +# Recipe concept based on: http://stackoverflow.com/questions/16090550/building-python-packages + +# This is a python package +inherit setuptools redhawk-sysroot + +do_configure_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +BBCLASSEXTEND = "native" + +do_install_append() { + rm -f ${D}${libdir}/python*/site-packages/site.py* +} From c8f21b4c2293784ba80fe1970f5f1d32b7bc88b7 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:52:06 -0400 Subject: [PATCH 23/24] Removed old versions, bumped to REDHAWK 2.0.6 version and common repo --- .../redhawk-frontend/redhawk-frontend.inc | 108 ------------------ .../redhawk-frontend_2.3.1.bb | 6 - .../redhawk-frontend_2.3.3.bb | 6 - .../redhawk-frontend_2.3.4.bb | 10 -- .../redhawk-frontend_2.3.5.bb | 10 -- .../redhawk-frontend_2.3.6.bb | 104 ++++++++++++++++- 6 files changed, 99 insertions(+), 145 deletions(-) delete mode 100644 recipes-redhawk/redhawk-frontend/redhawk-frontend.inc delete mode 100644 recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.1.bb delete mode 100644 recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.3.bb delete mode 100644 recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.4.bb delete mode 100644 recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.5.bb diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend.inc b/recipes-redhawk/redhawk-frontend/redhawk-frontend.inc deleted file mode 100644 index a992223..0000000 --- a/recipes-redhawk/redhawk-frontend/redhawk-frontend.inc +++ /dev/null @@ -1,108 +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 Framework FrontEnd Interfaces" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -DEPENDS = "redhawk-bulkio" -RDEPENDS_${PN} = "redhawk-bulkio" -RDEPENDS_${PN}-python = "redhawk-bulkio-python" - -PACKAGES += "${PN}-python" -PROVIDES += "${PN}-python" - -# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -SRCTAG ?= "" -SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" - -SRC_URI ?= "git://github.com/RedhawkSDR/frontendInterfaces.git;${SRCTAGARG};protocol=git" - -SRC_URI_append = "\ - file://IDLDIR.patch \ - file://Add_Missing_Files.patch \ -" - -S ?= "${WORKDIR}/git" - -# 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 pythonnative redhawk-sysroot redhawk-oeconf - - -FILES_${PN}-python += " \ - ${OSSIEHOME}/lib/python \ -" - -FILES_${PN} += " \ - ${OSSIEHOME}/share \ - ${OSSIEHOME}/lib/lib*.so.* \ -" - -FILES_${PN}-dbg += " \ - ${OSSIEHOME}/lib/.debug \ -" - -FILES_${PN}-dev += " \ - ${OSSIEHOME}/lib/*.so \ - ${OSSIEHOME}/include \ - ${OSSIEHOME}/lib/pkgconfig \ -" - -FILES_${PN}-staticdev += " \ - ${OSSIEHOME}/lib/*.a \ - ${OSSIEHOME}/lib/*.la \ -" - -INSANE_SKIP_${PN} += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" - - -EXTRA_OECONF += "\ - --disable-java \ - --disable-log4cxx \ - " -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" - -# Required -CXXFLAGS += "-fpermissive" -CFLAGS += "-fpermissive" - -# Since prefix is set this has to override that -CACHED_CONFIGUREVARS += "ac_cv_pymod_ossie=yes ac_cv_pymod_bulkio_bulkioInterfaces=yes" - -# 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 STAGING_BASE=${STAGING_DIR}/${MACHINE} - export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" -} - -# 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} -} diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.1.bb b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.1.bb deleted file mode 100644 index 0718339..0000000 --- a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRCTAG = "2.3.1" - -PREFERRED_VERSION_redhawk-bulkio = "2.0.1" - -include redhawk-frontend.inc - diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.3.bb b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.3.bb deleted file mode 100644 index 7e52bcf..0000000 --- a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRCTAG = "2.3.3" - -PREFERRED_VERSION_redhawk-bulkio = "2.0.2" - -include redhawk-frontend.inc - diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.4.bb b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.4.bb deleted file mode 100644 index 100678f..0000000 --- a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/frontendInterfaces" - -PREFERRED_VERSION_redhawk-bulkio = "2.0.4" - -include redhawk-frontend.inc - diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.5.bb b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.5.bb deleted file mode 100644 index 9911833..0000000 --- a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.5;protocol=git" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -S = "${WORKDIR}/git/frontendInterfaces" - -PREFERRED_VERSION_redhawk-bulkio = "2.0.5" - -include redhawk-frontend.inc - diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.6.bb b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.6.bb index 0ce46a0..656db27 100644 --- a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.6.bb +++ b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.6.bb @@ -1,10 +1,104 @@ -SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.6;protocol=git" +# +# 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/. +# -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" +DESCRIPTION = "REDHAWK Framework FrontEnd Interfaces" -S = "${WORKDIR}/git/frontendInterfaces" +include recipes-core/include/redhawk-repo.inc -PREFERRED_VERSION_redhawk-bulkio = "2.0.6" +DEPENDS = "redhawk-bulkio" +RDEPENDS_${PN} = "redhawk-bulkio" +RDEPENDS_${PN}-python = "redhawk-bulkio-python" +PREFERRED_VERSION_redhawk-bulkio = "${REDHAWK_VERSION}" -include redhawk-frontend.inc +PACKAGES += "${PN}-python" +PROVIDES += "${PN}-python" +PR = "r2" + +SRC_URI_append = "\ + file://IDLDIR.patch \ + file://Add_Missing_Files.patch \ +" + +S = "${WORKDIR}/git/redhawk-core-framework/frontendInterfaces" + +# 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 pythonnative redhawk-oeconf redhawk-sysroot + + +FILES_${PN}-python += " \ + ${OSSIEHOME}/lib/python \ +" + +FILES_${PN} += " \ + ${OSSIEHOME}/share \ + ${OSSIEHOME}/lib/lib*.so.* \ +" + +FILES_${PN}-dbg += " \ + ${OSSIEHOME}/lib/.debug \ +" + +FILES_${PN}-dev += " \ + ${OSSIEHOME}/lib/*.so \ + ${OSSIEHOME}/include \ + ${OSSIEHOME}/lib/pkgconfig \ +" + +FILES_${PN}-staticdev += " \ + ${OSSIEHOME}/lib/*.a \ + ${OSSIEHOME}/lib/*.la \ +" + +INSANE_SKIP_${PN} += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" + + +EXTRA_OECONF += "\ + --disable-java \ + --disable-log4cxx \ + " +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" + +# Required +CXXFLAGS += "-fpermissive" +CFLAGS += "-fpermissive" + +# Since prefix is set this has to override that +CACHED_CONFIGUREVARS += "ac_cv_pymod_ossie=yes ac_cv_pymod_bulkio_bulkioInterfaces=yes" + +# 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 STAGING_BASE=${STAGING_DIR}/${MACHINE} + export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" +} + +# 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} +} From 9067f2d8652a284f5b2480bac8c77bb0d9277dd5 Mon Sep 17 00:00:00 2001 From: Thomas Goodwin Date: Wed, 19 Jul 2017 12:53:18 -0400 Subject: [PATCH 24/24] Small README update regarding support for only the latest version(s) going forward. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c1e5eac..059579a 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ This repository, along with the base Yocto framework will enable you to build th * iVeia Atlas-I-Z7e * Several ZC702 -based designs + > Note: Only the presently-tagged version is supported by this repository, however we can support some earlier versions if required. Please contact us through our [website](http://www.geontech.com) if this is a need. + Is my hardware supported? ------------------------- The Yocto website provides a list of [Official BSPs][4] which include common hardware platforms like the Raspberry Pi, BeagleBoard, BeagleBone, NUC, Intel Atom, etc.