diff options
author | Philip Balister <philip@opensdr.com> | 2010-10-17 17:04:20 -0400 |
---|---|---|
committer | Philip Balister <philip@opensdr.com> | 2010-10-17 17:04:20 -0400 |
commit | 54edb574ee2f981634fdca2c2df348fbe275400d (patch) | |
tree | 76d6213550aa2c1348869876cd11ca90277c5b72 | |
parent | 0fc54bae7b8f6546b64356fa798b0a0deabf979d (diff) | |
download | openembedded-54edb574ee2f981634fdca2c2df348fbe275400d.tar.gz |
gnuradio: Update GNU Radio recipe. Clean up configuration settings.
-rw-r--r-- | recipes/gnuradio/gnuradio.inc | 72 | ||||
-rw-r--r-- | recipes/gnuradio/gnuradio_git.bb | 30 |
2 files changed, 20 insertions, 82 deletions
diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc index 10bf160ac3..fe3f244c62 100644 --- a/recipes/gnuradio/gnuradio.inc +++ b/recipes/gnuradio/gnuradio.inc @@ -1,90 +1,46 @@ DESCRIPTION = "GNU Radio" +URL = "http://gnuradio.org" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPLv3" -DEPENDS = "virtual/libusb0 guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy" -INC_PR = "r7" +DEPENDS = "uhd gsl guile-native fftwf python alsa-lib boost cppunit sdcc-native swig-native python-numpy" +INC_PR = "r8" -inherit distutils-base autotools autotools pkgconfig +inherit distutils-base autotools pkgconfig export BUILD_SYS export HOST_SYS=${MULTIMACH_TARGET_SYS} -CXXFLAGS_powerpc += "-lstdc++" - EXTRA_OECONF = " \ --program-prefix= \ --disable-gr-atsc \ - --enable-gr-video-sdl \ --enable-gr-audio-alsa \ - --enable-gr-audio-jack \ - --enable-gr-audio-oss \ - --enable-mblock \ + --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} \ " -#export USB_CFLAGS="-I${STAGING_INCDIR}" -#export USB_LIBS="-L${STAGING_LIBDIR}" - -do_configure_prepend() { - if [ -e ${WORKDIR}/acinclude.m4 ] ; then - cp ${WORKDIR}/acinclude.m4 ${S} - fi -} - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g - find ${S} -name Makefile | xargs sed -i s:' /usr/include':' ${STAGING_INCDIR}':g -} - -do_stage() { - autotools_stage_all - sed -i s,-l:libusb-gnur.a,,g ${STAGING_LIBDIR}/libusrp.la -} - 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 \ " -RDEPENDS_gnuradio-usrp = "python-core" - PACKAGES =+ "\ - libpmt libpmt-qa \ - libmblock libmblock-qa \ - libgr-audio-alsa libgr-audio-oss libgr-audio-jack\ - libusrp libusrp-inband libusrp-inband-qa \ - libgromnithread \ - libgnuradio-core libgnuradio-core-qa \ - gnuradio-usrp-dbg gnuradio-usrp gnuradio-examples \ + ${PN}-examples \ + ${PN}-grc \ + ${PN}-conf \ " -FILES_gnuradio-examples = "${datadir}/gnuradio/examples" - -FILES_libpmt = "${libdir}/libpmt.so" -FILES_libpmt-qa = "${libdir}/libpmt-qa.so" -FILES_libmblock = "${libdir}/libmblock.so" -FILES_libmblock-qa = "${libdir}/libmblock-qa.so" -FILES_libgr-audio-alsa = "${libdir}/libgr_audio_alsa.so ${sysconfdir}/gnuradio/conf.d/gr-audio-alsa.conf" -FILES_libgr-audio-oss = "${libdir}/libgr_audio_oss.so ${sysconfdir}/gnuradio/conf.d/gr-audio-oss.conf" -FILES_libgr-audio-jack = "${libdir}/libgr_audio_jack.so ${sysconfdir}/gnuradio/conf.d/gr-audio-jack.conf" - - -FILES_libusrp = "${libdir}/libusrp.so.*" -FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*" -FILES_libusrp-inband-qa = "${libdir}/libusrp_inband-qa.so" -FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.* ${sysconfdir}/gnuradio/conf.d/*core*" -FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*" -FILES_libgromnithread = "${libdir}/libgromnithread.so*" +FILES_${PN}-examples = "${datadir}/gnuradio/examples" +FILES_${PN}-grc = "${datadir}/gnuradio/grc" +FILES_${PN}-conf = "${sysconfdir}/gnuradio" FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/*" FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \ ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \ " -FILES_gnuradio-usrp = "${PYTHON_SITEPACKAGES_DIR}/usrp/* \ - ${bindir}/usrp* \ - ${datadir}/usrp/*/*" -FILES_gnuradio-usrp-dbg = "${PYTHON_SITEPACKAGES_DIR}/usrp/.debug" diff --git a/recipes/gnuradio/gnuradio_git.bb b/recipes/gnuradio/gnuradio_git.bb index a769aa26f4..5f496ddd24 100644 --- a/recipes/gnuradio/gnuradio_git.bb +++ b/recipes/gnuradio/gnuradio_git.bb @@ -1,34 +1,16 @@ -require gnuradio.inc +require recipes/gnuradio/gnuradio.inc -DEFAULT_PREFERENCE = "-1" +PR = "${INC_PR}.0" +PV = "3.3.0-${PR}+gitr${SRCREV}" -DEPENDS += " gsl " - -#SRCREV = "0cd478fdc090123e09b7ee21c88e5657abab8ae0" - -SRCREV = "bf7ad4d17514aba9fc5209bc916ce37482f77eaa" - -PR = "${INC_PR}.2" -PV = "3.2.1-${PR}+gitr${SRCREV}" - -EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable-usrp2 --disable-usrp2-firmware --with-fusb-tech=libusb1" +SRCREV = "068aa7f5b2591f7cc06e4495c89600101bd19b6b" # Make it easy to test against developer repos and branches -GIT_REPO = "balister.git" -GIT_BRANCH = "omap3-build" +GIT_REPO = "gnuradio.git" +GIT_BRANCH = "next" SRC_URI = "git://gnuradio.org/git/${GIT_REPO};branch=${GIT_BRANCH};protocol=http \ - ${SOURCEFORGE_MIRROR}/libusb/libusb-0.1.12.tar.gz \ " S="${WORKDIR}/git" -do_compile_append() { - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - gnuradio-core/gnuradio-core.pc -} - - -SRC_URI[md5sum] = "caf182cbc7565dac0fd72155919672e6" -SRC_URI[sha256sum] = "37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44" |