[meta-oe 0/5] Update UHD and GNU Radio to current versions.

[meta-oe 0/5] Update UHD and GNU Radio to current versions.

[philip]

From: Philip Balister <philip@opensdr.com>

Build tested on a distroless oe-core+toolchain-layer+meta-oe setup.

Philip Balister (5):
  uhd-firmware : Update to version 003.004.000.
  python-cheetah : Remove DEPENDS on python native packages.
  uhd : Update to version 3.4.1.
  gnuradio : Update to version 3.5.3.
  gnuradio : Remove old files.

 meta-oe/recipes-connectivity/gnuradio/gnuradio.inc |   48 ------------
 ...-all-traces-of-volk-from-configure-for-OE.patch |   42 ----------
 .../recipes-connectivity/gnuradio/gnuradio_git.bb  |   79 ++++++++++++++++++--
 .../uhd/uhd-firmware_003.003.001.bb                |   27 -------
 .../uhd/uhd-firmware_003.004.000.bb                |   27 +++++++
 meta-oe/recipes-connectivity/uhd/uhd.inc           |    2 +-
 meta-oe/recipes-connectivity/uhd/uhd_git.bb        |    6 +-
 .../python/python-cheetah_2.4.4.bb                 |    2 -
 8 files changed, 102 insertions(+), 131 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio.inc
 delete mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch
 delete mode 100644 meta-oe/recipes-connectivity/uhd/uhd-firmware_003.003.001.bb
 create mode 100644 meta-oe/recipes-connectivity/uhd/uhd-firmware_003.004.000.bb

-- 
1.7.7.6

[meta-oe 1/5] uhd-firmware : Update to version 003.004.000.

[philip]

From: Philip Balister <philip@opensdr.com>

Yes, Josh changed the paths again. They are much saner now, and if he touches
them again, I will beat him with a ping pong paddle.

Signed-off-by: Philip Balister <philip@opensdr.com>
---
 .../uhd/uhd-firmware_003.003.001.bb                |   27 --------------------
 .../uhd/uhd-firmware_003.004.000.bb                |   27 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/uhd/uhd-firmware_003.003.001.bb
 create mode 100644 meta-oe/recipes-connectivity/uhd/uhd-firmware_003.004.000.bb

