merge of '5353be39ab2ea320be019c163381f5d3e4cadc2b'

     and '773bfc8eb4142f3291c08d0ea2f313be1f93d7a4'

16 files changed, 39 insertions, 17 deletions

diff --git a/packages/ossie/ossie-c-wavloader_svn.bb b/packages/ossie/ossie-c-wavloader_svn.bb
index eb85b5bd98..5fdc9332cf 100644
--- a/packages/ossie/ossie-c-wavloader_svn.bb
+++ b/packages/ossie/ossie-c-wavloader_svn.bb
@@ -8,7 +8,7 @@ DEPENDS = "ossiecf expat"
 
 S="${WORKDIR}/c_wavLoader"
 
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/c_wavLoader/trunk;module=c_wavLoader;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/platform/c_wavLoader/trunk;module=c_wavLoader;proto=https"
 
 inherit autotools
 
diff --git a/packages/ossie/ossie-channeldemo_svn.bb b/packages/ossie/ossie-channeldemo_svn.bb
index 8c51a5dc16..93a41b6c3c 100644
--- a/packages/ossie/ossie-channeldemo_svn.bb
+++ b/packages/ossie/ossie-channeldemo_svn.bb
@@ -9,7 +9,7 @@ DEPENDS = "ossiecf"
 S="${WORKDIR}/ChannelDemo"
 
 
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/components/ChannelDemo/trunk;module=ChannelDemo;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/components/ChannelDemo/trunk;module=ChannelDemo;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-demo_svn.bb b/packages/ossie/ossie-demo_svn.bb
index 1099b6d669..d2777ecc10 100644
--- a/packages/ossie/ossie-demo_svn.bb
+++ b/packages/ossie/ossie-demo_svn.bb
@@ -10,7 +10,7 @@ RDEPENDS = "ossie-channeldemo ossie-rxdemo"
 S="${WORKDIR}/ossie_demo"
 
 
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/waveforms/ossie_demo/trunk;module=ossie_demo;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/waveforms/ossie_demo/trunk;module=ossie_demo;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-gpp-device_svn.bb b/packages/ossie/ossie-gpp-device_svn.bb
index b9d3eeb929..39adc0a74c 100644
--- a/packages/ossie/ossie-gpp-device_svn.bb
+++ b/packages/ossie/ossie-gpp-device_svn.bb
@@ -9,7 +9,7 @@ DEPENDS = "ossiecf"
 
 S="${WORKDIR}/GPP"
 
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/GPP/trunk;module=GPP;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/platform/GPP/trunk;module=GPP;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-interpolator_svn.bb b/packages/ossie/ossie-interpolator_svn.bb
index b2c2cbc2ab..ca561fe0a1 100644
--- a/packages/ossie/ossie-interpolator_svn.bb
+++ b/packages/ossie/ossie-interpolator_svn.bb
@@ -9,7 +9,7 @@ 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"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/components/Interpolator/trunk;module=Interpolator;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-modulator_svn.bb b/packages/ossie/ossie-modulator_svn.bb
index 2276db4c23..c6ac6afe73 100644
--- a/packages/ossie/ossie-modulator_svn.bb
+++ b/packages/ossie/ossie-modulator_svn.bb
@@ -9,7 +9,7 @@ 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"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/components/Modulator/trunk;module=Modulator;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-nodebooter_svn.bb b/packages/ossie/ossie-nodebooter_svn.bb
index b79ff91d07..5a941550db 100644
--- a/packages/ossie/ossie-nodebooter_svn.bb
+++ b/packages/ossie/ossie-nodebooter_svn.bb
@@ -8,7 +8,7 @@ DEPENDS = "ossiecf"
 
 S="${WORKDIR}/nodebooter"
 
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/nodebooter/trunk;module=nodebooter;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/platform/nodebooter/trunk;module=nodebooter;proto=https"
 
 inherit autotools
 
