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

login
register
mail settings
Submitter Philip Balister
Date April 11, 2012, 11:11 p.m.
Message ID <1334185891-25460-6-git-send-email-philip@balister.org>
Download mbox | patch
Permalink /patch/25641/
State Accepted
Commit 189f61dc4693470d0bfd0ac2a71d11d94e9dfeb7
Headers show

Comments

Philip Balister - April 11, 2012, 11:11 p.m.
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

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
-