diff --git a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.003.001.bb b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.003.001.bb
deleted file mode 100644
index 1d7817d..0000000
--- a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.003.001.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Universal Hardware Driver Firmware"
-HOMEPAGE = "http://www.ettus.com"
-
-PE = "1"
-
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://share/uhd/images/usrp_e100_fpga_v2.bin;md5=52f5a4b60aca734da1b0e78078aeea71"
-
-inherit allarch
-
-SRC_URI = "http://www.ettus.com/downloads/uhd_releases/${@'${PV}'.replace('.', '_')}/images-only/UHD-images-${PV}.tar.gz"
-SRC_URI[md5sum] = "84ec78ec03699a96d64210b93019f782"
-SRC_URI[sha256sum] = "53712db43b324adad1b83617f99f7b73682bcd0078bbc9915d0a376f4ca41289"
-
-S = "${WORKDIR}/UHD-images-${PV}-59f407f"
-
-do_install() {
-	install -d ${D}${datadir}/uhd/images
-	install -d ${D}${datadir}/uhd/images/bit
-	install -m 0644 ${S}/share/uhd/images/bit/* ${D}${datadir}/uhd/images/bit
-	rm -rf ${S}/share/uhd/images/bit
-	install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images
-}
-
-PACKAGES = "${PN}"
-FILES_${PN} = "${datadir}/uhd/images"
-
diff --git a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.004.000.bb b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.004.000.bb
new file mode 100644
index 0000000..b445307
--- /dev/null
+++ b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.004.000.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Universal Hardware Driver Firmware"
+HOMEPAGE = "http://www.ettus.com"
+
+PE = "1"
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://share/uhd/images/usrp_e100_fpga_v2.bin;md5=d8a4f8958d3b56a11bbb1bb134826b28"
+
+inherit allarch
+
+SRC_URI = "http://files.ettus.com/binaries/uhd_stable/releases/uhd_${PV}-release/uhd-images_${PV}-release.tar.gz"
+SRC_URI[md5sum] = "4269fac82df1fe593ba76206773ce551"
+SRC_URI[sha256sum] = "4b80ebf90079a823212d3b77e5311ef1b467497a4a3585c2cfb4fe65bff71acf"
+
+S = "${WORKDIR}/uhd-images_${PV}-release"
+
+do_install() {
+	install -d ${D}${datadir}/uhd/images
+	install -d ${D}${datadir}/uhd/images/bit
+	install -m 0644 ${S}/share/uhd/images/bit/* ${D}${datadir}/uhd/images/bit
+	rm -rf ${S}/share/uhd/images/bit
+	install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${datadir}/uhd/images"
+
-- 
1.7.7.6

[meta-oe 2/5] python-cheetah : Remove DEPENDS on python native packages.

[philip]

From: Philip Balister <philip@opensdr.com>

The oe-core recipe no longer explicitly provides various -native
packages. THe recipe builds fine without them.

Built fine on distroless config.

Signed-off-by: Philip Balister <philip@opensdr.com>
---
 .../python/python-cheetah_2.4.4.bb                 |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/python/python-cheetah_2.4.4.bb b/meta-oe/recipes-devtools/python/python-cheetah_2.4.4.bb
index c07e969..8f2acea 100644
--- a/meta-oe/recipes-devtools/python/python-cheetah_2.4.4.bb
+++ b/meta-oe/recipes-devtools/python/python-cheetah_2.4.4.bb
@@ -12,8 +12,6 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
-RDEPENDS_${PN} = "python-pickle python-pprint"
-
 NATIVE_INSTALL_WORKS = "1"
 BBCLASSEXTEND = "native"
 
-- 
1.7.7.6

Re: [meta-oe 2/5] python-cheetah : Remove DEPENDS on python native packages.

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 12-04-12 01:11, philip@balister.org schreef:
> From: Philip Balister <philip@opensdr.com>
> 
> The oe-core recipe no longer explicitly provides various -native 
> packages. THe recipe builds fine without them.

These are _R_DEPENDS, have you verified that it runs without them?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iQIcBAEBAgAGBQJPhn0BAAoJEHZqAkdh1vT6ecEP/2ywoNnZzDLWDqHmEjtJrrss
NmzyVcVDCiPZGfGDy4HZKyLbiGOs2eoOmByKfUbNQ9h5cBrXdqLeeCEK8zdEoJzV
HRZvLAmVbd9Xvzy4FPCPt7GEkzEPiifviAZ9pi7Q+yWa4DU4wpJeVvYLQ/iM9usH
UtMffuDeSiMjydWfpxftNuWEVNoNPNFqV2x7Zrev1uvssd6GU1YH4Z+LRXtVSppF
2PLeg7FMPHL7LHBi3/3Y/3BoRDDtmqtjSrt05L7vO7lAcnS8njuCHoo8PRlGTt4m
p+LGPMN1QvN4u2aRMdoUWzcwjVbmPTUWWvzE+cI3BYyvCpq6XvqoofNxLGRQdxqA
vjTuQzJGzqPkNQnR9gqwVvAIysBs5OdLaP21DtZoOIgT3yKkWLGl1rAmM9hmfoO1
mhvXEsc9odTDlSMXy63zHnLKbMHLU3NGnJ13rpU19YEvPAMMkrcJVJ5Ckp8gcazs
zk0K0yGbZaKanAgWgz1QvwdCxaks/CeCkWEfHfciGdFh2Z2lMd14fU2+rgUQtP3A
2I6uxp9ufx3Q4OwDl4oyJK7O+pdVIWMVeJFTRyb9uYrFPdYwXeqyFCCIBQgaMOp1
KuZDqTlr07gWO+nC3clFJF1g1A7yawhpWI9g+XntCDGMe0IWjodfH+GOcSiU1Rvf
RVS7dKsdkyDvBjTyPa8K
=dCsm
-----END PGP SIGNATURE-----

Re: [meta-oe 2/5] python-cheetah : Remove DEPENDS on python native packages.

[Philip Balister]

On 04/11/2012 11:58 PM, Koen Kooi wrote:
> Op 12-04-12 01:11, philip@balister.org schreef:
>> From: Philip Balister <philip@opensdr.com>
> 
>> The oe-core recipe no longer explicitly provides various -native 
>> packages. THe recipe builds fine without them.
> 
> These are _R_DEPENDS, have you verified that it runs without them?

The -native versions are only needed at build time.

I do not have an easy way to runtime test the build quite yet, but I
would like to get the recipes in meta-oe building something that is more
useful than the existing recipes. I can handle small fixes in updates.

Philip

Re: [meta-oe 2/5] python-cheetah : Remove DEPENDS on python native packages.

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 12-04-12 19:12, Philip Balister schreef:
> On 04/11/2012 11:58 PM, Koen Kooi wrote:
>> Op 12-04-12 01:11, philip@balister.org schreef:
>>> From: Philip Balister <philip@opensdr.com>
>> 
>>> The oe-core recipe no longer explicitly provides various -native 
>>> packages. THe recipe builds fine without them.
>> 
>> These are _R_DEPENDS, have you verified that it runs without them?
> 
> The -native versions are only needed at build time.
> 
> I do not have an easy way to runtime test the build quite yet, but I 
> would like to get the recipes in meta-oe building something that is more 
> useful than the existing recipes. I can handle small fixes in updates.

This one introduces a big breakage, so it isn't going in.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iQIcBAEBAgAGBQJPhw2uAAoJEHZqAkdh1vT6Pz0P/30LQ1aXP83KmOWkkqWHB2Xy
EEHX6oXohG0oYGQ4zSEOwtRmhOXu/P1fSnf2QaZb6mq7gdKxem7qpUiAzsnhBiZc
iePFPiByj88Do+tCVxHy+IpaL4JnBa7bKWmtHkGdOlwfISFMjJ6RZLu4FK7tF0gu
RRSgJ4qSSFawbAyMYoUIngUA+TCOj4c+Vv4Tvf7+OgZZxf23fMoHSUiOwlXJkRVI
8LKDAJVLuwYyQd5C4PIImnQnri277Oxhn8chtb3beXKvKhlWGl0jBNUdsPcCL01b
Kq39RgZfCU92ziZ9duobHvu6rFoE4qJdIKDPeD84aiwcepK+wtIuV1pNtDJVML7S
nwAmf3Ti6b62R6Tn8MIBEhmQC1q6Szrm70S1DN2wnnK49KPyPlYUlrJg07LwTiBD
aiEwPj5R8YenMRtER42V0E0MsPworH4+8dQscL2lPr6sUIj2GpyG4U2/bzW+V0NO
XEjjnA1o8G2Pj5I8dmgLOs25HzjL6DjMSLsQBkuveUxPuv0tJLFbUT2ec9detq5m
gLYJbJIfO9B2x+aUrclO0T+Tnzg931KQzY6zRblg5K6/+kHlQOtBeSZG6hLpJHSP
3zRAUilGyetI8gwijNOKAkhwi1+c5z/HgEHv2dd/KfDOYPEmqcgVCOZ+Fc3DSX5j
HQUmdjL7QUI0kLSdggO5
=PjhG
-----END PGP SIGNATURE-----

[meta-oe 3/5] uhd : Update to version 3.4.1.

[philip]

From: Philip Balister <philip@opensdr.com>

Signed-off-by: Philip Balister <philip@opensdr.com>
---
 meta-oe/recipes-connectivity/uhd/uhd.inc    |    2 +-
 meta-oe/recipes-connectivity/uhd/uhd_git.bb |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-connectivity/uhd/uhd.inc b/meta-oe/recipes-connectivity/uhd/uhd.inc
index 466a19c..5e2e329 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd.inc
+++ b/meta-oe/recipes-connectivity/uhd/uhd.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.ettus.com"
 LICENSE = "GPLV3+"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=51b35d652c070d136bf20244494be2d3"
 
-DEPENDS = "git-native python-cheetah-native boost libusb1 uhd-firmware orc-native"
+DEPENDS = "git-native boost libusb1 uhd-firmware orc-native"
 RDEPENDS_${PN} += "uhd-firmware"
 
 PE = "1"
diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
index cd9c554..e740ccd 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd_git.bb
+++ b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
@@ -1,10 +1,10 @@
 require uhd.inc
 
-PV = "3.3.1"
+PV = "3.4.1"
 PR = "${INC_PR}.0"
 
 SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git \
-           file://0001-HACK-work-around-Wl-as-needed-problems.patch;striplevel=2"
+          "
 S = "${WORKDIR}/git/host"
 
-SRCREV = "f8d66fcfb14062283cdb0d0cbe4f77e2964ceb82"
+SRCREV = "3fb067567b0c799b3c707938491eb8489d85fefa"
-- 
1.7.7.6

[meta-oe 4/5] gnuradio : Update to version 3.5.3.

[philip]

From: Philip Balister <philip@opensdr.com>

Signed-off-by: Philip Balister <philip@opensdr.com>
---
 .../recipes-connectivity/gnuradio/gnuradio_git.bb  |   79 ++++++++++++++++++--
 1 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
index d5e297d..ae8ebca 100644
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
+++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
@@ -1,18 +1,81 @@
-require gnuradio.inc
+DESCRIPTION = "GNU Radio"
+URL = "http://gnuradio.org"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "${INC_PR}.0"
-PV = "3.4.0-${PR}+gitr${SRCREV}"
+PR = "r0"
 
-SRCREV = "62768eedf8f68680ef3a672a27025227e22ccbb0"
+DEPENDS = "uhd gsl fftwf python alsa-lib boost cppunit \
+           swig-native python-numpy python-pygtk orc qt4-x11-free qwt"
+
+inherit distutils-base cmake pkgconfig
+
+export BUILD_SYS
+export HOST_SYS="${MULTIMACH_TARGET_SYS}"
+
+RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs \
+                  python-lang python-textutils python-shell python-pickle \
+                  python-compiler python-pkgutil python-pydoc python-mmap \
+                  python-netclient python-difflib \
+                  python-pprint python-numpy python-pygtk python-lxml \
+                 "
+
+C_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+#do_configure_append() {
+#	find ${S} -name Makefile | xargs sed -i s:'-I${STAGING_INCDIR_NATIVE'::g
+#	find ${S} -name Makefile | xargs sed -i s:'-L${STAGING_LIBDIR_NATIVE'::g
+#}
+
+do_configure_prepend() {
+	${BUILD_CC} ${S}/gr-vocoder/lib/codec2/generate_codebook.c -o ${S}/gr-vocoder/lib/generate_codebook -lm
+	echo "ADD_EXECUTABLE(generate_codebook IMPORTED)" >${S}/gr-vocoder/lib/generate_codebook.txt
+	echo "SET_PROPERTY(TARGET generate_codebook APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)" >>${S}/gr-vocoder/lib/generate_codebook.txt
+	echo 'SET_TARGET_PROPERTIES(generate_codebook PROPERTIES IMPORTED_LOCATION_RELEASE "${S}/gr-vocoder/lib/generate_codebook")' >>${S}/gr-vocoder/lib/generate_codebook.txt
+}
+
+do_compile_prepend() {
+	cp ${S}/gr-vocoder/lib/codec2/defines.h ${OECMAKE_BUILDPATH}/gr-vocoder/lib/codec2
+}
+
+PACKAGES =+ "\
+  ${PN}-examples \
+  ${PN}-grc \
+"
+
+FILES_${PN}-grc = "${datadir}/gnuradio/grc"
+
+FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/*"
+FILES_${PN} += "${datadir}/gnuradio/*"
+# The following needs fixing upstream
+FILES_${PN} += "${prefix}/etc/gnuradio/*"
+
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \
+                    ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \
+		   "
+FILES_${PN}-examples = "${datadir}/gnuradio/examples"
+
+PV = "3.5.3"
+
+FILESPATHPKG_prepend = "gnuradio-git:"
+
+SRCREV = "f621a52f779381cfe550b4278b83e701a747944c"
 
 # Make it easy to test against developer repos and branches
 GIT_REPO = "gnuradio.git"
-GIT_BRANCH = "next"
+GIT_BRANCH = "master"
 
 SRC_URI = "git://gnuradio.org/git/${GIT_REPO};branch=${GIT_BRANCH};protocol=http \
-           file://0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch \
-           file://0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch \
-          "
+"
 
 S="${WORKDIR}/git"
 
+OECMAKE_BUILDPATH = "${S}/build"
+OECMAKE_SOURCEPATH = "${S}"
+
+EXTRA_OECMAKE = "-DENABLE_GR_ATSC=FALSE -DENABLE_GR_QTGUI=ON -DENABLE_GR_WXGUI=OFF -DENABLE_GR_VIDEO_SDL=OFF -DQT_HEADERS_DIR=${STAGING_INCDIR}/qt4 -DQT_QTCORE_INCLUDE_DIR=${STAGING_INCDIR}/qt4/QtCore -DQT_LIBRARY_DIR=${STAGING_LIBDIR} -DQT_QTCORE_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtCore.so -DQT_QTGUI_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtGui.so -DENABLE_GR_FCD=OFF -DIMPORT_EXECUTABLES=${S}/gr-vocoder/lib/generate_codebook.txt"
+
+EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
+
-- 
1.7.7.6

Re: [meta-oe 4/5] gnuradio : Update to version 3.5.3.

[Henning Heinold]

On Wed, Apr 11, 2012 at 04:11:30PM -0700, philip@balister.org wrote:

Hi Philip,

> +#do_configure_append() {
> +#	find ${S} -name Makefile | xargs sed -i s:'-I${STAGING_INCDIR_NATIVE'::g
> +#	find ${S} -name Makefile | xargs sed -i s:'-L${STAGING_LIBDIR_NATIVE'::g
> +#}

is this a left over or actual needed?

Bye Henning

Re: [meta-oe 4/5] gnuradio : Update to version 3.5.3.

[Philip Balister]

On 04/12/2012 12:09 AM, Henning Heinold wrote:
> On Wed, Apr 11, 2012 at 04:11:30PM -0700, philip@balister.org wrote:
> 
> Hi Philip,
> 
>> +#do_configure_append() {
>> +#	find ${S} -name Makefile | xargs sed -i s:'-I${STAGING_INCDIR_NATIVE'::g
>> +#	find ${S} -name Makefile | xargs sed -i s:'-L${STAGING_LIBDIR_NATIVE'::g
>> +#}
> 
> is this a left over or actual needed?

Left over. I'll kill them next time I update the recipe.

Philip

[meta-oe 5/5] gnuradio : Remove old files.

[philip]

From: Philip Balister <philip@opensdr.com>

Left the buildsys patch for now. It does not apply, but I have only
built this with gcc-4.6 from toolchain layer, not gcc from Angstrom.
The patch does not apply, but I am saving it to remind me how to fix
the problem.

Signed-off-by: Philip Balister <philip@opensdr.com>
---
 meta-oe/recipes-connectivity/gnuradio/gnuradio.inc |   48 --------------------
 ...-all-traces-of-volk-from-configure-for-OE.patch |   42 -----------------
 2 files changed, 0 insertions(+), 90 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio.inc
 delete mode 100644 meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch

diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio.inc b/meta-oe/recipes-connectivity/gnuradio/gnuradio.inc
deleted file mode 100644
index 144d588..0000000
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "GNU Radio"
-HOMEPAGE = "http://gnuradio.org"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-DEPENDS = "uhd virtual/libsdl gsl guile-native fftwf python alsa-lib boost cppunit swig-native python-numpy"
-
-INC_PR = "r1"
-
-inherit distutils-base autotools pkgconfig
-
-export BUILD_SYS
-export HOST_SYS="${MULTIMACH_TARGET_SYS}"
-
-EXTRA_OECONF = " \
-  --program-prefix= \
-  --disable-gr-atsc \
-  --enable-gr-audio-alsa  \
-  --disable-gr-audio-jack \
-  --disable-html-docs \
-  --with-boost=${STAGING_DIR_TARGET}/usr \
-  --disable-usrp1 \
-  --disable-usrp2 \
-  --with-pythondir=${PYTHON_SITEPACKAGES_DIR} \
-  PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR} \
-"
-
-RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils \
-                  python-shell python-pickle python-compiler python-pkgutil python-pydoc python-mmap \
-                  python-netclient python-unittest python-difflib python-pprint python-numpy \
-"
-
-PACKAGES =+ "\
-  ${PN}-examples \
-  ${PN}-grc \
-  ${PN}-conf \
-"
-
-FILES_${PN}-examples = "${datadir}/gnuradio/examples"
-FILES_${PN}-grc = "${datadir}/gnuradio/grc"
-FILES_${PN}-conf = "${sysconfdir}/gnuradio"
-
-FILES_${PN} += "${datadir}/gnuradio"
-FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/*"
-FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \
-                    ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \
-		   "
-
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch b/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch
deleted file mode 100644
index e2f674b..0000000
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 857c38eb8201e2a34b524fcabea21b1accbdb288 Mon Sep 17 00:00:00 2001
-From: Philip Balister <philip@opensdr.com>
-Date: Fri, 13 May 2011 12:26:14 -0400
-Subject: [PATCH] volk : Remove all traces of volk from configure for OE builds.
-
-Signed-off-by: Philip Balister <philip@opensdr.com>
----
- Makefile.common |    4 ++--
- configure.ac    |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.common b/Makefile.common
-index 20b8a78..aeda1dd 100644
---- a/Makefile.common
-+++ b/Makefile.common
-@@ -92,8 +92,8 @@ GRUEL_INCLUDES = @gruel_INCLUDES@
- GRUEL_LA = @gruel_LA@
- 
- # How to link in the VOLK library from inside the tree
--VOLK_INCLUDES = @volk_INCLUDES@
--VOLK_LA = @volk_LA@
-+#VOLK_INCLUDES = @volk_INCLUDES@
-+#VOLK_LA = @volk_LA@
- 
- # How to link in the USRP library from inside the tree
- USRP_INCLUDES = @usrp_INCLUDES@
-diff --git a/configure.ac b/configure.ac
-index 73ebbd6..e5cf7a2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -349,7 +349,7 @@ AC_ARG_ENABLE(
- 
- build_dirs="config"
- GRC_GRUEL                       dnl must come first
--GRC_VOLK
-+dnl GRC_VOLK
- GRC_GCELL
- GRC_GNURADIO_CORE
- GRC_USRP
--- 
-1.7.3.4
-
-- 
1.7.7.6