########## for boost
package: bzip2-devel libicu-devel chrpath
-########## for gnuradio - we use our local boost, this is in gnuradio-DEPEND-DEVEL-RPMS in the makefile
+########## for gnuradio
+# we use our local boost, see gnuradio-DEPEND-DEVEL-RPMS in the makefile
+# again, with f11 we could use the stock boost rpm
+# package: boost-devel
package: python-numeric PyQt4 swig fftw sdcc gsl guile cppunit
package: fftw-devel gsl-devel libusb-devel cppunit-devel
# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
+boost-SVNPATH := http://svn.onelab.eu/boost/trunk
+gnuradio-SVNPATH := http://svn.onelab.eu/gnuradio/trunk
# trying the 2.6.27 kernel
linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk
madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-3878-0
-boost-SVNPATH := http://svn.onelab.eu/boost/trunk
-gnuradio-SVNPATH := http://svn.onelab.eu/gnuradio/trunk
util-vserver-SVNBRANCH := scholz
util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
# see doc in Makefile
#
+#
+# boost
+#
+# we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
+# this build is based on the f11 rpm, i.e. boost-1.37
+#
+boost-MODULES := boost
+boost-SPEC := boost.spec
+boost-BUILD-FROM-SRPM := yes
+ALL += boost
+IN_BOOTSTRAPFS += boost
+
+#
+# gnuradio
+#
+gnuradio-MODULES := gnuradio
+gnuradio-SPEC := gnuradio.spec
+gnuradio-BUILD-FROM-SRPM := yes
+# boost-devel needs boost !
+gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
+ALL += gnuradio
+IN_BOOTSTRAPFS += gnuradio
+
#
# kernel
#
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
-#
-# boost
-#
-boost-MODULES := boost
-boost-SPEC := boost.spec
-boost-BUILD-FROM-SRPM := yes
-ALL += boost
-IN_BOOTSTRAPFS += boost
-
-#
-# gnuradio
-#
-gnuradio-MODULES := gnuradio
-gnuradio-SPEC := gnuradio.spec
-gnuradio-BUILD-FROM-SRPM := yes
-gnuradio-DEPEND-DEVEL-RPMS := boost-devel
-ALL += gnuradio
-IN_BOOTSTRAPFS += gnuradio
-
#
# util-vserver
#