diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-07-06 12:11:17 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-07-06 12:11:17 +0000 |
| commit | a30cdd6862d387736390abf0a484985b4ba52673 (patch) | |
| tree | 78f51ce46d77fc2a78685e659230cedb58710259 /packages | |
| parent | 6ab1785d24a17b5220deeb14040ba7da5ac6a5bb (diff) | |
| parent | ae8ead4c8dc5faa6ca85f92fc0d919d3280757e6 (diff) | |
merge of 'd186ad540510a4f04ab08186965e402582c0b260'
and 'dabb7f768bbfa25e854f118a7221f3ec007f65ca'
Diffstat (limited to 'packages')
33 files changed, 2375 insertions, 353 deletions
diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb index 0b17aa6cb8..fc6c9c59ce 100644 --- a/packages/angstrom/angstrom-feed-configs.bb +++ b/packages/angstrom/angstrom-feed-configs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Configuration files for online package repositories aka feeds" #PV = "${DISTRO_VERSION}" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "${MACHINE_ARCH}" FEED_BASEPATH ?= "unstable/feed/" diff --git a/packages/boost/boost.inc b/packages/boost/boost.inc new file mode 100644 index 0000000000..4458f367a1 --- /dev/null +++ b/packages/boost/boost.inc @@ -0,0 +1,157 @@ +# The Boost web site provides free peer-reviewed portable +# C++ source libraries. The emphasis is on libraries which +# work well with the C++ Standard Library. The libraries are +# intended to be widely useful, and are in regular use by +# thousands of programmers across a broad spectrum of applications. +DESCRIPTION = "Free peer-reviewed portable C++ source libraries" +HOMEPAGE = "http://www.boost.org/" +SECTION = "libs" +DEPENDS = "boost-jam-native zlib" +PRIORITY = "optional" +LICENSE = "Boost Software License" +PR = "r1" + +BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" +BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" + +S = "${WORKDIR}/${BOOST_P}" + +# Make a package for each library, plus -dev and -python +PACKAGES = "${PN}-dbg" +BOOSTLIBS = "" + +PACKAGES += "boost-date-time" +FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}" + +BOOSTLIBS += "boost-filesystem" +FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}" + +BOOSTLIBS += "boost-prg-exec-monitor" +FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}" + +BOOSTLIBS += "boost-program-options" +FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}" + +BOOSTLIBS += "boost-regex" +FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}" + +BOOSTLIBS += "boost-signals" +FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}" + +BOOSTLIBS += "boost-test-exec-monitor" +FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}" + +BOOSTLIBS += "boost-thread-mt" +FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}" + +BOOSTLIBS += "boost-unit-test-framework" +FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}" + +BOOSTLIBS += "boost-iostreams" +FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}" + +BOOSTLIBS += "boost-serialization" +FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}" + +BOOSTLIBS += "boost-wserialization" +FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}" + +# Python - remove this and set: +#PYTHON_ROOT = "/dev/null" +# to remove the python build +DEPENDS += "python" +PYTHON_ROOT = "${STAGING_DIR_HOST}" +PYTHON_VERSION = "2.4" + +BOOSTLIBS += "boost-python" +FILES_boost-python = "${libdir}/libboost_python.so.${PV}" + +PACKAGES += "${BOOSTLIBS}" + +# -dev last to pick up the remaining stuff +PACKAGES += "${PN}-dev" +FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" + +# "boost" is a metapackage which pulls in all boost librabries +PACKAGES += "${PN}" +RRECOMMENDS_${PN} += "${BOOSTLIBS}" + +# Oh yippee, a new build system, it's sooo cooool I could eat my own +# foot. inlining=on lets the compiler choose, I think. At least this +# stuff is documented... +# NOTE: if you leave <debug-symbols>on then in a debug build the build sys +# objcopy will be invoked, and that won't work. Building debug apparently +# requires hacking gcc-tools.jam +# +# Sometimes I wake up screaming. Famous figures are gathered in the nightmare, +# Steve Bourne, Larry Wall, the whole of the ANSI C committee. They're just +# standing there, waiting, but the truely terrifying thing is what they carry +# in their hands. At first sight each seems to bear the same thing, but it is +# not so for the forms in their grasp are ever so slightly different one from +# the other. Each is twisted in some grotesque way from the other to make each +# an unspeakable perversion impossible to perceive without the onset of madness. +# True insanity awaits anyone who perceives all of these horrors together. +# +# Quotation marks, there might be an easier way to do this, but I can't find +# it. The problem is that the user.hpp configuration file must receive a +# pre-processor macro defined as the appropriate string - complete with "'s +# around it. (<> is a possibility here but the danger to that is that the +# failure case interprets the < and > as shell redirections, creating +# random files in the source tree.) +# +#bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"' +#do_compile: '-sGCC=... '"'-DBOOST_PLATFORM_CONFIG=\"config\"'" +SQD = '"' +EQD = '\"' +#boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..." +BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}" + +# bzip2 and zip are disabled because... they're broken - the compilation simply +# isn't working with bjam. I guess they will fix it, but who needs it? This +# only affects the (new in 33) iostream library. +BJAM_TOOLS = "-sTOOLS=gcc \ + '-sGCC=${CC} '${BJAM_CONF} \ + '-sGXX=${CXX} '${BJAM_CONF} \ + '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ + '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ + '-sNO_BZIP2=1' \ + '-sNO_ZLIB=1' \ + '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ + '-sPYTHON_VERSION=${PYTHON_VERSION}' \ + '--layout=system' \ + " + +BJAM_OPTS = '${BJAM_TOOLS} \ + --builddir=${S}/${TARGET_SYS} \ + --with-python-root=${PYTHON_ROOT} \ + ${BJAM_EXTRA}' + + +do_configure_prepend() { + cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp +} + +do_compile() { + set -ex + bjam ${BJAM_OPTS} --prefix=${prefix} \ + --exec-prefix=${exec_prefix} \ + --libdir=${libdir} \ + --includedir=${includedir} +} + +do_stage() { + set -ex + bjam ${BJAM_OPTS} \ + --libdir=${STAGING_LIBDIR} \ + --includedir=${STAGING_INCDIR} \ + install +} + +do_install() { + set -ex + bjam ${BJAM_OPTS} \ + --libdir=${D}${libdir} \ + --includedir=${D}${includedir} \ + install +} diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb index 441c0754b3..f910924cf1 100644 --- a/packages/boost/boost_1.33.0.bb +++ b/packages/boost/boost_1.33.0.bb @@ -1,160 +1,6 @@ -# The Boost web site provides free peer-reviewed portable -# C++ source libraries. The emphasis is on libraries which -# work well with the C++ Standard Library. The libraries are -# intended to be widely useful, and are in regular use by -# thousands of programmers across a broad spectrum of applications. -DESCRIPTION = "Free peer-reviewed portable C++ source libraries" -HOMEPAGE = "http://www.boost.org/" -SECTION = "libs" -DEPENDS = "boost-jam-native zlib" -PRIORITY = "optional" -LICENSE = "Boost Software License" -PR = "r1" +include boost.inc -BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" -BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" -BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" #SRC_URI += "file://unit_test_log10f.patch;patch=1" SRC_URI += "file://linux-uclibc.patch;patch=1" -S = "${WORKDIR}/${BOOST_P}" - -# Make a package for each library, plus -dev and -python -PACKAGES = "${PN}-dbg" -BOOSTLIBS = "" - -PACKAGES += "boost-date-time" -FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}" - -BOOSTLIBS += "boost-filesystem" -FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}" - -BOOSTLIBS += "boost-prg-exec-monitor" -FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}" - -BOOSTLIBS += "boost-program-options" -FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}" - -BOOSTLIBS += "boost-regex" -FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}" - -BOOSTLIBS += "boost-signals" -FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}" - -BOOSTLIBS += "boost-test-exec-monitor" -FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}" - -BOOSTLIBS += "boost-thread-mt" -FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}" - -BOOSTLIBS += "boost-unit-test-framework" -FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}" - -BOOSTLIBS += "boost-iostreams" -FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}" - -BOOSTLIBS += "boost-serialization" -FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}" - -BOOSTLIBS += "boost-wserialization" -FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}" - -# Python - remove this and set: -#PYTHON_ROOT = "/dev/null" -# to remove the python build -DEPENDS += "python" -PYTHON_ROOT = "${STAGING_DIR_HOST}" -PYTHON_VERSION = "2.4" - -BOOSTLIBS += "boost-python" -FILES_boost-python = "${libdir}/libboost_python.so.${PV}" - -PACKAGES += "${BOOSTLIBS}" - -# -dev last to pick up the remaining stuff -PACKAGES += "${PN}-dev" -FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" - -# "boost" is a metapackage which pulls in all boost librabries -PACKAGES += "${PN}" -RRECOMMENDS_${PN} += "${BOOSTLIBS}" - -# Oh yippee, a new build system, it's sooo cooool I could eat my own -# foot. inlining=on lets the compiler choose, I think. At least this -# stuff is documented... -# NOTE: if you leave <debug-symbols>on then in a debug build the build sys -# objcopy will be invoked, and that won't work. Building debug apparently -# requires hacking gcc-tools.jam -# -# Sometimes I wake up screaming. Famous figures are gathered in the nightmare, -# Steve Bourne, Larry Wall, the whole of the ANSI C committee. They're just -# standing there, waiting, but the truely terrifying thing is what they carry -# in their hands. At first sight each seems to bear the same thing, but it is -# not so for the forms in their grasp are ever so slightly different one from -# the other. Each is twisted in some grotesque way from the other to make each -# an unspeakable perversion impossible to perceive without the onset of madness. -# True insanity awaits anyone who perceives all of these horrors together. -# -# Quotation marks, there might be an easier way to do this, but I can't find -# it. The problem is that the user.hpp configuration file must receive a -# pre-processor macro defined as the appropriate string - complete with "'s -# around it. (<> is a possibility here but the danger to that is that the -# failure case interprets the < and > as shell redirections, creating -# random files in the source tree.) -# -#bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"' -#do_compile: '-sGCC=... '"'-DBOOST_PLATFORM_CONFIG=\"config\"'" -SQD = '"' -EQD = '\"' -#boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..." -BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}" - -# bzip2 and zip are disabled because... they're broken - the compilation simply -# isn't working with bjam. I guess they will fix it, but who needs it? This -# only affects the (new in 33) iostream library. -BJAM_TOOLS = "-sTOOLS=gcc \ - '-sGCC=${CC} '${BJAM_CONF} \ - '-sGXX=${CXX} '${BJAM_CONF} \ - '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ - '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ - '-sNO_BZIP2=1' \ - '-sNO_ZLIB=1' \ - '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ - '-sPYTHON_VERSION=${PYTHON_VERSION}' \ - '--layout=system' \ - " - -BJAM_OPTS = '${BJAM_TOOLS} \ - --builddir=${S}/${TARGET_SYS} \ - --with-python-root=${PYTHON_ROOT} \ - ${BJAM_EXTRA}' - - -do_configure_prepend() { - cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp -} - -do_compile() { - set -ex - bjam ${BJAM_OPTS} --prefix=${prefix} \ - --exec-prefix=${exec_prefix} \ - --libdir=${libdir} \ - --includedir=${includedir} -} - -do_stage() { - set -ex - bjam ${BJAM_OPTS} \ - --libdir=${STAGING_LIBDIR} \ - --includedir=${STAGING_INCDIR} \ - install -} - -do_install() { - set -ex - bjam ${BJAM_OPTS} \ - --libdir=${D}${libdir} \ - --includedir=${D}${includedir} \ - install -} diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb index 6632f6c8ea..c08721dc9f 100644 --- a/packages/boost/boost_1.33.1.bb +++ b/packages/boost/boost_1.33.1.bb @@ -1,161 +1,9 @@ -# The Boost web site provides free peer-reviewed portable -# C++ source libraries. The emphasis is on libraries which -# work well with the C++ Standard Library. The libraries are -# intended to be widely useful, and are in regular use by -# thousands of programmers across a broad spectrum of applications. -DESCRIPTION = "Free peer-reviewed portable C++ source libraries" -HOMEPAGE = "http://www.boost.org/" -SECTION = "libs" -DEPENDS = "boost-jam-native zlib" -PRIORITY = "optional" -LICENSE = "Boost Software License" +include boost.inc + PR = "r1" -BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" -BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" -BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" #SRC_URI += "file://unit_test_log10f.patch;patch=1" SRC_URI += "file://linux-uclibc.patch;patch=1" SRC_URI += "file://atomic_count_gcc_atomicity.patch;patch=1" - -S = "${WORKDIR}/${BOOST_P}" - -# Make a package for each library, plus -dev and -python -PACKAGES = "${PN}-dbg" -BOOSTLIBS = "" - -PACKAGES += "boost-date-time" -FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}" - -BOOSTLIBS += "boost-filesystem" -FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}" - -BOOSTLIBS += "boost-prg-exec-monitor" -FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}" - -BOOSTLIBS += "boost-program-options" -FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}" - -BOOSTLIBS += "boost-regex" -FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}" - -BOOSTLIBS += "boost-signals" -FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}" - -BOOSTLIBS += "boost-test-exec-monitor" -FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}" - -BOOSTLIBS += "boost-thread-mt" -FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}" - -BOOSTLIBS += "boost-unit-test-framework" -FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}" - -BOOSTLIBS += "boost-iostreams" -FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}" - -BOOSTLIBS += "boost-serialization" -FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}" - -BOOSTLIBS += "boost-wserialization" -FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}" - -# Python - remove this and set: -#PYTHON_ROOT = "/dev/null" -# to remove the python build -DEPENDS += "python" -PYTHON_ROOT = "${STAGING_DIR_HOST}" -PYTHON_VERSION = "2.4" - -BOOSTLIBS += "boost-python" -FILES_boost-python = "${libdir}/libboost_python.so.${PV}" - -PACKAGES += "${BOOSTLIBS}" - -# -dev last to pick up the remaining stuff -PACKAGES += "${PN}-dev" -FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" - -# "boost" is a metapackage which pulls in all boost librabries -PACKAGES += "${PN}" -RRECOMMENDS_${PN} += "${BOOSTLIBS}" - -# Oh yippee, a new build system, it's sooo cooool I could eat my own -# foot. inlining=on lets the compiler choose, I think. At least this -# stuff is documented... -# NOTE: if you leave <debug-symbols>on then in a debug build the build sys -# objcopy will be invoked, and that won't work. Building debug apparently -# requires hacking gcc-tools.jam -# -# Sometimes I wake up screaming. Famous figures are gathered in the nightmare, -# Steve Bourne, Larry Wall, the whole of the ANSI C committee. They're just -# standing there, waiting, but the truely terrifying thing is what they carry -# in their hands. At first sight each seems to bear the same thing, but it is -# not so for the forms in their grasp are ever so slightly different one from -# the other. Each is twisted in some grotesque way from the other to make each -# an unspeakable perversion impossible to perceive without the onset of madness. -# True insanity awaits anyone who perceives all of these horrors together. -# -# Quotation marks, there might be an easier way to do this, but I can't find -# it. The problem is that the user.hpp configuration file must receive a -# pre-processor macro defined as the appropriate string - complete with "'s -# around it. (<> is a possibility here but the danger to that is that the -# failure case interprets the < and > as shell redirections, creating -# random files in the source tree.) -# -#bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"' -#do_compile: '-sGCC=... '"'-DBOOST_PLATFORM_CONFIG=\"config\"'" -SQD = '"' -EQD = '\"' -#boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..." -BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}" - -# bzip2 and zip are disabled because... they're broken - the compilation simply -# isn't working with bjam. I guess they will fix it, but who needs it? This -# only affects the (new in 33) iostream library. -BJAM_TOOLS = "-sTOOLS=gcc \ - '-sGCC=${CC} '${BJAM_CONF} \ - '-sGXX=${CXX} '${BJAM_CONF} \ - '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ - '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ - '-sNO_BZIP2=1' \ - '-sNO_ZLIB=1' \ - '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ - '-sPYTHON_VERSION=${PYTHON_VERSION}' \ - '--layout=system' \ - " - -BJAM_OPTS = '${BJAM_TOOLS} \ - --builddir=${S}/${TARGET_SYS} \ - --with-python-root=${PYTHON_ROOT} \ - ${BJAM_EXTRA}' - - -do_configure_prepend() { - cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp -} - -do_compile() { - set -ex - bjam ${BJAM_OPTS} --prefix=${prefix} \ - --exec-prefix=${exec_prefix} \ - --libdir=${libdir} \ - --includedir=${includedir} -} - -do_stage() { - set -ex - bjam ${BJAM_OPTS} \ - --libdir=${STAGING_LIBDIR} \ - --includedir=${STAGING_INCDIR} \ - install -} - -do_install() { - set -ex - bjam ${BJAM_OPTS} \ - --libdir=${D}${libdir} \ - --includedir=${D}${includedir} \ - install -} +SRC_URI += "file://gcc43.patch;patch=1" diff --git a/packages/boost/files/gcc43.patch b/packages/boost/files/gcc43.patch new file mode 100644 index 0000000000..aefe0800c3 --- /dev/null +++ b/packages/boost/files/gcc43.patch @@ -0,0 +1,256 @@ +diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp +--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp 2005-12-11 00:12:51.000000000 -0600 ++++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -17,6 +17,7 @@ + // See http://www.boost.org for updates, documentation, and revision history. + + #include <cstddef> // std::size_t ++#include <climits> + #include <boost/config.hpp> + + #if defined(BOOST_NO_STDC_NAMESPACE) +diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp boost_1_34_1/boost/archive/polymorphic_oarchive.hpp +--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp 2006-02-11 23:43:06.000000000 -0600 ++++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -17,6 +17,7 @@ + // See http://www.boost.org for updates, documentation, and revision history. + + #include <cstddef> // size_t ++#include <climits> + #include <string> + + #include <boost/config.hpp> +diff -aNru boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp boost_1_34_1/boost/date_time/date_facet.hpp +--- boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp 2005-09-05 16:10:50.000000000 -0500 ++++ boost_1_34_1/boost/date_time/date_facet.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -429,7 +429,7 @@ + typedef std::basic_string<CharT> string_type; + typedef CharT char_type; + typedef boost::date_time::period_parser<date_type, CharT> period_parser_type; +- typedef special_values_parser<date_type,CharT> special_values_parser_type; ++ typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type; + typedef std::vector<std::basic_string<CharT> > input_collection_type; + typedef format_date_parser<date_type, CharT> format_date_parser_type; + // date_generators stuff goes here +diff -aNru boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp boost_1_34_1/boost/mpl/zip_view.hpp +--- boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp 2004-09-02 10:40:42.000000000 -0500 ++++ boost_1_34_1/boost/mpl/zip_view.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -37,7 +37,7 @@ + typedef zip_iterator< + typename transform1< + IteratorSeq +- , next<_1> ++ , boost::mpl::next<_1> + >::type + > next; + }; +@@ -48,8 +48,8 @@ + struct zip_view + { + private: +- typedef typename transform1< Sequences, begin<_1> >::type first_ones_; +- typedef typename transform1< Sequences, end<_1> >::type last_ones_; ++ typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_; ++ typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_; + + public: + typedef nested_begin_end_tag tag; +diff -aNru boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp boost_1_34_1/boost/python/detail/def_helper.hpp +--- boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp 2004-09-15 20:00:28.000000000 -0500 ++++ boost_1_34_1/boost/python/detail/def_helper.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -155,7 +155,7 @@ + , T3 const& + , T4 const& + , default_call_policies +- , keywords<0> ++ , boost::python::detail::keywords<0> + , char const* + , void(not_specified::*)() // A function pointer type which is never an + // appropriate default implementation +diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp +--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp 2006-07-16 11:06:38.000000000 -0500 ++++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -24,6 +24,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + + namespace re_detail{ +diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp boost_1_34_1/boost/regex/v4/basic_regex.hpp +--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp 2007-06-05 12:28:18.000000000 -0500 ++++ boost_1_34_1/boost/regex/v4/basic_regex.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -23,6 +23,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + #ifdef BOOST_MSVC + #pragma warning(push) +diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp +--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp 2006-12-20 11:19:05.000000000 -0600 ++++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -23,6 +23,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + namespace re_detail{ + +diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp +--- boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15 05:09:44.000000000 -0600 ++++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -41,6 +41,7 @@ + + #include <istream> + #include <ios> ++#include <climits> + + #ifdef BOOST_HAS_ABI_HEADERS + # include BOOST_ABI_PREFIX +diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp boost_1_34_1/boost/regex/v4/perl_matcher.hpp +--- boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp 2006-10-18 07:55:30.000000000 -0500 ++++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -18,6 +18,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + namespace re_detail{ + +diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp boost_1_34_1/boost/regex/v4/regex_split.hpp +--- boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp 2005-01-21 11:22:38.000000000 -0600 ++++ boost_1_34_1/boost/regex/v4/regex_split.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -21,6 +21,8 @@ + #ifndef BOOST_REGEX_SPLIT_HPP + #define BOOST_REGEX_SPLIT_HPP + ++#include <climits> ++ + namespace boost{ + + #ifdef BOOST_HAS_ABI_HEADERS +diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp boost_1_34_1/boost/regex/v4/states.hpp +--- boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp 2005-09-20 07:01:25.000000000 -0500 ++++ boost_1_34_1/boost/regex/v4/states.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -23,6 +23,8 @@ + # include BOOST_ABI_PREFIX + #endif + ++#include <climits> ++ + namespace boost{ + namespace re_detail{ + +diff -aNru boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp boost_1_34_1/boost/serialization/collection_traits.hpp +--- boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp 2005-06-21 00:19:04.000000000 -0500 ++++ boost_1_34_1/boost/serialization/collection_traits.hpp 2008-03-03 03:09:49.000000000 -0600 +@@ -22,6 +22,7 @@ + // compiles recognize the same set of primitive types, the possibility + // exists for archives to be non-portable if class information for primitive + // types is included. This is addressed by the following macros. ++#include <climits> + #include <boost/config.hpp> + #include <boost/mpl/integral_c.hpp> + #include <boost/mpl/integral_c_tag.hpp> +diff -aNru boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp boost_1_34_1/boost/spirit/phoenix/operators.hpp +--- boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp 2006-08-25 11:27:30.000000000 -0500 ++++ boost_1_34_1/boost/spirit/phoenix/operators.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -24,6 +24,7 @@ + #include <boost/spirit/phoenix/composite.hpp> + #include <boost/config.hpp> + #include <boost/mpl/if.hpp> ++#include <climits> + + /////////////////////////////////////////////////////////////////////////////// + namespace phoenix { +diff -aNru boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp boost_1_34_1/boost/test/test_tools.hpp +--- boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp 2007-02-22 11:57:29.000000000 -0600 ++++ boost_1_34_1/boost/test/test_tools.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -42,6 +42,7 @@ + #include <boost/mpl/or.hpp> + + // STL ++#include <climits> + #include <cstddef> // for std::size_t + #include <iosfwd> + +diff -aNru boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp +--- boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 10:38:24.000000000 -0600 ++++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -16,6 +16,7 @@ + #include <string> + #include <cstdio> + #include <cstdarg> ++#include <cstring> + #if defined(BOOST_SPIRIT_DEBUG) + #include <iostream> + #endif // defined(BOOST_SPIRIT_DEBUG) +diff -aNru boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp boost_1_34_1/boost/wave/util/flex_string.hpp +--- boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp 2006-04-25 12:21:01.000000000 -0500 ++++ boost_1_34_1/boost/wave/util/flex_string.hpp 2008-03-03 03:08:59.000000000 -0600 +@@ -94,6 +94,7 @@ + #include <limits> + #include <stdexcept> + #include <cstddef> ++#include <cstring> + + // this must occur after all of the includes and before any code appears + #ifdef BOOST_HAS_ABI_HEADERS + +--- boost_1_33_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-07-05 01:50:04.000000000 +0200 ++++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 17:38:24.000000000 +0100 +@@ -295,17 +325,20 @@ + + lex_functor(IteratorT const &first, IteratorT const &last, + PositionT const &pos, boost::wave::language_support language) +- : lexer(first, last, pos, language) ++ : re2c_lexer(first, last, pos, language) + {} + virtual ~lex_functor() {} + + // get the next token from the input stream +- token_type get() { return lexer.get(); } +- void set_position(PositionT const &pos) +- { lexer.set_position(pos); } ++ token_type get() { return re2c_lexer.get(); } ++ void set_position(PositionT const &pos) { re2c_lexer.set_position(pos); } ++#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0 ++ bool has_include_guards(std::string& guard_name) const ++ { return re2c_lexer.has_include_guards(guard_name); } ++#endif + + private: +- lexer<IteratorT, PositionT> lexer; ++ lexer<IteratorT, PositionT> re2c_lexer; + }; + + /////////////////////////////////////////////////////////////////////////////// +@@ -338,7 +371,7 @@ + // It is coupled to the iterator type to allow to decouple the lexer/iterator + // configurations at compile time. + // +-// This function is declared inside the cpp_slex_token.hpp file, which is ++// This function is declared inside the cpp_lex_token.hpp file, which is + // referenced by the source file calling the lexer and the source file, which + // instantiates the lex_functor. But is is defined here, so it will be + // instantiated only while compiling the source file, which instantiates the +@@ -356,8 +389,8 @@ + IteratorT const &last, PositionT const &pos, + boost::wave::language_support language) + { +- return new re2clex::lex_functor<IteratorT, PositionT>(first, last, pos, +- language); ++ using re2clex::lex_functor; ++ return new lex_functor<IteratorT, PositionT>(first, last, pos, language); + } + + #undef BOOST_WAVE_RE2C_NEW_LEXER_INLINE diff --git a/packages/dasher/dasher-gpe_0.0cvs20040828.bb b/packages/dasher/dasher-gpe_0.0-svn.bb index 7e515feae7..297aa9ac4f 100644 --- a/packages/dasher/dasher-gpe_0.0cvs20040828.bb +++ b/packages/dasher/dasher-gpe_0.0-svn.bb @@ -1,12 +1,12 @@ - LICENSE="GPL" +PV = "0.0+svnr${SRCREV}" PR = "r1" DEPENDS = "libxsettings-client libglade libxtst gconf gtk+" SECTION = "gpe" -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=dasher;date=20040828 \ +SRC_URI = "svn://svn.gnome.org/svn/dasher;module=trunk \ file://configure-lossage.patch;patch=1" -S = "${WORKDIR}/dasher" +S = "${WORKDIR}/trunk" FILES_${PN} += "${datadir}/dasher" inherit autotools diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb index 826f201779..960d10ad31 100644 --- a/packages/efl1/emotion_cvs.bb +++ b/packages/efl1/emotion_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Enlightenment multimedia library" LICENSE = "MIT BSD" # we no longer build the libxine backend, since the gstreamer backend seems more promising -DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" +DEPENDS = "libxcursor libxinerama eet evas ecore edje gstreamer gst-plugins-base" PV = "0.1.0+cvs${SRCDATE}" PR = "r1" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 5069ea19e2..8ee658c286 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r6" +PR = "r7" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/gnash/files/.mtn2git_empty b/packages/gnash/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnash/files/.mtn2git_empty diff --git a/packages/gnash/files/libtool-2.2.patch b/packages/gnash/files/libtool-2.2.patch new file mode 100644 index 0000000000..f0ec274104 --- /dev/null +++ b/packages/gnash/files/libtool-2.2.patch @@ -0,0 +1,35 @@ +diff -NrU5 gnash-0.8.3.orig/libbase/Makefile.am gnash-0.8.3/libbase/Makefile.am +--- gnash-0.8.3.orig/libbase/Makefile.am 2008-06-26 22:56:12.000000000 +0200 ++++ gnash-0.8.3/libbase/Makefile.am 2008-06-26 22:57:48.000000000 +0200 +@@ -19,13 +19,13 @@ + + # this is where Gnash plugins get installed + pluginsdir = $(prefix)/lib/gnash/plugins + + if INSTALL_LTDL +-include_HEADERS = $(top_srcdir)/libltdl/ltdl.h +-LIBLTDLLIB = libltdl.la +-LIBLTDLHEAD = $(top_srcdir)/libltdl/ltdl.h ++#include_HEADERS = $(top_srcdir)/libltdl/ltdl.h ++#LIBLTDLLIB = libltdl.la ++#LIBLTDLHEAD = $(top_srcdir)/libltdl/ltdl.h + endif + + sysconf_DATA = gnashrc gnashpluginrc + + edit = sed \ +@@ -174,12 +174,12 @@ + + libgnashbase_la_LDFLAGS = -release $(VERSION) + + libltdlc_la_CPPFLAGS = $(LTDLINCL) + if CONVENIENCE_LTDL +-noinst_LTLIBRARIES = libltdlc.la +-libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c ++#noinst_LTLIBRARIES = libltdlc.la ++#libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c + endif + CLEANFILES = libltdl.la libltdlc.la gnashrc gnashpluginrc + + libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c + libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1 diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index 06b4b9c6ec..1cd3bc9991 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -1,8 +1,7 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "agg libxml2 libmad zlib boost jpeg pango curl freetype" -PR = "r5" +DEPENDS = "libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" S = ${WORKDIR}/gnash-${PV} @@ -43,11 +42,13 @@ EXTRA_OECONF="--enable-gui=gtk \ # detection because uclibc does not have argz.h which enables error_t CFLAGS += " -D_GNU_SOURCE " -PACKAGES =+ " libgnashamf libgnashbase libgnashserver libgnashmedia libltdl" +PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia libltdl" +FILES_${PN}-dbg += "${libdir}/gnash/.debug" +FILES_${PN}-dev += "${libdir}/gnash/*a" FILES_libltdl = "${libdir}/gnash/libltdl*.so*" FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so" FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so" - +FILES_libgnashnet = "${libdir}/gnash/libgnashnet.so.*" diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb new file mode 100644 index 0000000000..b5bcf29683 --- /dev/null +++ b/packages/gnash/gnash-minimal_0.8.3.bb @@ -0,0 +1,12 @@ +require gnash-minimal.inc + +PR = "r6" + +EXTRA_OECONF += " --without-included-ltdl \ + --with-ltdl-include=${STAGING_INCDIR} \ + --with-ltdl-lib=${STAGING_LIBDIR} \ +" + +SRC_URI += "file://libtool-2.2.patch;patch=1" + + diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index 31e84b84ac..ce66beec45 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" +DEPENDS = "libtool gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" PR = "r1" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb index 383f970755..cc8de96995 100644 --- a/packages/gnash/gnash_0.8.3.bb +++ b/packages/gnash/gnash_0.8.3.bb @@ -1,6 +1,11 @@ require gnash.inc -do_configure() { - gnu-configize - oe_runconf -} +PR = "r2" + +EXTRA_OECONF += " --without-included-ltdl \ + --with-ltdl-include=${STAGING_INCDIR} \ + --with-ltdl-lib=${STAGING_LIBDIR} \ +" + +SRC_URI += "file://libtool-2.2.patch;patch=1" + diff --git a/packages/gnuradio/gnuradio-3.1.2/gcc43.patch b/packages/gnuradio/gnuradio-3.1.2/gcc43.patch new file mode 100644 index 0000000000..e9e3aa4a80 --- /dev/null +++ b/packages/gnuradio/gnuradio-3.1.2/gcc43.patch @@ -0,0 +1,900 @@ +Index: gnuradio/trunk/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc (revision 8292) +@@ -39,4 +39,5 @@ + + #include <iostream> ++#include <string.h> + + gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector<gr_complex> &taps) +Index: gnuradio/trunk/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc (revision 8292) +@@ -34,4 +34,5 @@ + + #include <iostream> ++#include <string.h> + + gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps) +Index: gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc (revision 6574) ++++ gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc (revision 8292) +@@ -48,4 +48,5 @@ + #include <random.h> + #include <malloc16.h> ++#include <string.h> + + using std::vector; +Index: gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc (revision 6574) ++++ gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc (revision 8292) +@@ -48,4 +48,5 @@ + #include <random.h> + #include <malloc16.h> ++#include <string.h> + + using std::vector; +Index: gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc (revision 6574) ++++ gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc (revision 8292) +@@ -47,4 +47,5 @@ + #include <cppunit/TestAssert.h> + #include <random.h> ++#include <string.h> + + using std::vector; +Index: gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc (revision 8292) +@@ -33,4 +33,5 @@ + #include <cppunit/TestAssert.h> + #include <random.h> ++#include <string.h> + + using std::vector; +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc (revision 8292) +@@ -29,4 +29,5 @@ + #include <assert.h> + #include <stdexcept> ++#include <string.h> + + //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_bin_statistics_f.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_bin_statistics_f_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_circular_file.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_circular_file.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_circular_file.cc (revision 8292) +@@ -40,4 +40,6 @@ + + #include <algorithm> ++#include <stdio.h> ++#include <string.h> + + static const int HEADER_SIZE = 4096; +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_delay.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_delay.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_delay.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_delay.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_delay_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc (revision 8292) +@@ -29,4 +29,5 @@ + #include <string.h> + #include <stdexcept> ++#include <string.h> + + static const int PAD_VAL = 0xAA; +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vcc.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vcc.cc (revision 8244) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vcc.cc (revision 8292) +@@ -30,4 +30,5 @@ + #include <gri_fft.h> + #include <math.h> ++#include <string.h> + + gr_fft_vcc_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vfc.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vfc.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vfc.cc (revision 8292) +@@ -30,4 +30,5 @@ + #include <math.h> + #include <stdexcept> ++#include <string.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_framer_sink_1.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_framer_sink_1.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_framer_sink_1.cc (revision 8292) +@@ -29,4 +29,5 @@ + #include <cstdio> + #include <stdexcept> ++#include <string.h> + + #define VERBOSE 0 +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_head.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_head.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_head.cc (revision 8292) +@@ -26,4 +26,5 @@ + #include <gr_head.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_head::gr_head (size_t sizeof_stream_item, int nitems) +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_keep_one_in_n.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_keep_one_in_n_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_log2_const.h +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_log2_const.h (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_log2_const.h (revision 8292) +@@ -32,15 +32,15 @@ + template<unsigned int k> static inline int gr_log2_const() { assert(0); return 0; } + +-template<> static inline int gr_log2_const<1>() { return 0; } +-template<> static inline int gr_log2_const<2>() { return 1; } +-template<> static inline int gr_log2_const<4>() { return 2; } +-template<> static inline int gr_log2_const<8>() { return 3; } +-template<> static inline int gr_log2_const<16>() { return 4; } +-template<> static inline int gr_log2_const<32>() { return 5; } +-template<> static inline int gr_log2_const<64>() { return 6; } +-template<> static inline int gr_log2_const<128>() { return 7; } +-template<> static inline int gr_log2_const<256>() { return 8; } +-template<> static inline int gr_log2_const<512>() { return 9; } +-template<> static inline int gr_log2_const<1024>(){ return 10; } ++template<> inline int gr_log2_const<1>() { return 0; } ++template<> inline int gr_log2_const<2>() { return 1; } ++template<> inline int gr_log2_const<4>() { return 2; } ++template<> inline int gr_log2_const<8>() { return 3; } ++template<> inline int gr_log2_const<16>() { return 4; } ++template<> inline int gr_log2_const<32>() { return 5; } ++template<> inline int gr_log2_const<64>() { return 6; } ++template<> inline int gr_log2_const<128>() { return 7; } ++template<> inline int gr_log2_const<256>() { return 8; } ++template<> inline int gr_log2_const<512>() { return 9; } ++template<> inline int gr_log2_const<1024>(){ return 10; } + + #endif /* INCLUDED_GR_LOG2_CONST_H */ +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_null_source.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_null_source.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_null_source.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_null_source.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_null_source::gr_null_source (size_t sizeof_stream_item) +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_packet_sink.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_packet_sink.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_packet_sink.cc (revision 8292) +@@ -34,4 +34,5 @@ + #include <stdexcept> + #include <gr_count_bits.h> ++#include <string.h> + + #define VERBOSE 0 +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc (revision 7324) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_peak_detector2_fb.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_peak_detector2_fb_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_simple_correlator.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_simple_correlator.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_simple_correlator.cc (revision 8292) +@@ -31,4 +31,5 @@ + #include <stdexcept> + #include <gr_count_bits.h> ++#include <string.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_simple_framer.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_simple_framer.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_simple_framer.cc (revision 8292) +@@ -30,4 +30,5 @@ + #include <assert.h> + #include <stdexcept> ++#include <string.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_skiphead.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_skiphead.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_skiphead.cc (revision 8292) +@@ -26,4 +26,5 @@ + #include <gr_skiphead.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_skiphead::gr_skiphead (size_t itemsize, size_t nitems_to_skip) +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_stream_mux.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_stream_mux.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_stream_mux.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_stream_mux.h> + #include <gr_io_signature.h> ++#include <string.h> + + #define VERBOSE 0 +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_stream_to_streams.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_stream_to_streams.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_stream_to_streams.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_stream_to_streams.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_stream_to_streams_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_stream_to_vector.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_stream_to_vector.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_stream_to_vector.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_stream_to_vector.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_stream_to_vector_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_streams_to_stream.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_streams_to_stream.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_streams_to_stream.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_streams_to_stream.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_streams_to_stream_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_streams_to_vector.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_streams_to_vector.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_streams_to_vector.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_streams_to_vector.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_streams_to_vector_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_test.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_test.cc (revision 7847) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_test.cc (revision 8292) +@@ -29,4 +29,5 @@ + #include <stdexcept> + #include <iostream> ++#include <string.h> + + gr_test_sptr gr_make_test (const std::string &name, +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_throttle.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_throttle.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_throttle.cc (revision 8292) +@@ -30,4 +30,5 @@ + #include <stdio.h> + #include <math.h> ++#include <string.h> + #ifdef HAVE_TIME_H + #include <time.h> +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_vector_to_stream.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_vector_to_stream.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_vector_to_stream.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_vector_to_stream.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_vector_to_stream_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/gr_vector_to_streams.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_vector_to_streams.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_vector_to_streams.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_vector_to_streams.h> + #include <gr_io_signature.h> ++#include <string.h> + + gr_vector_to_streams_sptr +Index: gnuradio/trunk/gnuradio-core/src/lib/general/malloc16.c +=================================================================== +--- import/gnuradio-savannah-20060726/trunk/gnuradio-core/src/lib/general/malloc16.c (revision 1313) ++++ gnuradio/trunk/gnuradio-core/src/lib/general/malloc16.c (revision 8292) +@@ -8,4 +8,5 @@ + #include "malloc16.h" + #include <string.h> ++#include <strings.h> + + void *malloc16Align(int size){ +Index: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t (revision 8292) +@@ -31,4 +31,5 @@ + #include <assert.h> + #include <iostream> ++#include <string.h> + + @SPTR_NAME@ +Index: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t (revision 7587) ++++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t (revision 8292) +@@ -29,4 +29,5 @@ + #include <@NAME@.h> + #include <gr_io_signature.h> ++#include <string.h> + + @SPTR_NAME@ +Index: gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc (revision 8292) +@@ -33,4 +33,5 @@ + #include <fcntl.h> + #include <stdexcept> ++#include <stdio.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc (revision 8292) +@@ -33,4 +33,6 @@ + #include <fcntl.h> + #include <stdexcept> ++#include <stdio.h> ++#include <string.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_sink_base.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_sink_base.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_sink_base.cc (revision 8292) +@@ -31,4 +31,5 @@ + #include <fcntl.h> + #include <stdexcept> ++#include <stdio.h> + + // win32 (mingw/msvc) specific +Index: gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_source.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_source.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_source.cc (revision 8292) +@@ -32,4 +32,5 @@ + #include <fcntl.h> + #include <stdexcept> ++#include <stdio.h> + + // win32 (mingw/msvc) specific +Index: gnuradio/trunk/gnuradio-core/src/lib/io/gr_message_sink.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_message_sink.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_message_sink.cc (revision 8292) +@@ -33,4 +33,5 @@ + #include <fcntl.h> + #include <stdexcept> ++#include <string.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/io/gr_message_source.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_message_source.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_message_source.cc (revision 8292) +@@ -33,4 +33,5 @@ + #include <fcntl.h> + #include <stdexcept> ++#include <string.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc (revision 8097) ++++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc (revision 8292) +@@ -29,4 +29,5 @@ + #if defined(HAVE_SOCKET) + #include <netdb.h> ++#include <stdio.h> + typedef void* optval_t; + #else +Index: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.cc (revision 8097) ++++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.cc (revision 8292) +@@ -28,4 +28,6 @@ + #include <stdexcept> + #include <errno.h> ++#include <stdio.h> ++#include <string.h> + #if defined(HAVE_SOCKET) + #include <netdb.h> +Index: gnuradio/trunk/gnuradio-core/src/lib/io/gri_logger.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/io/gri_logger.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/io/gri_logger.cc (revision 8292) +@@ -30,4 +30,5 @@ + #include <stdexcept> + #include <boost/weak_ptr.hpp> ++#include <string.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/reed-solomon/decode_rs.c +=================================================================== +--- import/gnuradio-savannah-20060726/trunk/gnuradio-core/src/lib/reed-solomon/decode_rs.c (revision 605) ++++ gnuradio/trunk/gnuradio-core/src/lib/reed-solomon/decode_rs.c (revision 8292) +@@ -9,4 +9,5 @@ + + #include <string.h> ++#include <strings.h> + + #define NULL ((void *)0) +Index: gnuradio/trunk/gnuradio-core/src/lib/reed-solomon/encode_rs.c +=================================================================== +--- import/gnuradio-savannah-20060726/trunk/gnuradio-core/src/lib/reed-solomon/encode_rs.c (revision 605) ++++ gnuradio/trunk/gnuradio-core/src/lib/reed-solomon/encode_rs.c (revision 8292) +@@ -4,4 +4,5 @@ + */ + #include <string.h> ++#include <strings.h> + + #ifdef FIXED +Index: gnuradio/trunk/gnuradio-core/src/lib/reed-solomon/exercise.c +=================================================================== +--- import/gnuradio-savannah-20060726/trunk/gnuradio-core/src/lib/reed-solomon/exercise.c (revision 605) ++++ gnuradio/trunk/gnuradio-core/src/lib/reed-solomon/exercise.c (revision 8292) +@@ -14,4 +14,5 @@ + #include <stdlib.h> + #include <string.h> ++#include <strings.h> + + #ifdef FIXED +Index: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_dispatcher.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_dispatcher.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_dispatcher.cc (revision 8292) +@@ -28,4 +28,5 @@ + #include <math.h> + #include <errno.h> ++#include <stdio.h> + + #ifdef HAVE_SELECT +Index: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_error_handler.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_error_handler.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_error_handler.cc (revision 8292) +@@ -49,4 +49,5 @@ + #include <stdexcept> + #include <unistd.h> ++#include <stdio.h> + + #ifdef HAVE_IO_H +Index: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc (revision 8292) +@@ -28,4 +28,5 @@ + #include <stdexcept> + #include <stdio.h> ++#include <string.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_message.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_message.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_message.cc (revision 8292) +@@ -26,4 +26,5 @@ + #include <gr_message.h> + #include <assert.h> ++#include <string.h> + + static long s_ncurrently_allocated = 0; +Index: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_preferences.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_preferences.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_preferences.cc (revision 8292) +@@ -32,4 +32,5 @@ + #include <sys/stat.h> + #include <unistd.h> ++#include <string.h> + + +Index: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_realtime.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_realtime.cc (revision 6427) ++++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_realtime.cc (revision 8292) +@@ -62,4 +62,5 @@ + + #include <pthread.h> ++#include <stdio.h> + + gr_rt_status_t +Index: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc (revision 6201) ++++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <gr_scheduler_thread.h> + #include <iostream> ++#include <stdio.h> + + #ifdef HAVE_SIGNAL_H +Index: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc (revision 8292) +@@ -29,4 +29,5 @@ + #include <gr_preferences.h> + #include <stdio.h> ++#include <string.h> + #include <gr_local_sighandler.h> + +Index: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc (revision 8292) +@@ -41,5 +41,4 @@ + #include <gr_pagesize.h> + #include <gr_tmp_path.h> +- + + gr_vmcircbuf_mmap_tmpfile::gr_vmcircbuf_mmap_tmpfile (int size) +Index: gnuradio/trunk/gnuradio-core/src/tests/benchmark_nco.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/tests/benchmark_nco.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/tests/benchmark_nco.cc (revision 8292) +@@ -31,4 +31,5 @@ + #include <gr_nco.h> + #include <gr_fxpt_nco.h> ++#include <string.h> + + #define ITERATIONS 20000000 +Index: gnuradio/trunk/gnuradio-core/src/tests/benchmark_vco.cc +=================================================================== +--- gnuradio/trunk/gnuradio-core/src/tests/benchmark_vco.cc (revision 6044) ++++ gnuradio/trunk/gnuradio-core/src/tests/benchmark_vco.cc (revision 8292) +@@ -31,4 +31,5 @@ + #include <gr_vco.h> + #include <gr_fxpt_vco.h> ++#include <string.h> + + #define ITERATIONS 5000000 +Index: gnuradio/trunk/gr-atsc/src/lib/atsc_bit_timing_loop.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/atsc_bit_timing_loop.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/atsc_bit_timing_loop.cc (revision 8292) +@@ -28,4 +28,5 @@ + #include <gr_io_signature.h> + #include <atsc_consts.h> ++#include <string.h> + + // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz +Index: gnuradio/trunk/gr-atsc/src/lib/atsci_reed_solomon.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/atsci_reed_solomon.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/atsci_reed_solomon.cc (revision 8292) +@@ -23,4 +23,5 @@ + #include <atsci_reed_solomon.h> + #include <assert.h> ++#include <string.h> + + extern "C" { +Index: gnuradio/trunk/gr-atsc/src/lib/atsci_sliding_correlator.h +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/atsci_sliding_correlator.h (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/atsci_sliding_correlator.h (revision 8292) +@@ -20,8 +20,9 @@ + * Boston, MA 02110-1301, USA. + */ ++#include <string> ++#include <string.h> ++ + #ifndef _ATSC_SLIDING_CORRELATOR_H_ + #define _ATSC_SLIDING_CORRELATOR_H_ +- +-#include <string> + + extern const unsigned char atsc_pn511[511]; +Index: gnuradio/trunk/gr-atsc/src/lib/atsci_sssr.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/atsci_sssr.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/atsci_sssr.cc (revision 8292) +@@ -28,4 +28,5 @@ + #include <atsci_diag_output.h> + #include <gr_math.h> ++#include <stdio.h> + + /* +Index: gnuradio/trunk/gr-atsc/src/lib/atsci_trellis_encoder.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/atsci_trellis_encoder.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/atsci_trellis_encoder.cc (revision 8292) +@@ -24,4 +24,5 @@ + #include <assert.h> + #include <stdio.h> ++#include <string.h> + + static const int DIBITS_PER_BYTE = 4; +Index: gnuradio/trunk/gr-atsc/src/lib/atsci_viterbi_decoder.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/atsci_viterbi_decoder.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/atsci_viterbi_decoder.cc (revision 8292) +@@ -26,4 +26,5 @@ + #include <cmath> + #include "atsci_viterbi_mux.cc" ++#include <string.h> + + +Index: gnuradio/trunk/gr-atsc/src/lib/interleaver_fifo.h +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/interleaver_fifo.h (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/interleaver_fifo.h (revision 8292) +@@ -27,4 +27,5 @@ + #include <interleaver_fifo.h> + #include <string.h> ++#include <strings.h> + + /*! +Index: gnuradio/trunk/gr-atsc/src/lib/qa_atsci_data_interleaver.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/qa_atsci_data_interleaver.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/qa_atsci_data_interleaver.cc (revision 8292) +@@ -23,4 +23,5 @@ + #include <cppunit/TestAssert.h> + #include <qa_atsci_data_interleaver.h> ++#include <string.h> + + +Index: gnuradio/trunk/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc (revision 8292) +@@ -29,4 +29,5 @@ + #include <assert.h> + #include <iostream> ++#include <string.h> + + using std::cerr; +Index: gnuradio/trunk/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc (revision 8292) +@@ -30,4 +30,5 @@ + #include <qa_atsci_fake_single_viterbi.h> + #include <random.h> ++#include <string.h> + + +Index: gnuradio/trunk/gr-atsc/src/lib/qa_atsci_randomizer.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/qa_atsci_randomizer.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/qa_atsci_randomizer.cc (revision 8292) +@@ -24,4 +24,5 @@ + + #include <cppunit/TestAssert.h> ++#include <string.h> + + static unsigned int expected_initial_states[] = { +Index: gnuradio/trunk/gr-atsc/src/lib/qa_atsci_reed_solomon.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/qa_atsci_reed_solomon.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/qa_atsci_reed_solomon.cc (revision 8292) +@@ -30,4 +30,5 @@ + #include <atsci_reed_solomon.h> + #include <qa_atsci_reed_solomon.h> ++#include <string.h> + + +Index: gnuradio/trunk/gr-atsc/src/lib/qa_atsci_single_viterbi.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/qa_atsci_single_viterbi.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/qa_atsci_single_viterbi.cc (revision 8292) +@@ -31,4 +31,5 @@ + #include <qa_atsci_single_viterbi.h> + #include <random.h> ++#include <string.h> + + +Index: gnuradio/trunk/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc +=================================================================== +--- gnuradio/trunk/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc (revision 6044) ++++ gnuradio/trunk/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc (revision 8292) +@@ -31,4 +31,5 @@ + #include <stdlib.h> + #include <time.h> ++#include <string.h> + + #define NELEM(x) (sizeof (x) / sizeof (x[0])) +Index: gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc +=================================================================== +--- gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc (revision 6044) ++++ gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc (revision 8292) +@@ -34,4 +34,5 @@ + #include <gri_portaudio.h> + #include <omnithread.h> ++#include <string.h> + + #define LOGGING 0 // define to 0 or 1 +Index: gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc +=================================================================== +--- gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc (revision 6044) ++++ gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc (revision 8292) +@@ -34,4 +34,5 @@ + #include <gri_portaudio.h> + #include <omnithread.h> ++#include <string.h> + + #define LOGGING 0 // define to 0 or 1 +Index: gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm/code.c +=================================================================== +--- import/gnuradio-savannah-20060726/trunk/gr-gsm-fr-vocoder/src/lib/gsm/code.c (revision 968) ++++ gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm/code.c (revision 8292) +@@ -20,4 +20,5 @@ + #include "gsm.h" + #include "proto.h" ++#include <string.h> + + /* +Index: gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c +=================================================================== +--- import/gnuradio-savannah-20060726/trunk/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c (revision 968) ++++ gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c (revision 8292) +@@ -31,4 +31,5 @@ + #include "private.h" + #include "proto.h" ++#include <strings.h> + + gsm gsm_create P0() +Index: gnuradio/trunk/gr-trellis/src/lib/fsm.cc +=================================================================== +--- gnuradio/trunk/gr-trellis/src/lib/fsm.cc (revision 6044) ++++ gnuradio/trunk/gr-trellis/src/lib/fsm.cc (revision 8292) +@@ -27,4 +27,5 @@ + #include <stdexcept> + #include <cmath> ++#include <stdlib.h> + #include "base.h" + #include "fsm.h" +Index: gnuradio/trunk/gr-trellis/src/lib/fsm.h +=================================================================== +--- gnuradio/trunk/gr-trellis/src/lib/fsm.h (revision 6044) ++++ gnuradio/trunk/gr-trellis/src/lib/fsm.h (revision 8292) +@@ -25,4 +25,5 @@ + + #include <vector> ++#include <iosfwd> + + /*! +Index: gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.cc +=================================================================== +--- gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.cc (revision 6044) ++++ gnuradio/trunk/gr-trellis/src/lib/trellis_permutation.cc (revision 8292) +@@ -28,4 +28,5 @@ + #include <gr_io_signature.h> + #include <iostream> ++#include <string.h> + + trellis_permutation_sptr +Index: gnuradio/trunk/gr-video-sdl/src/video_sdl_sink_s.cc +=================================================================== +--- gnuradio/trunk/gr-video-sdl/src/video_sdl_sink_s.cc (revision 6044) ++++ gnuradio/trunk/gr-video-sdl/src/video_sdl_sink_s.cc (revision 8292) +@@ -36,4 +36,5 @@ + #include <iostream> + #include <stdexcept> ++#include <string.h> + + +Index: gnuradio/trunk/gr-video-sdl/src/video_sdl_sink_uc.cc +=================================================================== +--- gnuradio/trunk/gr-video-sdl/src/video_sdl_sink_uc.cc (revision 6044) ++++ gnuradio/trunk/gr-video-sdl/src/video_sdl_sink_uc.cc (revision 8292) +@@ -36,4 +36,5 @@ + #include <iostream> + #include <stdexcept> ++#include <string.h> + + +Index: gnuradio/trunk/usrp/host/apps/usrper.cc +=================================================================== +--- gnuradio/trunk/usrp/host/apps/usrper.cc (revision 6044) ++++ gnuradio/trunk/usrp/host/apps/usrper.cc (revision 8292) +@@ -31,4 +31,5 @@ + #include "usrp_prims.h" + #include "usrp_spi_defs.h" ++#include <string.h> + + char *prog_name; +Index: gnuradio/trunk/usrp/host/lib/legacy/fusb_win32.cc +=================================================================== +--- gnuradio/trunk/usrp/host/lib/legacy/fusb_win32.cc (revision 6044) ++++ gnuradio/trunk/usrp/host/lib/legacy/fusb_win32.cc (revision 8292) +@@ -29,4 +29,5 @@ + #include <assert.h> + #include <stdexcept> ++#include <string.h> + + static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size(); +Index: gnuradio/trunk/usrp/host/lib/legacy/usrp_basic.cc +=================================================================== +--- gnuradio/trunk/usrp/host/lib/legacy/usrp_basic.cc (revision 6044) ++++ gnuradio/trunk/usrp/host/lib/legacy/usrp_basic.cc (revision 8292) +@@ -35,4 +35,5 @@ + #include <math.h> + #include <ad9862.h> ++#include <string.h> + + using namespace ad9862; +Index: gnuradio/trunk/usrp/host/lib/legacy/usrp_local_sighandler.cc +=================================================================== +--- gnuradio/trunk/usrp/host/lib/legacy/usrp_local_sighandler.cc (revision 6044) ++++ gnuradio/trunk/usrp/host/lib/legacy/usrp_local_sighandler.cc (revision 8292) +@@ -33,4 +33,5 @@ + #include <stdexcept> + #include <stdio.h> ++#include <string.h> + + usrp_local_sighandler::usrp_local_sighandler (int signum, +Index: gnuradio/trunk/usrp/host/lib/legacy/usrp_prims.cc +=================================================================== +--- gnuradio/trunk/usrp/host/lib/legacy/usrp_prims.cc (revision 6044) ++++ gnuradio/trunk/usrp/host/lib/legacy/usrp_prims.cc (revision 8292) +@@ -63,4 +63,5 @@ + + #include "std_paths.h" ++#include <stdio.h> + + static char * +Index: gnuradio/trunk/usrp/host/misc/getopt.c +=================================================================== +--- gnuradio/trunk/usrp/host/misc/getopt.c (revision 6044) ++++ gnuradio/trunk/usrp/host/misc/getopt.c (revision 8292) +@@ -53,4 +53,5 @@ + + #include <stdio.h> ++#include <string.h> + + /* Comment out all this code if we are using the GNU C Library, and are not diff --git a/packages/gnuradio/gnuradio_3.1.2.bb b/packages/gnuradio/gnuradio_3.1.2.bb index 0f339c30c1..f5ced2324c 100644 --- a/packages/gnuradio/gnuradio_3.1.2.bb +++ b/packages/gnuradio/gnuradio_3.1.2.bb @@ -1,8 +1,9 @@ require gnuradio.inc -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ file://no-trellis-doc.patch;patch=1 \ + file://gcc43.patch;patch=1;pnum=2 \ " diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index 03371c730e..fa211a0a97 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -24,7 +24,7 @@ IMAGE_INSTALL = "\ abiword \ # gnumeric \ # gimp \ - powertop \ + powertop oprofile \ pidgin \ # irssi \ " diff --git a/packages/initscripts/initscripts-1.0/arm/alignment.sh b/packages/initscripts/initscripts-1.0/arm/alignment.sh index 4a66dc6bc8..32a9eaace2 100644 --- a/packages/initscripts/initscripts-1.0/arm/alignment.sh +++ b/packages/initscripts/initscripts-1.0/arm/alignment.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ -e /proc/cpu/alignment ]; then +if [ -e /proc/cpu/alignment ] && ! [ $(uname -m) = "armv7l" ]; then echo "3" > /proc/cpu/alignment fi diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 55998c0a4a..6d4b7e6ea5 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r105" +PR = "r107" SRC_URI = "file://functions \ file://halt \ diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index 60361f5862..0adb5da265 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -1,7 +1,7 @@ require ipkg-utils_${PV}.bb RDEPENDS = "" -PR = "r18" +PR = "r19" inherit native diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index 707a005c5c..40bef907c8 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r20.1" +PR = "r21" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ diff --git a/packages/libtool/libtool-native_2.2.4.bb b/packages/libtool/libtool-native_2.2.4.bb index 73e8aabe2e..a4f76c69dc 100644 --- a/packages/libtool/libtool-native_2.2.4.bb +++ b/packages/libtool/libtool-native_2.2.4.bb @@ -1,7 +1,7 @@ require libtool.inc require libtool_${PV}.bb -PR = "r19" +PR = "r20" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://cross_compile.patch;patch=1 \ file://prefix.patch;patch=1" @@ -27,13 +27,19 @@ do_stage () { install -d ${STAGING_DATADIR}/libtool/config/ ${STAGING_DATADIR}/aclocal/ install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/config/ + for i in config.guess config.sub compile depcomp general.m4sh getopt.m4sh install-sh ltmain.m4sh ltmain.sh mdate-sh missing mkstamp ; do \ + install -c -m 0644 ${S}/libltdl/config/$i ${STAGING_DATADIR}/libtool/config/ + done install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ install -c -m 0644 ${S}/libltdl/m4/ltoptions.m4 ${STAGING_DATADIR}/aclocal/ install -c -m 0644 ${S}/libltdl/m4/ltversion.m4 ${STAGING_DATADIR}/aclocal/ install -c -m 0644 ${S}/libltdl/m4/ltsugar.m4 ${STAGING_DATADIR}/aclocal/ install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ${S}/libltdl/m4/argz.m4 ${STAGING_DATADIR}/aclocal/ + + install -d ${STAGING_DATADIR}/libtool/libltdl + cp -pfPr ${S}/libltdl/* ${STAGING_DATADIR}/libtool/libltdl/ } do_install () { diff --git a/packages/linux/linux-2.6.25/at32stk1000/defconfig b/packages/linux/linux-2.6.25/at32stk1000/defconfig index 9bacf1739d..66a1a789b3 100644 --- a/packages/linux/linux-2.6.25/at32stk1000/defconfig +++ b/packages/linux/linux-2.6.25/at32stk1000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25 -# Tue Jul 1 21:14:57 2008 +# Sat Jul 5 12:40:54 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -432,6 +432,7 @@ CONFIG_MTD_NAND_ATMEL_ECC_HW=y # CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set # CONFIG_MTD_ONENAND is not set # @@ -444,6 +445,7 @@ CONFIG_BLK_DEV=y CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 @@ -550,6 +552,15 @@ CONFIG_MACB=y # # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set # CONFIG_NET_PCMCIA is not set # CONFIG_WAN is not set CONFIG_PPP=m @@ -686,6 +697,7 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set +# CONFIG_I2C_TINY_USB is not set # # Miscellaneous I2C Chip support @@ -753,6 +765,11 @@ CONFIG_WATCHDOG=y CONFIG_AT32AP700X_WDT=y # +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set + +# # Sonics Silicon Backplane # CONFIG_SSB_POSSIBLE=y @@ -866,6 +883,12 @@ CONFIG_SND_AT73C213=m CONFIG_SND_AT73C213_TARGET_BITRATE=48000 # +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set + +# # PCMCIA devices # # CONFIG_SND_VXPOCKET is not set @@ -892,16 +915,164 @@ CONFIG_SOUND_PRIME=m # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_AT32_ABDAC=m CONFIG_AC97_BUS=m -# CONFIG_HID_SUPPORT is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +# CONFIG_HID_DEBUG is not set +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT_POWERBOOK=y +# CONFIG_HID_FF is not set +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB is not set +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m +# CONFIG_USB_R8A66597_HCD is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +CONFIG_USB_LIBUSUAL=y + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 7fc46c9113..87fadae1ec 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,10 +1,10 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26-rc7-omap1 -# Tue Jun 24 20:16:52 2008 +# Linux kernel version: 2.6.26-rc8-omap1 +# Fri Jul 4 09:57:18 2008 # CONFIG_ARM=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=n +CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -23,6 +23,7 @@ CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_ZONE_DMA=y +CONFIG_OPROFILE_ARMV7=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -31,7 +32,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y @@ -84,8 +84,9 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -# CONFIG_PROFILING is not set +CONFIG_PROFILING=y # CONFIG_MARKERS is not set +CONFIG_OPROFILE=y CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y @@ -254,7 +255,7 @@ CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_PREEMPT=n +# CONFIG_PREEMPT is not set CONFIG_HZ=128 CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set @@ -346,7 +347,7 @@ CONFIG_PM=y CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y -CONFIG_APM_EMULATION=n +# CONFIG_APM_EMULATION is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y # @@ -772,7 +773,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set -# CONFIG_INPUT_APMPOWER is not set # # Input Device Drivers @@ -932,7 +932,6 @@ CONFIG_HAVE_GPIO_LIB=y CONFIG_POWER_SUPPLY=m # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set -# CONFIG_APM_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_BQ27x00 is not set CONFIG_HWMON=y @@ -1827,7 +1826,6 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set -CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set diff --git a/packages/linux/linux-omap2-git/beagleboard/oprofile-0.9.3.armv7.diff b/packages/linux/linux-omap2-git/beagleboard/oprofile-0.9.3.armv7.diff new file mode 100644 index 0000000000..dbc11fbe7d --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/oprofile-0.9.3.armv7.diff @@ -0,0 +1,611 @@ +Hi, + +This patch adds Oprofile support on ARMv7, using the PMNC unit. +Tested on OMAP3430 SDP. + +Feedback and comments are welcome. + +The patch to user space components is attached for reference. It i applies +against version 0.9.3 of oprofile source +(http://prdownloads.sourceforge.net/oprofile/oprofile-0.9.3.tar.gz). + +Regards, +Jean. + +--- + +From: Jean Pihet <jpihet@mvista.com> +Date: Tue, 6 May 2008 17:21:44 +0200 +Subject: [PATCH] ARM: Add ARMv7 oprofile support + +Add ARMv7 Oprofile support to kernel + +Signed-off-by: Jean Pihet <jpihet@mvista.com> +--- + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index c60a27d..60b50a0 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -161,6 +161,11 @@ config OPROFILE_MPCORE + config OPROFILE_ARM11_CORE + bool + ++config OPROFILE_ARMV7 ++ def_bool y ++ depends on CPU_V7 && !SMP ++ bool ++ + endif + + config VECTORS_BASE +diff --git a/arch/arm/oprofile/Makefile b/arch/arm/oprofile/Makefile +index e61d0cc..88e31f5 100644 +--- a/arch/arm/oprofile/Makefile ++++ b/arch/arm/oprofile/Makefile +@@ -11,3 +11,4 @@ oprofile-$(CONFIG_CPU_XSCALE) += op_model_xscale.o + oprofile-$(CONFIG_OPROFILE_ARM11_CORE) += op_model_arm11_core.o + oprofile-$(CONFIG_OPROFILE_ARMV6) += op_model_v6.o + oprofile-$(CONFIG_OPROFILE_MPCORE) += op_model_mpcore.o ++oprofile-$(CONFIG_OPROFILE_ARMV7) += op_model_v7.o +diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c +index 0a5cf3a..3fcd752 100644 +--- a/arch/arm/oprofile/common.c ++++ b/arch/arm/oprofile/common.c +@@ -145,6 +145,10 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) + spec = &op_mpcore_spec; + #endif + ++#ifdef CONFIG_OPROFILE_ARMV7 ++ spec = &op_armv7_spec; ++#endif ++ + if (spec) { + ret = spec->init(); + if (ret < 0) +diff --git a/arch/arm/oprofile/op_arm_model.h +b/arch/arm/oprofile/op_arm_model.h +index 4899c62..8c4e4f6 100644 +--- a/arch/arm/oprofile/op_arm_model.h ++++ b/arch/arm/oprofile/op_arm_model.h +@@ -26,6 +26,7 @@ extern struct op_arm_model_spec op_xscale_spec; + + extern struct op_arm_model_spec op_armv6_spec; + extern struct op_arm_model_spec op_mpcore_spec; ++extern struct op_arm_model_spec op_armv7_spec; + + extern void arm_backtrace(struct pt_regs * const regs, unsigned int depth); + +diff --git a/arch/arm/oprofile/op_model_v7.c b/arch/arm/oprofile/op_model_v7.c +new file mode 100644 +index 0000000..a159bc1 +--- /dev/null ++++ b/arch/arm/oprofile/op_model_v7.c +@@ -0,0 +1,407 @@ ++/** ++ * @file op_model_v7.c ++ * ARM V7 (Cortex A8) Event Monitor Driver ++ * ++ * @remark Copyright 2008 Jean Pihet <jpihet@mvista.com> ++ * @remark Copyright 2004 ARM SMP Development Team ++ */ ++#include <linux/types.h> ++#include <linux/errno.h> ++#include <linux/oprofile.h> ++#include <linux/interrupt.h> ++#include <linux/irq.h> ++#include <linux/smp.h> ++ ++#include "op_counter.h" ++#include "op_arm_model.h" ++#include "op_model_v7.h" ++ ++/* #define DEBUG */ ++ ++ ++/* ++ * ARM V7 PMNC support ++ */ ++ ++static u32 cnt_en[CNTMAX]; ++ ++static inline void armv7_pmnc_write(u32 val) ++{ ++ val &= PMNC_MASK; ++ asm volatile("mcr p15, 0, %0, c9, c12, 0" : : "r" (val)); ++} ++ ++static inline u32 armv7_pmnc_read(void) ++{ ++ u32 val; ++ ++ asm volatile("mrc p15, 0, %0, c9, c12, 0" : "=r" (val)); ++ return val; ++} ++ ++static inline u32 armv7_pmnc_enable_counter(unsigned int cnt) ++{ ++ u32 val; ++ ++ if (cnt >= CNTMAX) { ++ printk(KERN_ERR "oprofile: CPU%u enabling wrong PMNC counter" ++ " %d\n", smp_processor_id(), cnt); ++ return -1; ++ } ++ ++ if (cnt == CCNT) ++ val = CNTENS_C; ++ else ++ val = (1 << (cnt - CNT0)); ++ ++ val &= CNTENS_MASK; ++ asm volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (val)); ++ ++ return cnt; ++} ++ ++static inline u32 armv7_pmnc_disable_counter(unsigned int cnt) ++{ ++ u32 val; ++ ++ if (cnt >= CNTMAX) { ++ printk(KERN_ERR "oprofile: CPU%u disabling wrong PMNC counter" ++ " %d\n", smp_processor_id(), cnt); ++ return -1; ++ } ++ ++ if (cnt == CCNT) ++ val = CNTENC_C; ++ else ++ val = (1 << (cnt - CNT0)); ++ ++ val &= CNTENC_MASK; ++ asm volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (val)); ++ ++ return cnt; ++} ++ ++static inline u32 armv7_pmnc_enable_intens(unsigned int cnt) ++{ ++ u32 val; ++ ++ if (cnt >= CNTMAX) { ++ printk(KERN_ERR "oprofile: CPU%u enabling wrong PMNC counter" ++ " interrupt enable %d\n", smp_processor_id(), cnt); ++ return -1; ++ } ++ ++ if (cnt == CCNT) ++ val = INTENS_C; ++ else ++ val = (1 << (cnt - CNT0)); ++ ++ val &= INTENS_MASK; ++ asm volatile("mcr p15, 0, %0, c9, c14, 1" : : "r" (val)); ++ ++ return cnt; ++} ++ ++static inline u32 armv7_pmnc_getreset_flags(void) ++{ ++ u32 val; ++ ++ /* Read */ ++ asm volatile("mrc p15, 0, %0, c9, c12, 3" : "=r" (val)); ++ ++ /* Write to clear flags */ ++ val &= FLAG_MASK; ++ asm volatile("mcr p15, 0, %0, c9, c12, 3" : : "r" (val)); ++ ++ return val; ++} ++ ++static inline int armv7_pmnc_select_counter(unsigned int cnt) ++{ ++ u32 val; ++ ++ if ((cnt == CCNT) || (cnt >= CNTMAX)) { ++ printk(KERN_ERR "oprofile: CPU%u selecting wrong PMNC counteri" ++ " %d\n", smp_processor_id(), cnt); ++ return -1; ++ } ++ ++ val = (cnt - CNT0) & SELECT_MASK; ++ asm volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (val)); ++ ++ return cnt; ++} ++ ++static inline void armv7_pmnc_write_evtsel(unsigned int cnt, u32 val) ++{ ++ if (armv7_pmnc_select_counter(cnt) == cnt) { ++ val &= EVTSEL_MASK; ++ asm volatile("mcr p15, 0, %0, c9, c13, 1" : : "r" (val)); ++ } ++} ++ ++static void armv7_pmnc_reset_counter(unsigned int cnt) ++{ ++ u32 cpu_cnt = CPU_COUNTER(smp_processor_id(), cnt); ++ u32 val = -(u32)counter_config[cpu_cnt].count; ++ ++ switch (cnt) { ++ case CCNT: ++ armv7_pmnc_disable_counter(cnt); ++ ++ asm volatile("mcr p15, 0, %0, c9, c13, 0" : : "r" (val)); ++ ++ if (cnt_en[cnt] != 0) ++ armv7_pmnc_enable_counter(cnt); ++ ++ break; ++ ++ case CNT0: ++ case CNT1: ++ case CNT2: ++ case CNT3: ++ armv7_pmnc_disable_counter(cnt); ++ ++ if (armv7_pmnc_select_counter(cnt) == cnt) ++ asm volatile("mcr p15, 0, %0, c9, c13, 2" : : "r" (val)); ++ ++ if (cnt_en[cnt] != 0) ++ armv7_pmnc_enable_counter(cnt); ++ ++ break; ++ ++ default: ++ printk(KERN_ERR "oprofile: CPU%u resetting wrong PMNC counter" ++ " %d\n", smp_processor_id(), cnt); ++ break; ++ } ++} ++ ++int armv7_setup_pmnc(void) ++{ ++ unsigned int cnt; ++ ++ if (armv7_pmnc_read() & PMNC_E) { ++ printk(KERN_ERR "oprofile: CPU%u PMNC still enabled when setup" ++ " new event counter.\n", smp_processor_id()); ++ return -EBUSY; ++ } ++ ++ /* ++ * Initialize & Reset PMNC: C bit, D bit and P bit. ++ * Note: Using a slower count for CCNT (D bit: divide by 64) results ++ * in a more stable system ++ */ ++ armv7_pmnc_write(PMNC_P | PMNC_C | PMNC_D); ++ ++ ++ for (cnt = CCNT; cnt < CNTMAX; cnt++) { ++ unsigned long event; ++ u32 cpu_cnt = CPU_COUNTER(smp_processor_id(), cnt); ++ ++ /* ++ * Disable counter ++ */ ++ armv7_pmnc_disable_counter(cnt); ++ cnt_en[cnt] = 0; ++ ++ if (!counter_config[cpu_cnt].enabled) ++ continue; ++ ++ event = counter_config[cpu_cnt].event & 255; ++ ++ /* ++ * Set event (if destined for PMNx counters) ++ * We don't need to set the event if it's a cycle count ++ */ ++ if (cnt != CCNT) ++ armv7_pmnc_write_evtsel(cnt, event); ++ ++ /* ++ * Enable interrupt for this counter ++ */ ++ armv7_pmnc_enable_intens(cnt); ++ ++ /* ++ * Reset counter ++ */ ++ armv7_pmnc_reset_counter(cnt); ++ ++ /* ++ * Enable counter ++ */ ++ armv7_pmnc_enable_counter(cnt); ++ cnt_en[cnt] = 1; ++ } ++ ++ return 0; ++} ++ ++static inline void armv7_start_pmnc(void) ++{ ++ armv7_pmnc_write(armv7_pmnc_read() | PMNC_E); ++} ++ ++static inline void armv7_stop_pmnc(void) ++{ ++ armv7_pmnc_write(armv7_pmnc_read() & ~PMNC_E); ++} ++ ++/* ++ * CPU counters' IRQ handler (one IRQ per CPU) ++ */ ++static irqreturn_t armv7_pmnc_interrupt(int irq, void *arg) ++{ ++ struct pt_regs *regs = get_irq_regs(); ++ unsigned int cnt; ++ u32 flags; ++ ++ ++ /* ++ * Stop IRQ generation ++ */ ++ armv7_stop_pmnc(); ++ ++ /* ++ * Get and reset overflow status flags ++ */ ++ flags = armv7_pmnc_getreset_flags(); ++ ++ /* ++ * Cycle counter ++ */ ++ if (flags & FLAG_C) { ++ u32 cpu_cnt = CPU_COUNTER(smp_processor_id(), CCNT); ++ armv7_pmnc_reset_counter(CCNT); ++ oprofile_add_sample(regs, cpu_cnt); ++ } ++ ++ /* ++ * PMNC counters 0:3 ++ */ ++ for (cnt = CNT0; cnt < CNTMAX; cnt++) { ++ if (flags & (1 << (cnt - CNT0))) { ++ u32 cpu_cnt = CPU_COUNTER(smp_processor_id(), cnt); ++ armv7_pmnc_reset_counter(cnt); ++ oprofile_add_sample(regs, cpu_cnt); ++ } ++ } ++ ++ /* ++ * Allow IRQ generation ++ */ ++ armv7_start_pmnc(); ++ ++ return IRQ_HANDLED; ++} ++ ++int armv7_request_interrupts(int *irqs, int nr) ++{ ++ unsigned int i; ++ int ret = 0; ++ ++ for (i = 0; i < nr; i++) { ++ ret = request_irq(irqs[i], armv7_pmnc_interrupt, ++ IRQF_DISABLED, "CP15 PMNC", NULL); ++ if (ret != 0) { ++ printk(KERN_ERR "oprofile: unable to request IRQ%u" ++ " for ARMv7\n", ++ irqs[i]); ++ break; ++ } ++ } ++ ++ if (i != nr) ++ while (i-- != 0) ++ free_irq(irqs[i], NULL); ++ ++ return ret; ++} ++ ++void armv7_release_interrupts(int *irqs, int nr) ++{ ++ unsigned int i; ++ ++ for (i = 0; i < nr; i++) ++ free_irq(irqs[i], NULL); ++} ++ ++#ifdef DEBUG ++static void armv7_pmnc_dump_regs(void) ++{ ++ u32 val; ++ unsigned int cnt; ++ ++ printk(KERN_INFO "PMNC registers dump:\n"); ++ ++ asm volatile("mrc p15, 0, %0, c9, c12, 0" : "=r" (val)); ++ printk(KERN_INFO "PMNC =0x%08x\n", val); ++ ++ asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r" (val)); ++ printk(KERN_INFO "CNTENS=0x%08x\n", val); ++ ++ asm volatile("mrc p15, 0, %0, c9, c14, 1" : "=r" (val)); ++ printk(KERN_INFO "INTENS=0x%08x\n", val); ++ ++ asm volatile("mrc p15, 0, %0, c9, c12, 3" : "=r" (val)); ++ printk(KERN_INFO "FLAGS =0x%08x\n", val); ++ ++ asm volatile("mrc p15, 0, %0, c9, c12, 5" : "=r" (val)); ++ printk(KERN_INFO "SELECT=0x%08x\n", val); ++ ++ asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r" (val)); ++ printk(KERN_INFO "CCNT =0x%08x\n", val); ++ ++ for (cnt = CNT0; cnt < CNTMAX; cnt++) { ++ armv7_pmnc_select_counter(cnt); ++ asm volatile("mrc p15, 0, %0, c9, c13, 2" : "=r" (val)); ++ printk(KERN_INFO "CNT[%d] count =0x%08x\n", cnt-CNT0, val); ++ asm volatile("mrc p15, 0, %0, c9, c13, 1" : "=r" (val)); ++ printk(KERN_INFO "CNT[%d] evtsel=0x%08x\n", cnt-CNT0, val); ++ } ++} ++#endif ++ ++ ++static int irqs[] = { ++#ifdef CONFIG_ARCH_OMAP3 ++ INT_34XX_BENCH_MPU_EMUL, ++#endif ++}; ++ ++static void armv7_pmnc_stop(void) ++{ ++#ifdef DEBUG ++ armv7_pmnc_dump_regs(); ++#endif ++ armv7_stop_pmnc(); ++ armv7_release_interrupts(irqs, ARRAY_SIZE(irqs)); ++} ++ ++static int armv7_pmnc_start(void) ++{ ++ int ret; ++ ++#ifdef DEBUG ++ armv7_pmnc_dump_regs(); ++#endif ++ ret = armv7_request_interrupts(irqs, ARRAY_SIZE(irqs)); ++ if (ret >= 0) ++ armv7_start_pmnc(); ++ ++ return ret; ++} ++ ++static int armv7_detect_pmnc(void) ++{ ++ return 0; ++} ++ ++struct op_arm_model_spec op_armv7_spec = { ++ .init = armv7_detect_pmnc, ++ .num_counters = 5, ++ .setup_ctrs = armv7_setup_pmnc, ++ .start = armv7_pmnc_start, ++ .stop = armv7_pmnc_stop, ++ .name = "arm/armv7", ++}; +diff --git a/arch/arm/oprofile/op_model_v7.h b/arch/arm/oprofile/op_model_v7.h +new file mode 100644 +index 0000000..08f40ea +--- /dev/null ++++ b/arch/arm/oprofile/op_model_v7.h +@@ -0,0 +1,101 @@ ++/** ++ * @file op_model_v7.h ++ * ARM v7 (Cortex A8) Event Monitor Driver ++ * ++ * @remark Copyright 2008 Jean Pihet <jpihet@mvista.com> ++ * @remark Copyright 2004 ARM SMP Development Team ++ * @remark Copyright 2000-2004 Deepak Saxena <dsaxena@mvista.com> ++ * @remark Copyright 2000-2004 MontaVista Software Inc ++ * @remark Copyright 2004 Dave Jiang <dave.jiang@intel.com> ++ * @remark Copyright 2004 Intel Corporation ++ * @remark Copyright 2004 Zwane Mwaikambo <zwane@arm.linux.org.uk> ++ * @remark Copyright 2004 Oprofile Authors ++ * ++ * @remark Read the file COPYING ++ * ++ * @author Zwane Mwaikambo ++ */ ++#ifndef OP_MODEL_V7_H ++#define OP_MODEL_V7_H ++ ++/* ++ * Per-CPU PMNC: config reg ++ */ ++#define PMNC_E (1 << 0) /* Enable all counters */ ++#define PMNC_P (1 << 1) /* Reset all counters */ ++#define PMNC_C (1 << 2) /* Cycle counter reset */ ++#define PMNC_D (1 << 3) /* CCNT counts every 64th cpu cycle */ ++#define PMNC_X (1 << 4) /* Export to ETM */ ++#define PMNC_DP (1 << 5) /* Disable CCNT if non-invasive debug*/ ++#define PMNC_MASK 0x3f /* Mask for writable bits */ ++ ++/* ++ * Available counters ++ */ ++#define CCNT 0 ++#define CNT0 1 ++#define CNT1 2 ++#define CNT2 3 ++#define CNT3 4 ++#define CNTMAX 5 ++ ++#define CPU_COUNTER(cpu, counter) ((cpu) * CNTMAX + (counter)) ++ ++/* ++ * CNTENS: counters enable reg ++ */ ++#define CNTENS_P0 (1 << 0) ++#define CNTENS_P1 (1 << 1) ++#define CNTENS_P2 (1 << 2) ++#define CNTENS_P3 (1 << 3) ++#define CNTENS_C (1 << 31) ++#define CNTENS_MASK 0x8000000f /* Mask for writable bits */ ++ ++/* ++ * CNTENC: counters disable reg ++ */ ++#define CNTENC_P0 (1 << 0) ++#define CNTENC_P1 (1 << 1) ++#define CNTENC_P2 (1 << 2) ++#define CNTENC_P3 (1 << 3) ++#define CNTENC_C (1 << 31) ++#define CNTENC_MASK 0x8000000f /* Mask for writable bits */ ++ ++/* ++ * INTENS: counters overflow interrupt enable reg ++ */ ++#define INTENS_P0 (1 << 0) ++#define INTENS_P1 (1 << 1) ++#define INTENS_P2 (1 << 2) ++#define INTENS_P3 (1 << 3) ++#define INTENS_C (1 << 31) ++#define INTENS_MASK 0x8000000f /* Mask for writable bits */ ++ ++/* ++ * EVTSEL: Event selection reg ++ */ ++#define EVTSEL_MASK 0x7f /* Mask for writable bits */ ++ ++/* ++ * SELECT: Counter selection reg ++ */ ++#define SELECT_MASK 0x1f /* Mask for writable bits */ ++ ++/* ++ * FLAG: counters overflow flag status reg ++ */ ++#define FLAG_P0 (1 << 0) ++#define FLAG_P1 (1 << 1) ++#define FLAG_P2 (1 << 2) ++#define FLAG_P3 (1 << 3) ++#define FLAG_C (1 << 31) ++#define FLAG_MASK 0x8000000f /* Mask for writable bits */ ++ ++ ++int armv7_setup_pmu(void); ++int armv7_start_pmu(void); ++int armv7_stop_pmu(void); ++int armv7_request_interrupts(int *, int); ++void armv7_release_interrupts(int *, int); ++ ++#endif +diff --git a/include/asm-arm/arch-omap/irqs.h +b/include/asm-arm/arch-omap/irqs.h +index c80e160..89ca90e 100644 +--- a/include/asm-arm/arch-omap/irqs.h ++++ b/include/asm-arm/arch-omap/irqs.h +@@ -297,6 +297,7 @@ + #define INT_243X_HS_USB_DMA 93 + #define INT_243X_CARKIT_IRQ 94 + ++#define INT_34XX_BENCH_MPU_EMUL 3 + #define INT_34XX_ST_MCBSP2_IRQ 4 + #define INT_34XX_ST_MCBSP3_IRQ 5 + #define INT_34XX_SYS_NIRQ 7 diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 0defe87be6..5307629282 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,10 +2,10 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "050684c18f2ea0b08fdd5233a0cd3c7f96e00a0e" +SRCREV = "c32c81d59d2d8a66e63f82c9732db256d302068e" PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}" -PR = "r36" +PR = "r38" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -20,6 +20,7 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://16bpp.patch;patch=1 \ file://no-empty-flash-warnings.patch;patch=1 \ file://logo_linux_clut224.ppm \ + file://oprofile-0.9.3.armv7.diff;patch=1 \ " SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \ diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index 309ce5a5f7..e228860a49 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r1" +PR = "r2" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" diff --git a/packages/oprofile/oprofile/armv7a.diff b/packages/oprofile/oprofile/armv7a.diff new file mode 100644 index 0000000000..cb53e5e791 --- /dev/null +++ b/packages/oprofile/oprofile/armv7a.diff @@ -0,0 +1,151 @@ +diff -urN oprofile-0.9.3/ChangeLog oprofile-0.9.3.armv7/ChangeLog +--- oprofile-0.9.3/ChangeLog 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3.armv7/ChangeLog 2008-04-23 18:38:40.000000000 +0200 +@@ -1,3 +1,14 @@ ++ ++2008-04-23 Jean Pihet <jpihet@mvista.com> ++ ++ * events/arm/armv7/events: ++ * events/arm/armv7/unit_masks: ++ * libop/op_cpu_type.c: ++ * libop/op_cpu_type.h: ++ * libop/op_events.c: ++ * utils/ophelp.c: Added ARMv7 support to be consistent with the kernel, ++ remove some duplicate code and add some extra events ++ + 2007-07-09 Maynard Johnson <maynardj@us.ibm.com> + + * doc/opreport.xsd: +diff -urN oprofile-0.9.3/events/arm/armv7/events oprofile-0.9.3.armv7/events/arm/armv7/events +--- oprofile-0.9.3/events/arm/armv7/events 1970-01-01 01:00:00.000000000 +0100 ++++ oprofile-0.9.3.armv7/events/arm/armv7/events 2008-04-24 15:06:48.000000000 +0200 +@@ -0,0 +1,53 @@ ++# ARM V7 events ++# From Cortex A8 DDI (ARM DDI 0344B, revision r1p1) ++# ++event:0x00 counters:1,2,3,4 um:zero minimum:500 name:PMNC_SW_INCR : Software increment of PMNC registers ++event:0x01 counters:1,2,3,4 um:zero minimum:500 name:IFETCH_MISS : Instruction fetch misses from cache or normal cacheable memory ++event:0x02 counters:1,2,3,4 um:zero minimum:500 name:ITLB_MISS : Instruction fetch misses from TLB ++event:0x03 counters:1,2,3,4 um:zero minimum:500 name:DCACHE_REFILL : Data R/W operation that causes a refill from cache or normal cacheable memory ++event:0x04 counters:1,2,3,4 um:zero minimum:500 name:DCACHE_ACCESS : Data R/W from cache ++event:0x05 counters:1,2,3,4 um:zero minimum:500 name:DTLB_REFILL : Data R/W that causes a TLB refill ++event:0x06 counters:1,2,3,4 um:zero minimum:500 name:DREAD : Data read architecturally executed (note: architecturally executed = for instructions that are unconditional or that pass the condition code) ++event:0x07 counters:1,2,3,4 um:zero minimum:500 name:DWRITE : Data write architecturally executed ++event:0x08 counters:1,2,3,4 um:zero minimum:500 name:INSTR_EXECUTED : All executed instructions ++event:0x09 counters:1,2,3,4 um:zero minimum:500 name:EXC_TAKEN : Exception taken ++event:0x0A counters:1,2,3,4 um:zero minimum:500 name:EXC_EXECUTED : Exception return architecturally executed ++event:0x0B counters:1,2,3,4 um:zero minimum:500 name:CID_WRITE : Instruction that writes to the Context ID Register architecturally executed ++event:0x0C counters:1,2,3,4 um:zero minimum:500 name:PC_WRITE : SW change of PC, architecturally executed (not by exceptions) ++event:0x0D counters:1,2,3,4 um:zero minimum:500 name:PC_IMM_BRANCH : Immediate branch instruction executed (taken or not) ++event:0x0E counters:1,2,3,4 um:zero minimum:500 name:PC_PROC_RETURN : Procedure return architecturally executed (not by exceptions) ++event:0x0F counters:1,2,3,4 um:zero minimum:500 name:UNALIGNED_ACCESS : Unaligned access architecturally executed ++event:0x10 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_MIS_PRED : Branch mispredicted or not predicted. Counts pipeline flushes because of misprediction ++event:0x12 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_MIS_USED : Branch or change in program flow that could have been predicted ++event:0x40 counters:1,2,3,4 um:zero minimum:500 name:WRITE_BUFFER_FULL : Any write buffer full cycle ++event:0x41 counters:1,2,3,4 um:zero minimum:500 name:L2_STORE_MERGED : Any store that is merged in L2 cache ++event:0x42 counters:1,2,3,4 um:zero minimum:500 name:L2_STORE_BUFF : Any bufferable store from load/store to L2 cache ++event:0x43 counters:1,2,3,4 um:zero minimum:500 name:L2_ACCESS : Any access to L2 cache ++event:0x44 counters:1,2,3,4 um:zero minimum:500 name:L2_CACH_MISS : Any cacheable miss in L2 cache ++event:0x45 counters:1,2,3,4 um:zero minimum:500 name:AXI_READ_CYCLES : Number of cycles for an active AXI read ++event:0x46 counters:1,2,3,4 um:zero minimum:500 name:AXI_WRITE_CYCLES : Number of cycles for an active AXI write ++event:0x47 counters:1,2,3,4 um:zero minimum:500 name:MEMORY_REPLAY : Any replay event in the memory subsystem ++event:0x48 counters:1,2,3,4 um:zero minimum:500 name:UNALIGNED_ACCESS_REPLAY : Unaligned access that causes a replay ++event:0x49 counters:1,2,3,4 um:zero minimum:500 name:L1_DATA_MISS : L1 data cache miss as a result of the hashing algorithm ++event:0x4A counters:1,2,3,4 um:zero minimum:500 name:L1_INST_MISS : L1 instruction cache miss as a result of the hashing algorithm ++event:0x4B counters:1,2,3,4 um:zero minimum:500 name:L1_DATA_COLORING : L1 data access in which a page coloring alias occurs ++event:0x4C counters:1,2,3,4 um:zero minimum:500 name:L1_NEON_DATA : NEON data access that hits L1 cache ++event:0x4D counters:1,2,3,4 um:zero minimum:500 name:L1_NEON_CACH_DATA : NEON cacheable data access that hits L1 cache ++event:0x4E counters:1,2,3,4 um:zero minimum:500 name:L2_NEON : L2 access as a result of NEON memory access ++event:0x4F counters:1,2,3,4 um:zero minimum:500 name:L2_NEON_HIT : Any NEON hit in L2 cache ++event:0x50 counters:1,2,3,4 um:zero minimum:500 name:L1_INST : Any L1 instruction cache access, excluding CP15 cache accesses ++event:0x51 counters:1,2,3,4 um:zero minimum:500 name:PC_RETURN_MIS_PRED : Return stack misprediction at return stack pop (incorrect target address) ++event:0x52 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_FAILED : Branch prediction misprediction ++event:0x53 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_TAKEN : Any predicted branch that is taken ++event:0x54 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_EXECUTED : Any taken branch that is executed ++event:0x55 counters:1,2,3,4 um:zero minimum:500 name:OP_EXECUTED : Number of operations executed (in instruction or mutli-cycle instruction) ++event:0x56 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_INST_STALL : Cycles where no instruction available ++event:0x57 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_INST : Number of instructions issued in a cycle ++event:0x58 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_NEON_DATA_STALL : Number of cycles the processor waits on MRC data from NEON ++event:0x59 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_NEON_INST_STALL : Number of cycles the processor waits on NEON instruction queue or NEON load queue ++event:0x5A counters:1,2,3,4 um:zero minimum:500 name:NEON_CYCLES : Number of cycles NEON and integer processors are not idle ++event:0x70 counters:1,2,3,4 um:zero minimum:500 name:PMU0_EVENTS : Number of events from external input source PMUEXTIN[0] ++event:0x71 counters:1,2,3,4 um:zero minimum:500 name:PMU1_EVENTS : Number of events from external input source PMUEXTIN[1] ++event:0x72 counters:1,2,3,4 um:zero minimum:500 name:PMU_EVENTS : Number of events from both external input sources PMUEXTIN[0] and PMUEXTIN[1] ++event:0xFF counters:0 um:zero minimum:500 name:CPU_CYCLES : Number of CPU cycles ++ +diff -urN oprofile-0.9.3/events/arm/armv7/unit_masks oprofile-0.9.3.armv7/events/arm/armv7/unit_masks +--- oprofile-0.9.3/events/arm/armv7/unit_masks 1970-01-01 01:00:00.000000000 +0100 ++++ oprofile-0.9.3.armv7/events/arm/armv7/unit_masks 2008-04-01 10:52:00.000000000 +0200 +@@ -0,0 +1,4 @@ ++# ARM V7 PMNC possible unit masks ++# ++name:zero type:mandatory default:0x00 ++ 0x00 No unit mask +diff -urN oprofile-0.9.3/events/Makefile.in oprofile-0.9.3.armv7/events/Makefile.in +--- oprofile-0.9.3/events/Makefile.in 2007-07-16 20:23:28.000000000 +0200 ++++ oprofile-0.9.3.armv7/events/Makefile.in 2008-04-24 15:11:52.000000000 +0200 +@@ -211,6 +211,7 @@ + arm/xscale1/events arm/xscale1/unit_masks \ + arm/xscale2/events arm/xscale2/unit_masks \ + arm/armv6/events arm/armv6/unit_masks \ ++ arm/armv7/events arm/armv7/unit_masks \ + arm/mpcore/events arm/mpcore/unit_masks \ + mips/20K/events mips/20K/unit_masks \ + mips/24K/events mips/24K/unit_masks \ +@@ -270,7 +271,7 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer ++ $(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/armv7 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ +diff -urN oprofile-0.9.3/libop/op_cpu_type.c oprofile-0.9.3.armv7/libop/op_cpu_type.c +--- oprofile-0.9.3/libop/op_cpu_type.c 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3.armv7/libop/op_cpu_type.c 2008-04-23 18:31:56.000000000 +0200 +@@ -71,6 +71,7 @@ + { "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 }, + { "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 }, + { "ARM V6 PMU", "arm/armv6", CPU_ARM_V6, 3 }, ++ { "ARM V7 PMNC", "arm/armv7", CPU_ARM_V7, 5 }, + { "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 }, + }; + +diff -urN oprofile-0.9.3/libop/op_cpu_type.h oprofile-0.9.3.armv7/libop/op_cpu_type.h +--- oprofile-0.9.3/libop/op_cpu_type.h 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3.armv7/libop/op_cpu_type.h 2008-04-23 18:34:37.000000000 +0200 +@@ -69,6 +69,7 @@ + CPU_PPC64_PA6T, /**< ppc64 PA6T */ + CPU_ARM_MPCORE, /**< ARM MPCore */ + CPU_ARM_V6, /**< ARM V6 */ ++ CPU_ARM_V7, /**< ARM V7 */ + CPU_PPC64_POWER5pp, /**< ppc64 Power5++ family */ + MAX_CPU_TYPE + } op_cpu; +diff -urN oprofile-0.9.3/libop/op_events.c oprofile-0.9.3.armv7/libop/op_events.c +--- oprofile-0.9.3/libop/op_events.c 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3.armv7/libop/op_events.c 2008-04-23 18:39:30.000000000 +0200 +@@ -788,6 +788,7 @@ + case CPU_ARM_XSCALE2: + case CPU_ARM_MPCORE: + case CPU_ARM_V6: ++ case CPU_ARM_V7: + descr->name = "CPU_CYCLES"; + break; + +diff -urN oprofile-0.9.3/utils/ophelp.c oprofile-0.9.3.armv7/utils/ophelp.c +--- oprofile-0.9.3/utils/ophelp.c 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3.armv7/utils/ophelp.c 2008-04-23 19:17:51.000000000 +0200 +@@ -433,6 +433,11 @@ + printf("See ARM11 Technical Reference Manual\n"); + break; + ++ case CPU_ARM_V7: ++ printf("See ARM11 Technical Reference Manual\n" ++ "Cortex A8 DDI (ARM DDI 0344B, revision r1p1)\n"); ++ break; ++ + case CPU_PPC64_PA6T: + printf("See PA6T Power Implementation Features Book IV\n" + "Chapter 7 Performance Counters\n"); diff --git a/packages/oprofile/oprofile_0.9.3.bb b/packages/oprofile/oprofile_0.9.3.bb index a302068c27..4d6af997af 100644 --- a/packages/oprofile/oprofile_0.9.3.bb +++ b/packages/oprofile/oprofile_0.9.3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "popt binutils" RDEPENDS = "binutils-symlinks" RRECOMMENDS = "kernel-vmlinux" -PR = "r6" +PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://armv6_fix.patch;patch=1 \ @@ -14,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://opstart.patch;patch=1 \ file://fix-arith.patch;patch=1;pnum=0 \ file://gcc43x-fix.patch;patch=1 \ + file://armv7a.diff;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/oprofile-${PV}" diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb index 2096a27b40..786e7046de 100644 --- a/packages/oprofile/oprofile_cvs.bb +++ b/packages/oprofile/oprofile_cvs.bb @@ -7,6 +7,8 @@ LICENSE = "GPL" DEPENDS = "popt binutils" RDEPENDS = "binutils-symlinks" +DEFAULT_PREFERENCE = "-1" + SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \ file://opstart.patch;patch=1 \ file://acinclude.m4" diff --git a/packages/swfdec/swfdec-mozilla_0.7.2.bb b/packages/swfdec/swfdec-mozilla_0.7.2.bb new file mode 100644 index 0000000000..e6f198bdac --- /dev/null +++ b/packages/swfdec/swfdec-mozilla_0.7.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations." +LICENSE = "LGPL" + +DEPENDS = "swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib" + +SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/${P}.tar.gz \ +" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${libdir}/mozilla/plugins/*.so" +FILES_${PN}-dev += "${libdir}/mozilla/plugins/*a" +FILES_${PN}-dbg += "${libdir}/mozilla/plugins/.debug" + diff --git a/packages/u-boot/u-boot-git/beagleboard/base.patch b/packages/u-boot/u-boot-git/beagleboard/base.patch index 1d3a9e5154..dedc34398f 100644 --- a/packages/u-boot/u-boot-git/beagleboard/base.patch +++ b/packages/u-boot/u-boot-git/beagleboard/base.patch @@ -1467,10 +1467,10 @@ index 0000000..2f94684 +#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c new file mode 100644 -index 0000000..7d9a566 +index 0000000..0bdfb72 --- /dev/null +++ b/board/omap3530beagle/omap3530beagle.c -@@ -0,0 +1,388 @@ +@@ -0,0 +1,390 @@ +/* + * (C) Copyright 2004-2008 + * Texas Instruments, <www.ti.com> @@ -1740,6 +1740,8 @@ index 0000000..7d9a566 + *((uint *) 0x49058094) = 0x00000506; + *((uint *) 0x49056094) = 0xF060F000; + ++ /* set clksel_tv and clksel_dss1 */ ++ *((uint *) 0x48004E40) = 0x00001002; + return (0); +} + diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index 545438e9f7..c201eced37 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR="r4" +PR="r6" SRCREV_davinci-sffsdr = "a524e112b424c6843800ea2f19d3a8cf01d0aa94" SRCREV_beagleboard = "a94f22f08f280905926219e568568964cb9eeb9d" |