Merge pull request #24 from Geontech/rocko

btgoodwin · web-flow · commit aea88334b161 · 2018-07-18T15:31:46.000-04:00
REDHAWK 2.1.3 Pre-release support
diff --git a/classes/redhawk-core-framework.bbclass b/classes/redhawk-core-framework.bbclass
@@ -6,7 +6,7 @@ require recipes-core/include/redhawk-repo.inc
 inherit autotools-brokensep pkgconfig pythonnative redhawk-oeconf redhawk-sysroot
 
 # For parsing IDL during compile and autoconf detect omniORB IDL
-DEPENDS += "omniorbpy-native"
+DEPENDS += "omniorbpy-native python-setuptools-native"
 
 # Each typically provides a python package
 PACKAGES += "${PN}-python"
@@ -46,6 +46,7 @@ INSANE_SKIP_${PN}-dbg += "libdir"
 # OECONF
 EXTRA_OECONF += "\
 	--disable-java \
+    OMNIORB_INCLUDEDIR=${STAGING_INCDIR} \
     idldir=${STAGING_DATADIR}/idl/omniORB \
     OMNICOS_IDLDIR=${STAGING_DATADIR}/idl/omniORB/COS \
 "
diff --git a/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.1.3.bb b/recipes-core-framework/bulkioInterfaces/bulkiointerfaces_2.1.3.bb
@@ -28,7 +28,7 @@ RDEPENDS_${PN}-python = "redhawk-python"
 PR = "r2"
 
 SRC_URI_append = "\
-    file://subdir_objects.patch \
+    file://remove_cppunit.patch \
 "
 
 S = "${WORKDIR}/git/redhawk-core-framework/bulkioInterfaces"
diff --git a/recipes-core-framework/bulkioInterfaces/files/remove_cppunit.patch b/recipes-core-framework/bulkioInterfaces/files/remove_cppunit.patch
@@ -0,0 +1,11 @@
+--- git/configure.ac
++++ git-patched/configure.ac
+@@ -131,7 +131,7 @@ # End optional java support
+ 
+ # C++ unit testing support. May want to conditionally enable/disable this.
+-AM_PATH_CPPUNIT(1.12.1)
++ifdef([AM_PATH_CPPUNIT], [AM_PATH_CPPUNIT([1.12.1])], [])
+ AS_IF([test "x$HAVE_JAVASUPPORT" == "xyes"], [
+   dnl Use RPM location hard-coded for now
+   AC_SUBST([JUNIT_CLASSPATH], "/usr/share/java/junit4.jar")
+ ])
diff --git a/recipes-core-framework/bulkioInterfaces/files/subdir_objects.patch b/recipes-core-framework/bulkioInterfaces/files/subdir_objects.patch
diff --git a/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.1.3.bb b/recipes-core-framework/burstioInterfaces/burstiointerfaces_2.1.3.bb
@@ -29,12 +29,14 @@ PR = "r2"
 
 SRC_URI_append = "\
     file://subdir_objects.patch \
-    file://IDLDIR.patch \
+    file://fix_idldir_and_remove_cppunit.patch \
+    file://burstioInterfaces_libs.patch \
 "
 
 S = "${WORKDIR}/git/redhawk-core-framework/burstioInterfaces"
 
 EXTRA_OECONF += "\
+    --disable-testing \
     --with-boost-system=boost_system \
     "
 
@@ -53,3 +55,7 @@ do_configure_prepend() {
   export STAGING_BASE=${STAGING_DIR_TARGET}
   export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}"
 }
