merge of 'b1b3feda7d897a425e7e06c085cbfab48b9e4f09'

     and 'f364b08c0bec4d1bbd76370204c058f1d372339f'

7 files changed, 103 insertions, 2 deletions

diff --git a/packages/ossie/ossie-demo_svn.bb b/packages/ossie/ossie-demo_svn.bb
index 1108a37c28..1099b6d669 100644
--- a/packages/ossie/ossie-demo_svn.bb
+++ b/packages/ossie/ossie-demo_svn.bb
@@ -5,6 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 DEPENDS = "ossiecf ossie-channeldemo ossie-rxdemo"
+RDEPENDS = "ossie-channeldemo ossie-rxdemo"
 
 S="${WORKDIR}/ossie_demo"
 
diff --git a/packages/ossie/ossie-interpolator_svn.bb b/packages/ossie/ossie-interpolator_svn.bb
new file mode 100644
index 0000000000..b2c2cbc2ab
--- /dev/null
+++ b/packages/ossie/ossie-interpolator_svn.bb
@@ -0,0 +1,20 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Interpolator component"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc"
+
+S="${WORKDIR}/Interpolator"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/components/Interpolator/trunk;module=Interpolator;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/Interpolator/*.xml"
+
+BROKEN = "1"
diff --git a/packages/ossie/ossie-modulator_svn.bb b/packages/ossie/ossie-modulator_svn.bb
new file mode 100644
index 0000000000..2276db4c23
--- /dev/null
+++ b/packages/ossie/ossie-modulator_svn.bb
@@ -0,0 +1,20 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Modulator component"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc"
+
+S="${WORKDIR}/Modulator"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/components/Modulator/trunk;module=Modulator;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/Modulator/*.xml"
+
+BROKEN = "1"
diff --git a/packages/ossie/ossie-randombits_svn.bb b/packages/ossie/ossie-randombits_svn.bb
new file mode 100644
index 0000000000..fea9c77f14
--- /dev/null
+++ b/packages/ossie/ossie-randombits_svn.bb
@@ -0,0 +1,20 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Random bit generator component"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc"
+
+S="${WORKDIR}/RandomBits"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/components/RandomBits/trunk;module=RandomBits;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/RandomBits/*.xml"
+
+BROKEN = "1"
diff --git a/packages/ossie/ossie-sigproc_svn.bb b/packages/ossie/ossie-sigproc_svn.bb
new file mode 100644
index 0000000000..88cf3582bd
--- /dev/null
+++ b/packages/ossie/ossie-sigproc_svn.bb
@@ -0,0 +1,19 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Signal Processing routines"
+SECTION =  "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/SigProc"
+
+SRCDATE = "now"
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/SigProc/trunk;module=SigProc;proto=https"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
+BROKEN = "1"
diff --git a/packages/ossie/ossie-tx-random-data_svn.bb b/packages/ossie/ossie-tx-random-data_svn.bb
new file mode 100644
index 0000000000..74b3817fee
--- /dev/null
+++ b/packages/ossie/ossie-tx-random-data_svn.bb
@@ -0,0 +1,20 @@
+PR = "r0"
+DESCRIPTION = "OSSIE transmit random bits waveform"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-device ossie-gpp-device"
+RDEPENDS = "ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-device ossie-gpp-device"
+
+S="${WORKDIR}/TX_Random_data"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/waveforms/TX_Random_data/trunk;module=TX_Random_data;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/waveforms/Random_BPSK/*.xml"
+BROKEN = "1"
diff --git a/packages/tasks/task-ossie.bb b/packages/tasks/task-ossie.bb
index e2b50058f9..a6c34bf2a8 100644
--- a/packages/tasks/task-ossie.bb
+++ b/packages/tasks/task-ossie.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for OSSIE Software Defined Radio (SDR)"
 LICENSE = "MIT"
-RDEPENDS = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS}"
+RDEPENDS = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}"
 PR = "r0"
 
 PACKAGES = "task-ossie"
@@ -11,4 +11,5 @@ IPKG_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS}"
 
 OSSIE_BASE = "screen procps xerces-c omniorb usrp"
 OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader"
-OSSIE_COMPONENTS = "ossie-gpp-device ossie-usrp-device ossie-soundout-device ossie-demo ossie-channeldemo ossie-rxdemo"
+OSSIE_COMPONENTS = "ossie-gpp-device ossie-usrp-device ossie-soundout-device"
+OSSIE_WAVEFORMS = "ossie-demo ossie-tx-random-data"