diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | stp_check | 67 | ||||
| -rwxr-xr-x | stp_check.in | 67 |
7 files changed, 151 insertions, 11 deletions
@@ -1,3 +1,8 @@ +2005-08-03 Martin Hunt <hunt@redhat.com> + + * configure.ac: Add stp_check to AC_CONFIG_FILES. + * stp_check.in : New file. + 2005-08-03 Frank Ch. Eigler <fche@elastic.org> * README: Be more specific about prerequisites. diff --git a/Makefile.in b/Makefile.in index 6986133c..5dbbfa8d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,8 +16,6 @@ # Makefile.am --- automake input file for systemtap -SOURCES = $(stap_SOURCES) $(stpd_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -43,9 +41,9 @@ noinst_PROGRAMS = stpd$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.in $(srcdir)/systemtap.spec.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO depcomp install-sh missing + $(srcdir)/config.in $(srcdir)/stp_check.in \ + $(srcdir)/systemtap.spec.in $(top_srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL NEWS TODO depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -54,7 +52,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = systemtap.spec +CONFIG_CLEAN_FILES = systemtap.spec stp_check am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) @@ -277,6 +275,8 @@ distclean-hdr: -rm -f config.h stamp-h1 systemtap.spec: $(top_builddir)/config.status $(srcdir)/systemtap.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ +stp_check: $(top_builddir)/config.status $(srcdir)/stp_check.in + cd $(top_builddir) && $(SHELL) ./config.status $@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -5169,7 +5169,7 @@ _ACEOF ac_config_headers="$ac_config_headers config.h:config.in" - ac_config_files="$ac_config_files Makefile systemtap.spec" + ac_config_files="$ac_config_files Makefile systemtap.spec stp_check" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5743,6 +5743,7 @@ do # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "systemtap.spec" ) CONFIG_FILES="$CONFIG_FILES systemtap.spec" ;; + "stp_check" ) CONFIG_FILES="$CONFIG_FILES stp_check" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 diff --git a/configure.ac b/configure.ac index 209ede4b..5c3f6f49 100644 --- a/configure.ac +++ b/configure.ac @@ -40,5 +40,5 @@ AC_DEFINE_UNQUOTED(DATE, "$date", [Configuration/build date]) AC_SUBST(DATE) AC_CONFIG_HEADERS([config.h:config.in]) -AC_CONFIG_FILES(Makefile systemtap.spec) +AC_CONFIG_FILES(Makefile systemtap.spec stp_check) AC_OUTPUT diff --git a/stp_check b/stp_check new file mode 100644 index 00000000..0c49d3e7 --- /dev/null +++ b/stp_check @@ -0,0 +1,67 @@ +#!/bin/bash + +load_module() +{ + ret=1 + if [ -e "$MODULE" ] + then + /sbin/insmod $MODULE + ret=$? + fi + + if [ "$ret" -ne 0 ] + then + echo "$MODULE_NAME not in kernel and not built. Compiling..." + make -w -C $MODULE_DIR + if [ "$?" -ne 0 ] + then + echo "Failed to load module $MODULE_NAME." + exit $? + fi + + /sbin/insmod $MODULE + if [ "$?" -ne 0 ] + then + echo "Failed to load module $MODULE_NAME." + exit $? + fi + fi +} + +VAR_DIR=${prefix}/var/lib/systemtap +RELAYFS_DIR=$VAR_DIR/relayfs +STP_CONTROL_DIR=$VAR_DIR/transport + +RELAYFS=`grep " relayfs_poll" /boot/System.map-\`uname -r\`` +if [ -z "$RELAYFS" ] +then + RELAYFS=`lsmod | grep relayfs` + if [ -z "$RELAYFS" ] + then + MODULE_NAME=relayfs + MODULE_DIR=$RELAYFS_DIR + MODULE=$MODULE_DIR/relayfs.ko + load_module + fi +fi + +if [ ! -d "/mnt/relay" ] +then + mkdir /mnt/relay +fi + +MOUNT=`mount | grep relayfs |awk '{print $1}'` +if [ "$MOUNT" != "relayfs" ] +then + mount -t relayfs relayfs /mnt/relay +fi + +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=$MODULE_DIR/stp-control.ko + load_module +fi + diff --git a/stp_check.in b/stp_check.in new file mode 100755 index 00000000..30a3c154 --- /dev/null +++ b/stp_check.in @@ -0,0 +1,67 @@ +#!/bin/bash + +load_module() +{ + ret=1 + if [ -e "$MODULE" ] + then + /sbin/insmod $MODULE + ret=$? + fi + + if [ "$ret" -ne 0 ] + then + echo "$MODULE_NAME not in kernel and not built. Compiling..." + make -w -C $MODULE_DIR + if [ "$?" -ne 0 ] + then + echo "Failed to load module $MODULE_NAME." + exit $? + fi + + /sbin/insmod $MODULE + if [ "$?" -ne 0 ] + then + echo "Failed to load module $MODULE_NAME." + exit $? + fi + fi +} + +VAR_DIR=@localstatedir@/lib/systemtap +RELAYFS_DIR=$VAR_DIR/relayfs +STP_CONTROL_DIR=$VAR_DIR/transport + +RELAYFS=`grep " relayfs_poll" /boot/System.map-\`uname -r\`` +if [ -z "$RELAYFS" ] +then + RELAYFS=`lsmod | grep relayfs` + if [ -z "$RELAYFS" ] + then + MODULE_NAME=relayfs + MODULE_DIR=$RELAYFS_DIR + MODULE=$MODULE_DIR/relayfs.ko + load_module + fi +fi + +if [ ! -d "/mnt/relay" ] +then + mkdir /mnt/relay +fi + +MOUNT=`mount | grep relayfs |awk '{print $1}'` +if [ "$MOUNT" != "relayfs" ] +then + mount -t relayfs relayfs /mnt/relay +fi + +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=$MODULE_DIR/stp-control.ko + load_module +fi + |