+
+do_compile_prepend(){
+  export INTERFACES_LIBDIR="${OSSIEHOME_STAGED}/lib"
+}
diff --git a/recipes-core-framework/burstioInterfaces/files/IDLDIR.patch b/recipes-core-framework/burstioInterfaces/files/IDLDIR.patch
diff --git a/recipes-core-framework/burstioInterfaces/files/burstioInterfaces_libs.patch b/recipes-core-framework/burstioInterfaces/files/burstioInterfaces_libs.patch
@@ -0,0 +1,11 @@
+--- git/src/cpp/Makefile.am
++++ git-patched/src/cpp/Makefile.am
+@@ -58,7 +58,8 @@
+ libburstioInterfaces_la_CPPFLAGS = -I . $(OSSIE_CFLAGS)
+ libburstioInterfaces_la_LDFLAGS = -lbulkioInterfaces
++libburstioInterfaces_la_LIBADD = -L$(INTERFACES_LIBDIR)
+ 
+ BUILT_SOURCES = $(nobase_nodist_include_HEADERS) $(nodist_libburstioInterfaces_la_SOURCES)
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+ idl_srcdir = $(top_srcdir)/src/idl
diff --git a/recipes-core-framework/burstioInterfaces/files/fix_idldir_and_remove_cppunit.patch b/recipes-core-framework/burstioInterfaces/files/fix_idldir_and_remove_cppunit.patch
@@ -0,0 +1,22 @@
+--- git/configure.ac	2016-03-02 07:00:31.568548917 -0500
++++ git-patched/configure.ac	2016-03-02 07:06:48.800526356 -0500
+@@ -48,6 +48,10 @@
+ PKG_CHECK_MODULES([BULKIO], [bulkio >= 2.1])
+ RH_PKG_IDLDIR([BULKIO], [bulkioInterfaces])
+ 
++# Adjust the variables from RH_PKG_IDLDIR for the staging area.
++OSSIE_IDLDIR="${STAGING_BASE}${OSSIE_IDLDIR}"
++BULKIO_IDLDIR="${STAGING_BASE}${BULKIO_IDLDIR}"
++
+ AX_BOOST_BASE([1.41])
+ AX_BOOST_THREAD
+ AX_BOOST_SYSTEM
+@@ -135,7 +139,7 @@
+ # Optionally disable unit tests
+ AC_ARG_ENABLE([testing], AS_HELP_STRING([--disable-testing], [disable build of unit tests]))
+ AS_IF([test "x$enable_testing" != "xno"], [
+-  AM_PATH_CPPUNIT(1.12.1)
++  ifdef([AM_PATH_CPPUNIT], [AM_PATH_CPPUNIT([1.12.1])], [])
+   AS_IF([test "x$HAVE_JAVASUPPORT" == "xyes"], [
+     dnl Use RPM location hard-coded for now
+     AC_SUBST([JUNIT_CLASSPATH], "/usr/share/java/junit4.jar")
diff --git a/recipes-core-framework/frontendInterfaces/files/fix_idldir_and_remove_cppunit.patch b/recipes-core-framework/frontendInterfaces/files/fix_idldir_and_remove_cppunit.patch
@@ -1,6 +1,6 @@
 --- git/configure.ac	2016-03-02 07:18:49.966842098 -0500
 +++ git-patched/configure.ac	2016-03-02 07:23:28.780067757 -0500
-@@ -47,6 +47,10 @@
+@@ -49,6 +49,10 @@
  AC_CHECK_PYMODULE(bulkio.bulkioInterfaces, [], [AC_MSG_ERROR([the python bulkio.bulkioInterfaces module is required])])
  RH_PKG_IDLDIR([BULKIO], [bulkioInterfaces])
  
@@ -9,5 +9,14 @@
 +BULKIO_IDLDIR="${STAGING_BASE}${BULKIO_IDLDIR}"
 +
  AC_SUBST([FRONTEND_SO_VERSION],[0:0:0])
- AC_SUBST([FRONTEND_API_VERSION],[2.3])
+ AC_SUBST([FRONTEND_API_VERSION],[2.4])
  
+@@ -131,7 +131,7 @@ # fi
+ AM_CONDITIONAL(HAVE_JAVASUPPORT, test $HAVE_JAVASUPPORT = yes)
+ 
+-AM_PATH_CPPUNIT(1.12.1)
++ifdef([AM_PATH_CPPUNIT], [AM_PATH_CPPUNIT([1.12.1])], [])
+ AS_IF([test "x$HAVE_JAVASUPPORT" == "xyes"], [
+   dnl Use RPM location hard-coded for now
+   AC_SUBST([JUNIT_CLASSPATH], "/usr/share/java/junit4.jar")
+ ])
diff --git a/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.3.bb b/recipes-core-framework/frontendInterfaces/frontendinterfaces_2.4.3.bb
@@ -28,7 +28,7 @@ RDEPENDS_${PN}-python = "bulkiointerfaces-python"
 PR = "r2"
 
 SRC_URI_append = "\
-    file://IDLDIR.patch \
+    file://fix_idldir_and_remove_cppunit.patch \
 "
 
 S = "${WORKDIR}/git/redhawk-core-framework/frontendInterfaces"
diff --git a/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.1.3.bb b/recipes-core-framework/redhawk-codegen/redhawk-codegen_2.1.3.bb
diff --git a/recipes-core-framework/redhawk/files/Remove_Tests.patch b/recipes-core-framework/redhawk/files/Remove_Tests.patch
@@ -1,10 +1,14 @@
 --- src/Makefile.am	2016-02-19 11:41:50.989704874 -0500
 +++ src-patched/Makefile.am	2016-02-19 11:45:44.874990007 -0500
-@@ -34,7 +34,7 @@
+@@ -34,11 +34,7 @@
    OMNIJNI = omnijni
  endif
  
--SUBDIRS = acinclude etc $(OMNIJNI) base control tools xml idl testing
+-if BUILD_TESTS
+-TEST_DIR=testing
+-endif
+-
+-SUBDIRS = acinclude etc $(OMNIJNI) base control tools xml idl $(TEST_DIR)
 +SUBDIRS = acinclude etc $(OMNIJNI) base control tools xml idl
  
  # Install makefile fragments
diff --git a/recipes-core-framework/redhawk/files/allow_idl_dir_set.patch b/recipes-core-framework/redhawk/files/allow_idl_dir_set.patch
@@ -2,7 +2,18 @@ diff --git src/configure.ac src/configure.ac
 index a3c5992..9b6b0bd 100644
 --- src/configure.ac
 +++ src/configure.ac
-@@ -85,7 +85,9 @@ PKG_CHECK_EXISTS([omniCOS4 >= 4.0.0], [libomnicos_exist=yes], [libomnicos_exist=
+@@ -79,7 +79,9 @@ fi
+ 
+ PKG_CHECK_MODULES([OMNIORB], [omniORB4 >= 4.0.0])
+-OMNIORB_INCLUDEDIR=`pkg-config --variable=includedir omniORB4`
++if test x"$OMNIORB_INCLUDEDIR" = x ; then
++        OMNIORB_INCLUDEDIR=`pkg-config --variable=includedir omniORB4`
++fi
+ AC_SUBST(OMNIORB_INCLUDEDIR)
+ PKG_CHECK_EXISTS([omniORB4 >= 4.2.0],[AC_DEFINE([OMNIORB4_2],[1],[])])
+ PKG_CHECK_MODULES([OMNITHREAD], [omnithread3 >= 4.0.0])
+ PKG_CHECK_MODULES([OMNIDYNAMIC], [omniDynamic4 >= 4.0.0])
+@@ -90,7 +92,9 @@ PKG_CHECK_EXISTS([omniCOS4 >= 4.0.0], [libomnicos_exist=yes], [libomnicos_exist=
  dnl Use PKG_CHECK_MODULES to declare the CFLAGS and LIBS varible
  AC_MSG_RESULT([yes])
  PKG_CHECK_MODULES([OMNICOS], [omniCOS4 >= 4.0.0])
@@ -13,7 +24,7 @@ index a3c5992..9b6b0bd 100644
  AC_SUBST(OMNICOS_IDLDIR)
  
  AC_DEFINE(ENABLE_EVENTS, 1, [Define if events are enabled])
-@@ -98,7 +100,9 @@ if test "$IDL" = no; then
+@@ -103,7 +107,9 @@ if test "$IDL" = no; then
  fi
  
  AC_MSG_CHECKING([for default IDL path])
@@ -24,3 +35,12 @@ index a3c5992..9b6b0bd 100644
  AC_MSG_RESULT([$idldir])
  AC_SUBST(IDLDIR, [$idldir])
  
+@@ -273,7 +277,7 @@
+ 
+ # C++ unit testing support. May want to conditionally enable/disable this.
+-AM_PATH_CPPUNIT(1.12.1)
++ifdef([AM_PATH_CPPUNIT], [AM_PATH_CPPUNIT([1.12.1])], [])
+ AS_IF([test "x$HAVE_JAVASUPPORT" == "xyes"], [
+   dnl Use RPM location hard-coded for now
+   AC_SUBST([JUNIT_CLASSPATH], "/usr/share/java/junit4.jar")
+ ])
diff --git a/recipes-core-framework/redhawk/files/include_scoped_ptr.patch b/recipes-core-framework/redhawk/files/include_scoped_ptr.patch
@@ -0,0 +1,36 @@
+diff -Nuar src/base/include/ossie/Resource_impl.h src-patched/base/include/ossie/Resource_impl.h
+--- src/base/include/ossie/Resource_impl.h	2016-03-01 09:51:46.915186392 -0600
++++ src-patched/base/include/ossie/Resource_impl.h	2016-03-01 10:19:26.815427832 -0600
+@@ -24,7 +24,8 @@
+
+ #include <string>
+ #include <map>
++#include <boost/scoped_ptr.hpp>
+ #include "Logging_impl.h"
+ #include "Port_impl.h"
+ #include "LifeCycle_impl.h"
+ #include "PortSet_impl.h"
+diff -Nuar src/base/include/ossie/Component.h src-patched/base/include/ossie/Component.h
+--- src/base/include/ossie/Component.h	2016-03-01 09:51:46.915186392 -0600
++++ src-patched/base/include/ossie/Component.h	2016-03-01 10:14:48.420199987 -0600
+@@ -20,7 +20,8 @@
+
+ #ifndef COMPONENT_H
+ #define	COMPONENT_H
++#include <boost/scoped_ptr.hpp>
+ #include "Resource_impl.h"
+ #include "ossie/debug.h"
+ #include "ossie/Events.h"
+ #include "ossie/Autocomplete.h"
+diff -Nuar src/base/framework/shm/Allocator.cpp src-patched/base/framework/shm/Allocator.cpp
+--- src/base/framework/shm/Allocator.cpp	2016-03-01 09:51:46.915186392 -0600
++++ src-patched/base/framework/shm/Allocator.cpp	2016-03-01 10:14:48.420199987 -0600
+@@ -26,6 +26,7 @@
+ #include <ossie/BufferManager.h>
+ 
+ #include <boost/thread.hpp>
++#include <boost/scoped_ptr.hpp>
+ 
+ #include "Block.h"
+ 
+
diff --git a/recipes-core-framework/redhawk/files/redhawk_processor.patch b/recipes-core-framework/redhawk/files/redhawk_processor.patch
@@ -131,7 +131,7 @@ diff -Nuar src/control/sdr/devmgr/Makefile.am src/control/sdr/devmgr/Makefile.am
 +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
+ DeviceManager_SOURCES = main.cpp spdSupport.cpp process_utils.cpp DeviceManager_DeployerSupport.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
diff --git a/recipes-core-framework/redhawk/files/remove_csh_scripts.patch b/recipes-core-framework/redhawk/files/remove_csh_scripts.patch
@@ -11,9 +11,9 @@ index ba2deb8..4f4eef9 100644
 -  profile.d/redhawk-sdrroot.csh
 +  profile.d/redhawk-sdrroot.sh
  
- lib = lib${gr_libdir_suffix}
- edit = $(SED) \
-@@ -46,9 +44,7 @@ $(ldsoconfd_DATA) $(profiled_DATA): Makefile
+ rh_etc_dir = $(sysconfdir)/redhawk
+ cron_dir = $(rh_etc_dir)/cron.d
+@@ -46,8 +44,6 @@ $(ldsoconfd_DATA) $(profiled_DATA): Makefile
  
  ld.so.conf.d/redhawk.conf: ld.so.conf.d/redhawk.conf.in
  profile.d/redhawk.sh: profile.d/redhawk.sh.in
@@ -22,4 +22,3 @@ index ba2deb8..4f4eef9 100644
 -profile.d/redhawk-sdrroot.csh: profile.d/redhawk-sdrroot.csh.in
  
  DISTCLEANFILES = $(ldsoconfd_DATA) $(profiled_DATA)
- 
diff --git a/recipes-core-framework/redhawk/redhawk_2.1.3.bb b/recipes-core-framework/redhawk/redhawk_2.1.3.bb
@@ -23,7 +23,7 @@ DESCRIPTION = "REDHAWK Core Framework"
 
 PR = "r2"
 
-DEPENDS += "omniorbpy log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip expat boost boost-native python-numpy python-threading python-numbers python-resource ossp-uuid"
+DEPENDS += "omniorbpy log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip expat boost boost-native python-numpy python-threading python-numbers python-resource  ossp-uuid"
 RDEPENDS_${PN} = "python omniorbpy omniorb omnievents e2fsprogs apr-util apr zip expat boost python-numpy python-threading python-subprocess python-numbers python-xml python-resource ossp-uuid"
 RDEPENDS_${PN}-python = "${PN} omniorb-python omniorbpy python-numpy python-threading python-numbers python-resource python-xml python-lxml"
 
@@ -39,6 +39,7 @@ SRC_URI_append = "\
     file://gcc_fix_nodebooter.patch \
     file://remove_csh_scripts.patch \
     file://ossie_cv_sdr_root_target.patch \
+    file://include_scoped_ptr.patch \
 "
 
 S = "${WORKDIR}/git/redhawk-core-framework/redhawk/src"
@@ -72,6 +73,8 @@ FILES_${PN}-python += " \
 "
 
 FILES_${PN} += " \
+    ${OSSIEHOME}/bin/redhawk-shminfo \
+    ${OSSIEHOME}/bin/redhawk-shmclean \
     ${OSSIEHOME}/bin/nodeBooter \
     ${SDRROOT}/* \
     /etc/* \
diff --git a/recipes-core/include/redhawk-repo.inc b/recipes-core/include/redhawk-repo.inc
@@ -1,6 +1,6 @@
-REDHAWK_VERSION = "2.0.8"
+REDHAWK_VERSION = "2.1.3"
 
-SRC_URI = "gitsm://github.com/RedhawkSDR/redhawk.git;tag=${REDHAWK_VERSION};branch=master-2.0;protocol=git"
+SRC_URI = "gitsm://github.com/RedhawkSDR/redhawk.git;tag=${REDHAWK_VERSION};branch=master;protocol=git"
 
 HOMEPAGE = "http://www.redhawksdr.org"
 LICENSE = "LGPL-3.0"
@@ -13,5 +13,6 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/redhawk-core-framework/LICENSE;md5=e6a
 # 2. This changes processor name x86_64 and replaces it with ${REDHAWK_PROCESSOR}.
 # 3. This removes processor name x86.
 REDHAWK_PROCESSOR ?= "x86_64"
+REDHAWK_PROCESSOR_rpi ?= "armv7l"
 REDHAWK_PROCESSOR_zynq ?= "armv7l"
 REDHAWK_PROCESSOR_zynqmp ?= "aarch64"
diff --git a/recipes-core/packagegroups/packagegroup-redhawk-basic-components.bb b/recipes-core/packagegroups/packagegroup-redhawk-basic-components.bb
@@ -1,6 +1,6 @@
 # Package group definitions for REDHAWK builds
 
-LICENSE = "LGPL3"
+LICENSE = "LGPL-3.0"
 #
 # This file is protected by Copyright. Please refer to the COPYRIGHT file distributed 
 # with this source distribution.
diff --git a/recipes-core/packagegroups/packagegroup-redhawk-basic-softpkgs.bb b/recipes-core/packagegroups/packagegroup-redhawk-basic-softpkgs.bb
@@ -1,6 +1,6 @@
 # Package group definitions for REDHAWK builds
 
-LICENSE = "LGPL3"
+LICENSE = "LGPL-3.0"
 #
 # This file is protected by Copyright. Please refer to the COPYRIGHT file distributed 
 # with this source distribution.
diff --git a/recipes-core/packagegroups/packagegroup-redhawk-core.bb b/recipes-core/packagegroups/packagegroup-redhawk-core.bb
@@ -1,6 +1,6 @@
 # Package group definitions for REDHAWK builds
 
-LICENSE = "LGPL3"
+LICENSE = "LGPL-3.0"
 #
 # This file is protected by Copyright. Please refer to the COPYRIGHT file distributed 
 # with this source distribution.
diff --git a/recipes-core/packagegroups/packagegroup-redhawk-node.bb b/recipes-core/packagegroups/packagegroup-redhawk-node.bb
@@ -1,6 +1,6 @@
 # Package group definitions for REDHAWK builds
 
-LICENSE = "LGPL3"
+LICENSE = "LGPL-3.0"
 #
 # This file is protected by Copyright. Please refer to the COPYRIGHT file distributed 
 # with this source distribution.
diff --git a/recipes-deps/omnievents/files/omniEvents.patch b/recipes-deps/omnievents/files/omniEvents.patch
diff --git a/recipes-deps/omnievents/omnievents_2.8.1.bb b/recipes-deps/omnievents/omnievents_2.8.1.bb
diff --git a/recipes-devices/GPP/gpp_2.1.3.bb b/recipes-devices/GPP/gpp_2.1.3.bb
diff --git a/recipes-devices/USRP_UHD/usrp-uhd_5.0.0.bb b/recipes-devices/USRP_UHD/usrp-uhd_5.0.0.bb

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ RDEPENDS_${PN}-python = "redhawk-python"`
`28`	`28`	`PR = "r2"`
`29`	`29`
`30`	`30`	`SRC_URI_append = "\`
`31`		`- file://subdir_objects.patch \`
	`31`	`+ file://remove_cppunit.patch \`
`32`	`32`	`"`
`33`	`33`
`34`	`34`	`S = "${WORKDIR}/git/redhawk-core-framework/bulkioInterfaces"`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,14 @@ PR = "r2"`
`29`	`29`
`30`	`30`	`SRC_URI_append = "\`
`31`	`31`	`file://subdir_objects.patch \`
`32`		`- file://IDLDIR.patch \`
	`32`	`+ file://fix_idldir_and_remove_cppunit.patch \`
	`33`	`+ file://burstioInterfaces_libs.patch \`
`33`	`34`	`"`
`34`	`35`
`35`	`36`	`S = "${WORKDIR}/git/redhawk-core-framework/burstioInterfaces"`
`36`	`37`
`37`	`38`	`EXTRA_OECONF += "\`
	`39`	`+ --disable-testing \`
`38`	`40`	`--with-boost-system=boost_system \`
`39`	`41`	`"`
`40`	`42`
`@@ -53,3 +55,7 @@ do_configure_prepend() {`
`53`	`55`	`export STAGING_BASE=${STAGING_DIR_TARGET}`
`54`	`56`	`export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}"`
`55`	`57`	`}`
	`58`	`+`
	`59`	`+do_compile_prepend(){`
	`60`	`+ export INTERFACES_LIBDIR="${OSSIEHOME_STAGED}/lib"`
	`61`	`+}`