Merge pull request #22 from Geontech/rocko

Rocko 2.4.1 and REDHAWK 2.0.8

README.md

@@ -3,6 +3,8 @@ meta-REDHAWK-SDR
 
 Meta-REDHAWK-SDR is an actively-maintained set of [Yocto][1]/[Open-Embedded][2] recipes for the [REDHAWK SDR][3] framework, its dependencies, GPP, other example Devices, all shared libraries (softpkg), and all but 1 CPP Component (DataConvert requires SSE).
 
+ > NOTE: The most recent version of Yocto tested with this layer is Rocko, 2.4.1.
+
 This repository, along with the base Yocto framework will enable you to build the REDHAWK SDR framework for any hardware platform in which a Board Support Package is available.  We at Geon have successfully used this layer on a variety of Zynq targets including:
 
  * [ZC706 Evaluation Board](http://geontech.com/analog-devices-fmcomms-via-yocto/)

classes/redhawk-entity.bbclass

@@ -30,12 +30,6 @@ do_install_prepend() {
   export PYTHONPATH=${OSSIEHOME_STAGED}/lib/python:${PYTHONPATH}
 }
 
-# Dynamic architecture patch for whatever ${REDHAWK_PROCESSOR} is set to.
-# 1. This takes whatever is ${NODE_CONFIG_SCRIPT} and find where it hard-codes the architecture look-up,
-#    replacing it for ${REDHAWK_PROCESSOR}
-# 2. This changes processor name x86_64 and replaces it with ${REDHAWK_PROCESSOR}.
-# 3. This removes processor name x86.
-REDHAWK_PROCESSOR ?= "armv7l"
 NODE_CONFIG_SCRIPT ?= ""
 do_dynamic_arch_patch () {
   if ! [ -z ${NODE_CONFIG_SCRIPT} ] ; then 

conf/layer.conf

@@ -33,6 +33,5 @@ LAYERDEPENDS_redhawk-sdr = "\
     core \
     openembedded-layer \
     networking-layer \
-    filesystems-layer \
     meta-python \
-    "
+    "

recipes-core-framework/redhawk/redhawk_2.0.6.bb → recipes-core-framework/redhawk/redhawk_2.0.8.bb

@@ -36,7 +36,6 @@ SRC_URI_append = "\
     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 \
     file://ossie_cv_sdr_root_target.patch \
@@ -79,7 +78,6 @@ FILES_${PN} += " \
 "
 
 # Patch for lack of support in specifying an alternative to armv7l and various x86 options.
-REDHAWK_PROCESSOR ?= "armv7l"
 do_redhawk_processor_patch () {
     find ${S} -type f -exec sed -i "s/BB_REDHAWK_PROCESSOR/${REDHAWK_PROCESSOR}/g" {} \;
 }

recipes-core/images/native-sdk.inc

@@ -1,13 +1,3 @@
-TOOLCHAIN_HOST_TASK_append = " nativesdk-python-cheetah \
-    nativesdk-python-netserver nativesdk-python-pprint \
-    nativesdk-python-pickle nativesdk-python-shell \
-    nativesdk-python-subprocess nativesdk-python-modules \
-    nativesdk-orc nativesdk-swig nativesdk-python-distutils \
-    nativesdk-python-xml nativesdk-python-compile \
-    nativesdk-cmake nativesdk-python-mako \
-    "
-
-# Removed glib-2.0
 CORE_IMAGE_EXTRA_INSTALL = "\
     alsa-utils \
     i2c-tools \
@@ -21,7 +11,6 @@ CORE_IMAGE_EXTRA_INSTALL = "\
     cmake \
     gsl \
     python \
-    python-cheetah \
     python-modules \
     python-argparse \
     python-distutils \

recipes-core/include/redhawk-repo.inc

@@ -1,7 +1,17 @@
-REDHAWK_VERSION = "2.0.6"
+REDHAWK_VERSION = "2.0.8"
 
 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"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/redhawk-core-framework/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+
+# Dynamic architecture patch for whatever ${REDHAWK_PROCESSOR} is set to.
+# 1. This takes whatever is ${NODE_CONFIG_SCRIPT} and find where it hard-codes the architecture look-up,
+#    replacing it for ${REDHAWK_PROCESSOR}
+# 2. This changes processor name x86_64 and replaces it with ${REDHAWK_PROCESSOR}.
+# 3. This removes processor name x86.
+REDHAWK_PROCESSOR ?= "x86_64"
+REDHAWK_PROCESSOR_zynq ?= "armv7l"
+REDHAWK_PROCESSOR_zynqmp ?= "aarch64"