diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | stp_check | 12 | ||||
| -rwxr-xr-x | stp_check.in | 12 | ||||
| -rw-r--r-- | systemtap.spec.in | 10 |
8 files changed, 42 insertions, 22 deletions
@@ -1,5 +1,11 @@ 2005-08-03 Martin Hunt <hunt@redhat.com> + * stp_check.in : Copy sources to /var/cache/systemtap. + * systemtap.spec.in: Install stp_check. + * Makefile.am (install-exec-local): Install stp_check. + +2005-08-03 Martin Hunt <hunt@redhat.com> + * configure.ac: Add stp_check to AC_CONFIG_FILES. * stp_check.in : New file. diff --git a/Makefile.am b/Makefile.am index bab563c7..13007bdf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,7 @@ dist-hook: install-exec-local: mkdir -p $(DESTDIR)$(libexecdir)/systemtap $(INSTALL) stpd $(DESTDIR)$(libexecdir)/systemtap + $(INSTALL) stp_check $(DESTDIR)$(libexecdir)/systemtap install-data-local: mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport diff --git a/Makefile.in b/Makefile.in index 5dbbfa8d..a3503eef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -888,6 +888,7 @@ dist-hook: install-exec-local: mkdir -p $(DESTDIR)$(libexecdir)/systemtap $(INSTALL) stpd $(DESTDIR)$(libexecdir)/systemtap + $(INSTALL) stp_check $(DESTDIR)$(libexecdir)/systemtap install-data-local: mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for systemtap 0.2.1. +# Generated by GNU Autoconf 2.59 for systemtap 0.2.2. # # Report bugs to <systemtap@sources.redhat.com>. # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='systemtap' PACKAGE_TARNAME='systemtap' -PACKAGE_VERSION='0.2.1' -PACKAGE_STRING='systemtap 0.2.1' +PACKAGE_VERSION='0.2.2' +PACKAGE_STRING='systemtap 0.2.2' PACKAGE_BUGREPORT='systemtap@sources.redhat.com' # Factoring default headers for most tests. @@ -787,7 +787,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures systemtap 0.2.1 to adapt to many kinds of systems. +\`configure' configures systemtap 0.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -849,7 +849,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of systemtap 0.2.1:";; + short | recursive ) echo "Configuration of systemtap 0.2.2:";; esac cat <<\_ACEOF @@ -971,7 +971,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -systemtap configure 0.2.1 +systemtap configure 0.2.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -985,7 +985,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by systemtap $as_me 0.2.1, which was +It was created by systemtap $as_me 0.2.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1630,7 +1630,7 @@ fi # Define the identity of the package. PACKAGE='systemtap' - VERSION='0.2.1' + VERSION='0.2.2' cat >>confdefs.h <<_ACEOF @@ -5568,7 +5568,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by systemtap $as_me 0.2.1, which was +This file was extended by systemtap $as_me 0.2.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5631,7 +5631,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -systemtap config.status 0.2.1 +systemtap config.status 0.2.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 5c3f6f49..0189a2ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl configure.ac --- autoconf input file for systemtap dnl Process this file with autoconf to produce a configure script. -AC_INIT([systemtap], 0.2.1, systemtap@sources.redhat.com, systemtap) +AC_INIT([systemtap], 0.2.2, systemtap@sources.redhat.com, systemtap) AC_PREREQ(2.59) AM_INIT_AUTOMAKE @@ -12,6 +12,8 @@ load_module() if [ "$ret" -ne 0 ] then echo "$MODULE_NAME not in kernel and not built. Compiling..." + mkdir -p $MODULE_DIR + cp -dpr $SRC_DIR/* $MODULE_DIR make -w -C $MODULE_DIR if [ "$?" -ne 0 ] then @@ -28,9 +30,7 @@ load_module() fi } -VAR_DIR=${prefix}/var/lib/systemtap -RELAYFS_DIR=$VAR_DIR/relayfs -STP_CONTROL_DIR=$VAR_DIR/transport +VAR_DIR=${prefix}/var/cache/systemtap RELAYFS=`grep " relayfs_poll" /boot/System.map-\`uname -r\`` if [ -z "$RELAYFS" ] @@ -39,8 +39,9 @@ then if [ -z "$RELAYFS" ] then MODULE_NAME=relayfs - MODULE_DIR=$RELAYFS_DIR + MODULE_DIR=$VAR_DIR/relayfs MODULE=$MODULE_DIR/relayfs.ko + SRC_DIR=${prefix}/share/systemtap/runtime/relayfs load_module fi fi @@ -60,8 +61,9 @@ STP_CONTROL=`lsmod | grep stp_control |awk '{print $1}'` if [ "$STP_CONTROL" != "stp_control" ] then MODULE_NAME=stp-control - MODULE_DIR=$STP_CONTROL_DIR + MODULE_DIR=$VAR_DIR/transport MODULE=$MODULE_DIR/stp-control.ko + SRC_DIR=${prefix}/share/systemtap/runtime/transport load_module fi diff --git a/stp_check.in b/stp_check.in index 30a3c154..2b9bd0e0 100755 --- a/stp_check.in +++ b/stp_check.in @@ -12,6 +12,8 @@ load_module() if [ "$ret" -ne 0 ] then echo "$MODULE_NAME not in kernel and not built. Compiling..." + mkdir -p $MODULE_DIR + cp -dpr $SRC_DIR/* $MODULE_DIR make -w -C $MODULE_DIR if [ "$?" -ne 0 ] then @@ -28,9 +30,7 @@ load_module() fi } -VAR_DIR=@localstatedir@/lib/systemtap -RELAYFS_DIR=$VAR_DIR/relayfs -STP_CONTROL_DIR=$VAR_DIR/transport +VAR_DIR=@localstatedir@/cache/systemtap RELAYFS=`grep " relayfs_poll" /boot/System.map-\`uname -r\`` if [ -z "$RELAYFS" ] @@ -39,8 +39,9 @@ then if [ -z "$RELAYFS" ] then MODULE_NAME=relayfs - MODULE_DIR=$RELAYFS_DIR + MODULE_DIR=$VAR_DIR/relayfs MODULE=$MODULE_DIR/relayfs.ko + SRC_DIR=@datadir@/systemtap/runtime/relayfs load_module fi fi @@ -60,8 +61,9 @@ STP_CONTROL=`lsmod | grep stp_control |awk '{print $1}'` if [ "$STP_CONTROL" != "stp_control" ] then MODULE_NAME=stp-control - MODULE_DIR=$STP_CONTROL_DIR + MODULE_DIR=$VAR_DIR/transport MODULE=$MODULE_DIR/stp-control.ko + SRC_DIR=@datadir@/systemtap/runtime/transport load_module fi diff --git a/systemtap.spec.in b/systemtap.spec.in index 7d619b40..eb282db2 100644 --- a/systemtap.spec.in +++ b/systemtap.spec.in @@ -98,6 +98,8 @@ mkdir -p ${installed_elfutils} cp -P lib-elfutils/*.so* lib-elfutils/%{name}/*.so* ${installed_elfutils}/ %endif +mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap + %check make check %{?elfutils_mflags} || : @@ -111,12 +113,14 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/stap %{_mandir}/man1/* -%{_libexecdir}/systemtap/stpd +%{_libexecdir}/systemtap/* %dir %{_datadir}/systemtap %{_datadir}/systemtap/runtime %{_datadir}/systemtap/tapset +%dir %attr(0755,root,root) /var/cache/systemtap + %if %{bundled_elfutils} %dir %{_libdir}/%{name} %{_libdir}/%{name}/lib*.so* @@ -124,6 +128,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Aug 3 2005 Martin Hunt <hunt@redhat.com> - 0.2.2-1 +- Add directory /var/cache/systemtap +- Add stp_check to /usr/libexec/systemtap + * Wed Aug 3 2005 Roland McGrath <roland@redhat.com> - 0.2.1-1 - New version 0.2.1, various fixes. |