Merge pull request #8 from Geontech/krogoth

REDHAWK 2.0.6

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.

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} \
+ "

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
 

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.
@@ -19,3 +20,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/<processor name=\"x86_64\"\/>/<processor name=\"${PACKAGE_ARCH}\"\/>/g" ${S}/../*.spd.xml
+ sed -i "s/<processor name=\"x86\"\/>//g" ${S}/../*.spd.xml
+}
+addtask dynamic_arch_patch after do_patch before do_configure

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}"

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} \

classes/redhawk-waveform.bbclass

@@ -1,5 +1,5 @@
 
-inherit redhawk-env
+inherit redhawk-sysroot
 
 FILES_${PN} += "${SDRROOT}/dom/waveforms/*"
 

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: