disapproval of revision '1b4f1b0c118eeaad3bf775fe1f5c2080e0e260c6'

Committed usrp hack by mistake, back out and recommit.

diff --git a/packages/fftw/.mtn2git_empty b/packages/fftw/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/fftw/fftw_3.1.2.bb b/packages/fftw/fftw_3.1.2.bb
deleted file mode 100644 (file)
index 6cb2acc..0000000
--- a/packages/fftw/fftw_3.1.2.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "FFTW"
-SECTION =  "libs"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = ""
-PR = "r0"
-
-SRC_URI = "http://www.fftw.org/fftw-3.1.2.tar.gz"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-single --enable-shared --disable-fortran"
-
-do_stage () {
-       autotools_stage_all
-}
-

diff --git a/packages/usrp/usrp_0.12.bb b/packages/usrp/usrp_0.12.bb
index 398299e..ade37ba 100644 (file)
--- a/packages/usrp/usrp_0.12.bb
+++ b/packages/usrp/usrp_0.12.bb
@@ -7,7 +7,7 @@ RDEPENDS = "python-core"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \
-#           file://usb11.patch;patch=1 \
+           file://usb11.patch;patch=1 \
            file://fix_compile_h.patch;patch=1;pnum=3 \
            file://install_test.patch;patch=1"