diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | recipes/gnuradio/gnuradio/no-usrp2-svn.patch | 12 | ||||
| -rw-r--r-- | recipes/gnuradio/gnuradio_svn.bb | 10 |
3 files changed, 15 insertions, 9 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 0e1a25a4b7..faa8c4d2a8 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -76,7 +76,7 @@ SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV} SRCREV_pn-gcc-cross-sdk ?= ${GCCREV} SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnet ?= "495" -SRCREV_pn-gnuradio ?= "10302" +SRCREV_pn-gnuradio ?= "11418" SRCREV_pn-gpe-conf ?= "9900" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gpe-gallery ?= "9376" diff --git a/recipes/gnuradio/gnuradio/no-usrp2-svn.patch b/recipes/gnuradio/gnuradio/no-usrp2-svn.patch new file mode 100644 index 0000000000..d79b419c1a --- /dev/null +++ b/recipes/gnuradio/gnuradio/no-usrp2-svn.patch @@ -0,0 +1,12 @@ +--- gnuradio-trunk-work/configure.ac.orig 2008-10-06 13:38:45.000000000 -0400 ++++ gnuradio-trunk-work/configure.ac 2008-10-06 13:39:02.000000000 -0400 +@@ -317,9 +317,7 @@ + GRC_PMT + GRC_MBLOCK dnl this must come after GRC_PMT + GRC_USRP +-GRC_USRP2 + GRC_GR_USRP dnl this must come after GRC_USRP +-GRC_GR_USRP2 + GRC_GR_GCELL dnl this must come after GRC_GCELL and GRC_GNURADIO_CORE + GRC_GR_MSDD6000 + GRC_GR_AUDIO_ALSA diff --git a/recipes/gnuradio/gnuradio_svn.bb b/recipes/gnuradio/gnuradio_svn.bb index dc693b78de..d063e90088 100644 --- a/recipes/gnuradio/gnuradio_svn.bb +++ b/recipes/gnuradio/gnuradio_svn.bb @@ -4,24 +4,18 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += " gsl " -PV = "3.2.0+svnr${SRCREV}" +PV = "3.2.1+svnr${SRCREV}" PR = "${INC_PR}.1" EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable--usrp2" SRC_URI = "svn://gnuradio.org/svn/gnuradio/;module=trunk;proto=http \ - file://no-usrp2.patch;patch=1 \ - file://gnuradio-neon.patch;patch=1;pnum=0 \ + file://no-usrp2-svn.patch;patch=1 \ ${SOURCEFORGE_MIRROR}/libusb/libusb-0.1.12.tar.gz \ " S="${WORKDIR}/trunk" -#do_configure() { -# ./bootstrap -# oe_runconf -#} - do_compile_append() { sed -i -e s:${STAGING_DIR_TARGET}::g \ -e s:/${TARGET_SYS}::g \ |