summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-06-10 11:20:56 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-10 11:20:56 +0000
commite2e769cf5aaf5d0cd39cfd563d694af446588a30 (patch)
tree396ff4932a5520cba787d5b29d36a6a9251b047a
parent77da90f344c9f4d55eb5cac92c8d3a7e77f6884c (diff)
parent14ddbd9a7ebc0ae29b6bf9ec1b65626f607a5ff8 (diff)
merge of 3c51b3a56df4d11fa759fd5ddbaf3fd02c7ac250
and a11a9b2115534b69d4caed3521f23c8da3c2c11f
-rw-r--r--conf/distro/slugos.conf2
-rw-r--r--packages/ltt/ltt-0.9.5a+0.9.6pre2/.mtn2git_empty0
-rw-r--r--packages/ltt/ltt-0.9.5a+0.9.6pre2/gcc34.patch22
-rw-r--r--packages/ltt/ltt-0.9.5a+0.9.6pre2/m4.patch401
-rw-r--r--packages/ltt/ltt-0.9.6-pre4/.mtn2git_empty0
-rw-r--r--packages/ltt/ltt-0.9.6-pre4/m4.patch401
-rw-r--r--packages/ltt/ltt_0.9.5a+0.9.6pre2.bb27
-rw-r--r--packages/ltt/ltt_0.9.6-pre4.bb21
-rw-r--r--packages/lttng/.mtn2git_empty (renamed from packages/ltt/.mtn2git_empty)0
-rw-r--r--packages/lttng/lttng-control_0.6.bb16
-rw-r--r--packages/lttng/lttng-viewer_0.8.41-20060512.bb20
11 files changed, 37 insertions, 873 deletions
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index b1591efadd..d868f099e7 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -36,7 +36,7 @@
#DISTRO_TYPE
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "3.7"
+SLUGOS_VERSION = "4.0"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
diff --git a/packages/ltt/ltt-0.9.5a+0.9.6pre2/.mtn2git_empty b/packages/ltt/ltt-0.9.5a+0.9.6pre2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ltt/ltt-0.9.5a+0.9.6pre2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ltt/ltt-0.9.5a+0.9.6pre2/gcc34.patch b/packages/ltt/ltt-0.9.5a+0.9.6pre2/gcc34.patch
deleted file mode 100644
index 79ad1311f7..0000000000
--- a/packages/ltt/ltt-0.9.5a+0.9.6pre2/gcc34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- TraceToolkit-0.9.5/LibLTT/EventDB.c~gcc34.patch 2002-04-15 12:10:13.000000000 -0400
-+++ TraceToolkit-0.9.5/LibLTT/EventDB.c 2004-05-11 16:09:39.000000000 -0400
-@@ -2801,7 +2801,7 @@
- lLastCtrlEventTime = lEventTime;
- }
-
--NoControlEvent:
-+NoControlEvent: ;
- } while(DBEventNext(pmTraceDB, &lEvent) == TRUE);
-
- /* Remember the last event and its time */
---- TraceToolkit-0.9.5/LibLTT/RTAIDB.c~gcc34.patch 2002-04-15 23:00:05.000000000 -0400
-+++ TraceToolkit-0.9.5/LibLTT/RTAIDB.c 2004-05-11 16:11:04.000000000 -0400
-@@ -2937,7 +2937,7 @@
- lLastCtrlEventTime = lEventTime;
- }
-
--NoControlEvent:
-+NoControlEvent: ;
- } while(DBEventNext(pmTraceDB, &lEvent) == TRUE);
-
- /* Remember the last event and it's time */
diff --git a/packages/ltt/ltt-0.9.5a+0.9.6pre2/m4.patch b/packages/ltt/ltt-0.9.5a+0.9.6pre2/m4.patch
deleted file mode 100644
index 384840b055..0000000000
--- a/packages/ltt/ltt-0.9.5a+0.9.6pre2/m4.patch
+++ /dev/null
@@ -1,401 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- /dev/null
-+++ TraceToolkit-0.9.6pre2/m4/gtk.m4
-@@ -0,0 +1,194 @@
-+# Configure paths for GTK+
-+# Owen Taylor 97-11-3
-+
-+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_GTK,
-+[dnl
-+dnl Get the cflags and libraries from the gtk-config script
-+dnl
-+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
-+ gtk_config_prefix="$withval", gtk_config_prefix="")
-+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
-+ , enable_gtktest=yes)
-+
-+ for module in . $4
-+ do
-+ case "$module" in
-+ gthread)
-+ gtk_config_args="$gtk_config_args gthread"
-+ ;;
-+ esac
-+ done
-+
-+ if test x$gtk_config_exec_prefix != x ; then
-+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-+ if test x${GTK_CONFIG+set} != xset ; then
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ fi
-+ fi
-+ if test x$gtk_config_prefix != x ; then
-+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-+ if test x${GTK_CONFIG+set} != xset ; then
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ fi
-+ fi
-+
-+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+ min_gtk_version=ifelse([$1], ,0.99.7,$1)
-+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-+ no_gtk=""
-+ if test "$GTK_CONFIG" = "no" ; then
-+ no_gtk=yes
-+ else
-+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_gtktest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $GTK_CFLAGS"
-+ LIBS="$GTK_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GTK is sufficiently new. (Also sanity
-+dnl checks the results of gtk-config to some extent
-+dnl
-+ rm -f conf.gtktest
-+ AC_TRY_RUN([
-+#include <gtk/gtk.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int
-+main ()
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ system ("touch conf.gtktest");
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = g_strdup("$min_gtk_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+ printf("%s, bad version string\n", "$min_gtk_version");
-+ exit(1);
-+ }
-+
-+ if ((gtk_major_version != $gtk_config_major_version) ||
-+ (gtk_minor_version != $gtk_config_minor_version) ||
-+ (gtk_micro_version != $gtk_config_micro_version))
-+ {
-+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-+ gtk_major_version, gtk_minor_version, gtk_micro_version);
-+ printf ("*** was found! If gtk-config was correct, then it is best\n");
-+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+ printf("*** required on your system.\n");
-+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+ printf("*** before re-running configure\n");
-+ }
-+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-+ (gtk_minor_version != GTK_MINOR_VERSION) ||
-+ (gtk_micro_version != GTK_MICRO_VERSION))
-+ {
-+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-+ printf("*** library (version %d.%d.%d)\n",
-+ gtk_major_version, gtk_minor_version, gtk_micro_version);
-+ }
-+#endif /* defined (GTK_MAJOR_VERSION) ... */
-+ else
-+ {
-+ if ((gtk_major_version > major) ||
-+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-+ gtk_major_version, gtk_minor_version, gtk_micro_version);
-+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-+ major, minor, micro);
-+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-+ printf("***\n");
-+ printf("*** If you have already installed a sufficiently new version, this error\n");
-+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-+ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+ printf("*** so that the correct libraries are found at run-time))\n");
-+ }
-+ }
-+ return 1;
-+}
-+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_gtk" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$GTK_CONFIG" = "no" ; then
-+ echo "*** The gtk-config script installed by GTK could not be found"
-+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the GTK_CONFIG environment variable to the"
-+ echo "*** full path to gtk-config."
-+ else
-+ if test -f conf.gtktest ; then
-+ :
-+ else
-+ echo "*** Could not run GTK test program, checking why..."
-+ CFLAGS="$CFLAGS $GTK_CFLAGS"
-+ LIBS="$LIBS $GTK_LIBS"
-+ AC_TRY_LINK([
-+#include <gtk/gtk.h>
-+#include <stdio.h>
-+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding GTK or finding the wrong"
-+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+ echo "***"
-+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-+ echo "*** came with the system with the command"
-+ echo "***"
-+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-+ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ GTK_CFLAGS=""
-+ GTK_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(GTK_CFLAGS)
-+ AC_SUBST(GTK_LIBS)
-+ rm -f conf.gtktest
-+])
---- /dev/null
-+++ TraceToolkit-0.9.6pre2/m4/glib.m4
-@@ -0,0 +1,196 @@
-+# Configure paths for GLIB
-+# Owen Taylor 97-11-3
-+
-+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
-+dnl gthread is specified in MODULES, pass to glib-config
-+dnl
-+AC_DEFUN(AM_PATH_GLIB,
-+[dnl
-+dnl Get the cflags and libraries from the glib-config script
-+dnl
-+AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
-+ glib_config_prefix="$withval", glib_config_prefix="")
-+AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-+ glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-+AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
-+ , enable_glibtest=yes)
-+
-+ if test x$glib_config_exec_prefix != x ; then
-+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-+ if test x${GLIB_CONFIG+set} != xset ; then
-+ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-+ fi
-+ fi
-+ if test x$glib_config_prefix != x ; then
-+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-+ if test x${GLIB_CONFIG+set} != xset ; then
-+ GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-+ fi
-+ fi
-+
-+ for module in . $4
-+ do
-+ case "$module" in
-+ gmodule)
-+ glib_config_args="$glib_config_args gmodule"
-+ ;;
-+ gthread)
-+ glib_config_args="$glib_config_args gthread"
-+ ;;
-+ esac
-+ done
-+
-+ AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-+ min_glib_version=ifelse([$1], ,0.99.7,$1)
-+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-+ no_glib=""
-+ if test "$GLIB_CONFIG" = "no" ; then
-+ no_glib=yes
-+ else
-+ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-+ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-+ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_glibtest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+ LIBS="$GLIB_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-+dnl checks the results of glib-config to some extent
-+dnl
-+ rm -f conf.glibtest
-+ AC_TRY_RUN([
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int
-+main ()
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ system ("touch conf.glibtest");
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = g_strdup("$min_glib_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+ printf("%s, bad version string\n", "$min_glib_version");
-+ exit(1);
-+ }
-+
-+ if ((glib_major_version != $glib_config_major_version) ||
-+ (glib_minor_version != $glib_config_minor_version) ||
-+ (glib_micro_version != $glib_config_micro_version))
-+ {
-+ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
-+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ printf ("*** was found! If glib-config was correct, then it is best\n");
-+ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+ printf("*** required on your system.\n");
-+ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-+ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-+ printf("*** before re-running configure\n");
-+ }
-+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-+ (glib_minor_version != GLIB_MINOR_VERSION) ||
-+ (glib_micro_version != GLIB_MICRO_VERSION))
-+ {
-+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-+ printf("*** library (version %d.%d.%d)\n",
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ }
-+ else
-+ {
-+ if ((glib_major_version > major) ||
-+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
-+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-+ major, minor, micro);
-+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-+ printf("***\n");
-+ printf("*** If you have already installed a sufficiently new version, this error\n");
-+ printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-+ printf("*** correct copy of glib-config. (In this case, you will have to\n");
-+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+ printf("*** so that the correct libraries are found at run-time))\n");
-+ }
-+ }
-+ return 1;
-+}
-+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_glib" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$GLIB_CONFIG" = "no" ; then
-+ echo "*** The glib-config script installed by GLIB could not be found"
-+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-+ echo "*** full path to glib-config."
-+ else
-+ if test -f conf.glibtest ; then
-+ :
-+ else
-+ echo "*** Could not run GLIB test program, checking why..."
-+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+ LIBS="$LIBS $GLIB_LIBS"
-+ AC_TRY_LINK([
-+#include <glib.h>
-+#include <stdio.h>
-+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+ echo "***"
-+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-+ echo "*** came with the system with the command"
-+ echo "***"
-+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-+ echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-+ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ GLIB_CFLAGS=""
-+ GLIB_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(GLIB_CFLAGS)
-+ AC_SUBST(GLIB_LIBS)
-+ rm -f conf.glibtest
-+])
diff --git a/packages/ltt/ltt-0.9.6-pre4/.mtn2git_empty b/packages/ltt/ltt-0.9.6-pre4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ltt/ltt-0.9.6-pre4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ltt/ltt-0.9.6-pre4/m4.patch b/packages/ltt/ltt-0.9.6-pre4/m4.patch
deleted file mode 100644
index 384840b055..0000000000
--- a/packages/ltt/ltt-0.9.6-pre4/m4.patch
+++ /dev/null
@@ -1,401 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- /dev/null
-+++ TraceToolkit-0.9.6pre2/m4/gtk.m4
-@@ -0,0 +1,194 @@
-+# Configure paths for GTK+
-+# Owen Taylor 97-11-3
-+
-+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_GTK,
-+[dnl
-+dnl Get the cflags and libraries from the gtk-config script
-+dnl
-+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
-+ gtk_config_prefix="$withval", gtk_config_prefix="")
-+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
-+ , enable_gtktest=yes)
-+
-+ for module in . $4
-+ do
-+ case "$module" in
-+ gthread)
-+ gtk_config_args="$gtk_config_args gthread"
-+ ;;
-+ esac
-+ done
-+
-+ if test x$gtk_config_exec_prefix != x ; then
-+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-+ if test x${GTK_CONFIG+set} != xset ; then
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ fi
-+ fi
-+ if test x$gtk_config_prefix != x ; then
-+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-+ if test x${GTK_CONFIG+set} != xset ; then
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ fi
-+ fi
-+
-+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+ min_gtk_version=ifelse([$1], ,0.99.7,$1)
-+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-+ no_gtk=""
-+ if test "$GTK_CONFIG" = "no" ; then
-+ no_gtk=yes
-+ else
-+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_gtktest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $GTK_CFLAGS"
-+ LIBS="$GTK_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GTK is sufficiently new. (Also sanity
-+dnl checks the results of gtk-config to some extent
-+dnl
-+ rm -f conf.gtktest
-+ AC_TRY_RUN([
-+#include <gtk/gtk.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int
-+main ()
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ system ("touch conf.gtktest");
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = g_strdup("$min_gtk_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+ printf("%s, bad version string\n", "$min_gtk_version");
-+ exit(1);
-+ }
-+
-+ if ((gtk_major_version != $gtk_config_major_version) ||
-+ (gtk_minor_version != $gtk_config_minor_version) ||
-+ (gtk_micro_version != $gtk_config_micro_version))
-+ {
-+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-+ gtk_major_version, gtk_minor_version, gtk_micro_version);
-+ printf ("*** was found! If gtk-config was correct, then it is best\n");
-+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+ printf("*** required on your system.\n");
-+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+ printf("*** before re-running configure\n");
-+ }
-+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-+ (gtk_minor_version != GTK_MINOR_VERSION) ||
-+ (gtk_micro_version != GTK_MICRO_VERSION))
-+ {
-+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-+ printf("*** library (version %d.%d.%d)\n",
-+ gtk_major_version, gtk_minor_version, gtk_micro_version);
-+ }
-+#endif /* defined (GTK_MAJOR_VERSION) ... */
-+ else
-+ {
-+ if ((gtk_major_version > major) ||
-+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-+ gtk_major_version, gtk_minor_version, gtk_micro_version);
-+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-+ major, minor, micro);
-+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-+ printf("***\n");
-+ printf("*** If you have already installed a sufficiently new version, this error\n");
-+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-+ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+ printf("*** so that the correct libraries are found at run-time))\n");
-+ }
-+ }
-+ return 1;
-+}
-+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_gtk" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$GTK_CONFIG" = "no" ; then
-+ echo "*** The gtk-config script installed by GTK could not be found"
-+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the GTK_CONFIG environment variable to the"
-+ echo "*** full path to gtk-config."
-+ else
-+ if test -f conf.gtktest ; then
-+ :
-+ else
-+ echo "*** Could not run GTK test program, checking why..."
-+ CFLAGS="$CFLAGS $GTK_CFLAGS"
-+ LIBS="$LIBS $GTK_LIBS"
-+ AC_TRY_LINK([
-+#include <gtk/gtk.h>
-+#include <stdio.h>
-+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding GTK or finding the wrong"
-+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+ echo "***"
-+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-+ echo "*** came with the system with the command"
-+ echo "***"
-+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-+ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ GTK_CFLAGS=""
-+ GTK_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(GTK_CFLAGS)
-+ AC_SUBST(GTK_LIBS)
-+ rm -f conf.gtktest
-+])
---- /dev/null
-+++ TraceToolkit-0.9.6pre2/m4/glib.m4
-@@ -0,0 +1,196 @@
-+# Configure paths for GLIB
-+# Owen Taylor 97-11-3
-+
-+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
-+dnl gthread is specified in MODULES, pass to glib-config
-+dnl
-+AC_DEFUN(AM_PATH_GLIB,
-+[dnl
-+dnl Get the cflags and libraries from the glib-config script
-+dnl
-+AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
-+ glib_config_prefix="$withval", glib_config_prefix="")
-+AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-+ glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-+AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
-+ , enable_glibtest=yes)
-+
-+ if test x$glib_config_exec_prefix != x ; then
-+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-+ if test x${GLIB_CONFIG+set} != xset ; then
-+ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-+ fi
-+ fi
-+ if test x$glib_config_prefix != x ; then
-+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-+ if test x${GLIB_CONFIG+set} != xset ; then
-+ GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-+ fi
-+ fi
-+
-+ for module in . $4
-+ do
-+ case "$module" in
-+ gmodule)
-+ glib_config_args="$glib_config_args gmodule"
-+ ;;
-+ gthread)
-+ glib_config_args="$glib_config_args gthread"
-+ ;;
-+ esac
-+ done
-+
-+ AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-+ min_glib_version=ifelse([$1], ,0.99.7,$1)
-+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-+ no_glib=""
-+ if test "$GLIB_CONFIG" = "no" ; then
-+ no_glib=yes
-+ else
-+ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-+ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-+ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_glibtest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+ LIBS="$GLIB_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-+dnl checks the results of glib-config to some extent
-+dnl
-+ rm -f conf.glibtest
-+ AC_TRY_RUN([
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int
-+main ()
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ system ("touch conf.glibtest");
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = g_strdup("$min_glib_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+ printf("%s, bad version string\n", "$min_glib_version");
-+ exit(1);
-+ }
-+
-+ if ((glib_major_version != $glib_config_major_version) ||
-+ (glib_minor_version != $glib_config_minor_version) ||
-+ (glib_micro_version != $glib_config_micro_version))
-+ {
-+ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
-+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ printf ("*** was found! If glib-config was correct, then it is best\n");
-+ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+ printf("*** required on your system.\n");
-+ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-+ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-+ printf("*** before re-running configure\n");
-+ }
-+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-+ (glib_minor_version != GLIB_MINOR_VERSION) ||
-+ (glib_micro_version != GLIB_MICRO_VERSION))
-+ {
-+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-+ printf("*** library (version %d.%d.%d)\n",
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ }
-+ else
-+ {
-+ if ((glib_major_version > major) ||
-+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
-+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-+ major, minor, micro);
-+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-+ printf("***\n");
-+ printf("*** If you have already installed a sufficiently new version, this error\n");
-+ printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-+ printf("*** correct copy of glib-config. (In this case, you will have to\n");
-+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+ printf("*** so that the correct libraries are found at run-time))\n");
-+ }
-+ }
-+ return 1;
-+}
-+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_glib" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$GLIB_CONFIG" = "no" ; then
-+ echo "*** The glib-config script installed by GLIB could not be found"
-+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-+ echo "*** full path to glib-config."
-+ else
-+ if test -f conf.glibtest ; then
-+ :
-+ else
-+ echo "*** Could not run GLIB test program, checking why..."
-+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+ LIBS="$LIBS $GLIB_LIBS"
-+ AC_TRY_LINK([
-+#include <glib.h>
-+#include <stdio.h>
-+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+ echo "***"
-+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-+ echo "*** came with the system with the command"
-+ echo "***"
-+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-+ echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-+ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ GLIB_CFLAGS=""
-+ GLIB_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(GLIB_CFLAGS)
-+ AC_SUBST(GLIB_LIBS)
-+ rm -f conf.glibtest
-+])
diff --git a/packages/ltt/ltt_0.9.5a+0.9.6pre2.bb b/packages/ltt/ltt_0.9.5a+0.9.6pre2.bb
deleted file mode 100644
index 531afad383..0000000000
--- a/packages/ltt/ltt_0.9.5a+0.9.6pre2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SECTION = "devel"
-DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
-extract program execution details from the Linux operating system and \
-interpret them."
-LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-
-# NOTE: we're applying the relayfs patch. therefore, this version of the
-# tools will only work with a kernel that uses that particular incarnation
-# of the ltt patch. We probably need a way to exert control over this
-# based on a variable that ${MACHINE}.conf can manipulate.
-SRC_URI = "http://www.opersys.com/ftp/pub/LTT/TraceToolkit-0.9.6pre2.tgz \
- http://www.opersys.com/ftp/pub/relayfs/LTT/patch-ltt-on-relayfs-0.9.6pre2.bz2;patch=1 \
- file://gcc34.patch;patch=1 \
- file://m4.patch;patch=1"
-S = "${WORKDIR}/TraceToolkit-0.9.6pre2"
-
-inherit autotools
-
-INHIBIT_PACKAGE_STRIP = "1"
-EXTRA_OECONF = "--without-rtai \
- --without-gtk"
-
-do_configure () {
- rm -f ${S}/acinclude.m4
- autotools_do_configure
-}
diff --git a/packages/ltt/ltt_0.9.6-pre4.bb b/packages/ltt/ltt_0.9.6-pre4.bb
deleted file mode 100644
index d17d90d430..0000000000
--- a/packages/ltt/ltt_0.9.6-pre4.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SECTION = "devel"
-DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
-extract program execution details from the Linux operating system and \
-interpret them."
-LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-
-SRC_URI = "http://www.opersys.com/ftp/pub/LTT/ltt-${PV}.tar.bz2 \
- file://m4.patch;patch=1"
-
-inherit autotools
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-EXTRA_OECONF = "--without-rtai \
- --without-gtk"
-
-do_configure () {
- rm -f ${S}/acinclude.m4
- autotools_do_configure
-}
diff --git a/packages/ltt/.mtn2git_empty b/packages/lttng/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ltt/.mtn2git_empty
+++ b/packages/lttng/.mtn2git_empty
diff --git a/packages/lttng/lttng-control_0.6.bb b/packages/lttng/lttng-control_0.6.bb
new file mode 100644
index 0000000000..b18f507e9d
--- /dev/null
+++ b/packages/lttng/lttng-control_0.6.bb
@@ -0,0 +1,16 @@
+SECTION = "devel"
+DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
+extract program execution details from the Linux operating system and \
+interpret them."
+LICENSE = "GPL"
+MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
+
+SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-28042006.tar.gz"
+
+S = "${WORKDIR}/ltt-control-${PV}-28042006"
+
+inherit autotools
+
+export KERNELDIR="${STAGING_KERNEL_DIR}"
+
+FILES_${PN} += "${datadir}/ltt-control/facilities/*" \ No newline at end of file
diff --git a/packages/lttng/lttng-viewer_0.8.41-20060512.bb b/packages/lttng/lttng-viewer_0.8.41-20060512.bb
new file mode 100644
index 0000000000..c6069bc794
--- /dev/null
+++ b/packages/lttng/lttng-viewer_0.8.41-20060512.bb
@@ -0,0 +1,20 @@
+SECTION = "devel"
+DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
+extract program execution details from the Linux operating system and \
+interpret them."
+LICENSE = "GPL"
+MAINTAINER = "Richrd Purdie <richard@openedhand.com>"
+PR = "r1"
+DEPENDS = "gtk+ pango popt"
+
+ALTNAME = "LinuxTraceToolkitViewer-0.8.41-12052006"
+
+SRC_URI = "http://ltt.polymtl.ca/packages/${ALTNAME}.tar.gz "
+S = "${WORKDIR}/${ALTNAME}"
+
+inherit autotools
+
+FILES_${PN} += "\
+ ${libdir}/lttv/plugins/* \
+ ${datadir}/LinuxTraceToolkitViewer/facilities/* \
+ ${datadir}/LinuxTraceToolkitViewer/pixmaps/* "