aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2009-06-16 09:08:41 +0100
committerPhil Blundell <philb@gnu.org>2009-06-16 09:08:41 +0100
commit658930dd64c9c4a86fdee5bcc0e6789feb4a1341 (patch)
tree3f456d6ab621283a7e4f9f375a22a0dd448a8873
parent05855dc272c76f1bbc8c2d563e2b231b94cbd4b8 (diff)
parent37d2ff36812fa0a3de5687e24c105ad9ffdebd59 (diff)
downloadopenembedded-658930dd64c9c4a86fdee5bcc0e6789feb4a1341.tar.gz
Merge branch 'org.openembedded.dev' of git@new.openembedded.org:openembedded into org.openembedded.dev
-rw-r--r--recipes/gnuradio/gnuradio.inc7
-rw-r--r--recipes/gnuradio/gnuradio_3.2.0.bb2
2 files changed, 5 insertions, 4 deletions
diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc
index 2688636629..b1c83b4ab1 100644
--- a/recipes/gnuradio/gnuradio.inc
+++ b/recipes/gnuradio/gnuradio.inc
@@ -91,9 +91,10 @@ FILES_libgromnithread = "${libdir}/libgromnithread.so*"
FILES_${PN} += "${libdir}/python*/site-packages/gnuradio/*"
FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \
- ${libdir}/python*/site-packages/gnuradio/*/.debug \
+ ${libdir}/python*/site-packages/gnuradio/*/.debug \
"
-FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrpm/* \
+FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrp/* \
+ ${bindir}/usrp* \
${datadir}/usrp/*/*"
-FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrpm/.debug"
+FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrp/.debug"
diff --git a/recipes/gnuradio/gnuradio_3.2.0.bb b/recipes/gnuradio/gnuradio_3.2.0.bb
index b24b3cbb95..eef34bb03f 100644
--- a/recipes/gnuradio/gnuradio_3.2.0.bb
+++ b/recipes/gnuradio/gnuradio_3.2.0.bb
@@ -2,7 +2,7 @@ require gnuradio.inc
DEPENDS += " gsl "
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/gnuradio-3.2"