diff --git a/packages/ossie/ossie-randombits_svn.bb b/packages/ossie/ossie-randombits_svn.bb
index fea9c77f14..a3ddc23185 100644
--- a/packages/ossie/ossie-randombits_svn.bb
+++ b/packages/ossie/ossie-randombits_svn.bb
@@ -9,7 +9,7 @@ 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"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/components/RandomBits/trunk;module=RandomBits;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-rxdemo_svn.bb b/packages/ossie/ossie-rxdemo_svn.bb
index 75d9e3057c..34619b3845 100644
--- a/packages/ossie/ossie-rxdemo_svn.bb
+++ b/packages/ossie/ossie-rxdemo_svn.bb
@@ -9,7 +9,7 @@ DEPENDS = "ossiecf"
 S="${WORKDIR}/RxDemo"
 
 
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/components/RxDemo/trunk;module=RxDemo;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/components/RxDemo/trunk;module=RxDemo;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-sigproc_svn.bb b/packages/ossie/ossie-sigproc_svn.bb
index 88cf3582bd..5d3643bfde 100644
--- a/packages/ossie/ossie-sigproc_svn.bb
+++ b/packages/ossie/ossie-sigproc_svn.bb
@@ -9,10 +9,12 @@ DEPENDS = "ossiecf"
 S="${WORKDIR}/SigProc"
 
 SRCDATE = "now"
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/SigProc/trunk;module=SigProc;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/SigProc/trunk;module=SigProc;proto=https"
 
 inherit autotools pkgconfig
 
+EXTRA_OECONF_append_arm = " --enable-fpm=arm"
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/packages/ossie/ossie-soundout-device_svn.bb b/packages/ossie/ossie-soundout-device_svn.bb
index 6d7eb082ef..2af60db834 100644
--- a/packages/ossie/ossie-soundout-device_svn.bb
+++ b/packages/ossie/ossie-soundout-device_svn.bb
@@ -9,7 +9,7 @@ DEPENDS = "alsa-lib ossiecf ossie-standardinterfaces"
 
 S="${WORKDIR}/Sound_out"
 
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/Sound_out/trunk;module=Sound_out;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/platform/Sound_out/trunk;module=Sound_out;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-tx-random-data_svn.bb b/packages/ossie/ossie-tx-random-data_svn.bb
index 74b3817fee..1597f5ec94 100644
--- a/packages/ossie/ossie-tx-random-data_svn.bb
+++ b/packages/ossie/ossie-tx-random-data_svn.bb
@@ -4,13 +4,13 @@ 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"
+DEPENDS = "ossiecf ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control ossie-usrp-device ossie-gpp-device"
+RDEPENDS = "ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control 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"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/waveforms/TX_Random_data/trunk;module=TX_Random_data;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-usrp-device_svn.bb b/packages/ossie/ossie-usrp-device_svn.bb
index c5467b3487..943b53a464 100644
--- a/packages/ossie/ossie-usrp-device_svn.bb
+++ b/packages/ossie/ossie-usrp-device_svn.bb
@@ -9,7 +9,7 @@ DEPENDS = "ossiecf usrp ossie-standardinterfaces"
 
 S="${WORKDIR}/USRP"
 
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/USRP/trunk;module=USRP;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/platform/USRP/trunk;module=USRP;proto=https"
 
 prefix="/home/sca"
 
diff --git a/packages/ossie/ossie-usrp-tx-control_svn.bb b/packages/ossie/ossie-usrp-tx-control_svn.bb
new file mode 100644
index 0000000000..b3fca8fe9b
--- /dev/null
+++ b/packages/ossie/ossie-usrp-tx-control_svn.bb
@@ -0,0 +1,20 @@
+PR = "r0"
+DESCRIPTION = "OSSIE USRP TX side control component"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf ossie-standardinterfaces"
+
+S="${WORKDIR}/USRP_TX_Control"
+
+
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/waveforms/USRP_TX_Control/trunk;module=USRP_TX_Control;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/USRP_TX_Control/*.xml"
+
+BROKEN = "1"
diff --git a/packages/ossie/ossiecf_svn.bb b/packages/ossie/ossiecf_svn.bb
index 2cd45a6796..d78b546ba0 100644
--- a/packages/ossie/ossiecf_svn.bb
+++ b/packages/ossie/ossiecf_svn.bb
@@ -8,7 +8,7 @@ DEPENDS = "xerces-c omniorb libtool-cross"
 
 S="${WORKDIR}/ossie"
 
-SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/ossie/trunk;module=ossie;proto=https"
+SRC_URI = "svn://oe:oe@ossie-dev.mprg.org/repos/ossie/ossie/trunk;module=ossie;proto=https"
 
 inherit autotools pkgconfig
 
diff --git a/packages/tasks/task-ossie.bb b/packages/tasks/task-ossie.bb
index a6c34bf2a8..98f0a2d368 100644
--- a/packages/tasks/task-ossie.bb
+++ b/packages/tasks/task-ossie.bb
@@ -7,7 +7,7 @@ PACKAGES = "task-ossie"
 
 ALLOW_EMPTY = "1"
 
-IPKG_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS}"
+IPKG_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}"
 
 OSSIE_BASE = "screen procps xerces-c omniorb usrp"
 OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader"