PR 10247 10276 10905: Infrastructure for moving underlying client/server tools to libexec.

15 files changed, 76 insertions, 46 deletions

diff --git a/Makefile.am b/Makefile.am
index f1418d6c..e590f65f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ man/stapprobes.tcp.3stap man/stapprobes.udp.3stap
 
 bin_PROGRAMS = staprun
 bin_SCRIPTS = stap-report
+pkglibexec_SCRIPTS = stap-env
 oldinclude_HEADERS = includes/sys/sdt.h
 
 if BUILD_TRANSLATOR
@@ -34,7 +35,7 @@ bin_SCRIPTS += dtrace
 if HAVE_NSS
 man_MANS += stap-authorize-signing-cert.8
 bin_PROGRAMS += stap-sign-module
-bin_SCRIPTS += stap-env stap-gen-cert stap-authorize-cert stap-authorize-signing-cert
+bin_SCRIPTS += stap-gen-cert stap-authorize-cert stap-authorize-signing-cert
 
 if BUILD_SERVER
 man_MANS += stap-client.8 stap-server.8 stap-authorize-server-cert.8
@@ -113,9 +114,12 @@ install-exec-local: install-scripts
 
 PHONIES += install-scripts
 # scripts must be installed before this rule is run
-install-scripts: install-binSCRIPTS
+install-scripts: install-binSCRIPTS install-pkglibexecSCRIPTS
 	for f in $(bin_SCRIPTS); do \
-	   sed -i -e "/INSTALL-HOOK/d;s,exec_prefix=.*,exec_prefix=$(exec_prefix)/bin/,;s,sysconfdir=.*,sysconfdir=$(sysconfdir)," $(DESTDIR)$(bindir)/$$f; \
+	   sed -i -e "s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(bindir)/$$f; \
+	done
+	for f in $(pkglibexec_SCRIPTS); do \
+	   sed -i -e "/INSTALL-HOOK/d;s,exec_prefix=.*,exec_prefix=$(exec_prefix)/bin/,;s,sysconfdir=.*,sysconfdir=$(sysconfdir),;s,pkglibexecdir=.*,pkglibexecdir=$(pkglibexecdir)," $(DESTDIR)$(pkglibexecdir)/$$f; \
 	done
 endif
 endif
@@ -179,7 +183,7 @@ install-exec-hook:
 
 
 pkglibexec_PROGRAMS = stapio
-CLEANFILES +=  $(pkglibexec_PROGRAMS)
+CLEANFILES +=  $(pkglibexec_PROGRAMS) $(pkglibexec_SCRIPTS)
 
 if BUILD_TRANSLATOR
 if HAVE_NSS
diff --git a/Makefile.in b/Makefile.in
index 380ae06d..8c6c26a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ bin_PROGRAMS = staprun$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
 @BUILD_TRANSLATOR_TRUE@am__append_3 = dtrace
 @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_4 = stap-authorize-signing-cert.8
 @BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_5 = stap-sign-module
-@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_6 = stap-env stap-gen-cert stap-authorize-cert stap-authorize-signing-cert
+@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_6 = stap-gen-cert stap-authorize-cert stap-authorize-signing-cert
 @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_7 = stap-client.8 stap-server.8 stap-authorize-server-cert.8
 @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_8 = stap-client-connect stap-server-connect
 @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_9 = stap-client stap-serverd stap-server stap-find-servers \
@@ -116,9 +116,9 @@ CONFIG_CLEAN_FILES = stap.1 stapprobes.3stap stapfuncs.3stap \
 @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__EXEEXT_3 = stap-client-connect$(EXEEXT) \
 @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	stap-server-connect$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
-	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man8dir)" \
-	"$(DESTDIR)$(oldincludedir)"
+	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
+	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \
+	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(oldincludedir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 pkglibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS)
@@ -194,7 +194,8 @@ staprun_DEPENDENCIES = $(am__DEPENDENCIES_1)
 staprun_LINK = $(CCLD) $(staprun_CFLAGS) $(CFLAGS) $(staprun_LDFLAGS) \
 	$(LDFLAGS) -o $@
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS)
+pkglibexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS) $(pkglibexec_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -371,6 +372,7 @@ man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap \
 	$(am__append_7)
 bin_SCRIPTS = stap-report $(am__append_3) $(am__append_6) \
 	$(am__append_9)
+pkglibexec_SCRIPTS = stap-env
 oldinclude_HEADERS = includes/sys/sdt.h
 @BUILD_TRANSLATOR_TRUE@stap_SOURCES = main.cxx \
 @BUILD_TRANSLATOR_TRUE@	parse.cxx staptree.cxx elaborate.cxx translate.cxx \
@@ -393,7 +395,8 @@ oldinclude_HEADERS = includes/sys/sdt.h
 # instead of foo_SOURCES prevents shipping git_version.h in dist tarballs,
 # which may cause false GIT_FOO readings.
 BUILT_SOURCES = git_version.stamp $(am__append_13)
-CLEANFILES = git_version.h $(am__append_14) $(pkglibexec_PROGRAMS)
+CLEANFILES = git_version.h $(am__append_14) $(pkglibexec_PROGRAMS) \
+	$(pkglibexec_SCRIPTS)
 GIT_VERSION_CMD = $(SHELL) $(top_srcdir)/git_version.sh
 PHONIES = $(am__append_10) $(am__append_16) dist-gzip
 @BUILD_TRANSLATOR_TRUE@stap_CFLAGS = $(AM_CFLAGS) @PIECFLAGS@ -D_FILE_OFFSET_BITS=64
@@ -653,6 +656,25 @@ uninstall-binSCRIPTS:
 	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
+install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
+	@list='$(pkglibexec_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(pkglibexecSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibexecdir)/$$f'"; \
+	    $(pkglibexecSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibexecdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pkglibexecSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglibexec_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(pkglibexecdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkglibexecdir)/$$f"; \
+	done
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1654,7 +1676,7 @@ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(HEADERS) config.h \
 		all-local
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(oldincludedir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(oldincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -1713,7 +1735,8 @@ install-data-am: install-data-local install-man \
 install-dvi: install-dvi-recursive
 
 install-exec-am: install-binPROGRAMS install-binSCRIPTS \
-	install-exec-local install-pkglibexecPROGRAMS
+	install-exec-local install-pkglibexecPROGRAMS \
+	install-pkglibexecSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
@@ -1750,7 +1773,7 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-local uninstall-man uninstall-oldincludeHEADERS \
-	uninstall-pkglibexecPROGRAMS
+	uninstall-pkglibexecPROGRAMS uninstall-pkglibexecSCRIPTS
 
 uninstall-man: uninstall-man1 uninstall-man3 uninstall-man8
 
@@ -1770,14 +1793,16 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall-man8
 	install-html install-html-am install-info install-info-am \
 	install-man install-man1 install-man3 install-man8 \
 	install-oldincludeHEADERS install-pdf install-pdf-am \
-	install-pkglibexecPROGRAMS install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-local \
-	uninstall-man uninstall-man1 uninstall-man3 uninstall-man8 \
-	uninstall-oldincludeHEADERS uninstall-pkglibexecPROGRAMS
+	install-pkglibexecPROGRAMS install-pkglibexecSCRIPTS \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-binSCRIPTS uninstall-local uninstall-man \
+	uninstall-man1 uninstall-man3 uninstall-man8 \
+	uninstall-oldincludeHEADERS uninstall-pkglibexecPROGRAMS \
+	uninstall-pkglibexecSCRIPTS
 
 git_version.stamp:
 	@if test -f "$(srcdir)/git_version.h"; then \
@@ -1806,9 +1831,12 @@ cscope:
 
 @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@install-exec-local: install-scripts
 # scripts must be installed before this rule is run
-@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@install-scripts: install-binSCRIPTS
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@install-scripts: install-binSCRIPTS install-pkglibexecSCRIPTS
 @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	for f in $(bin_SCRIPTS); do \
-@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	   sed -i -e "/INSTALL-HOOK/d;s,exec_prefix=.*,exec_prefix=$(exec_prefix)/bin/,;s,sysconfdir=.*,sysconfdir=$(sysconfdir)," $(DESTDIR)$(bindir)/$$f; \
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	   sed -i -e "s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(bindir)/$$f; \
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	done
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	for f in $(pkglibexec_SCRIPTS); do \
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	   sed -i -e "/INSTALL-HOOK/d;s,exec_prefix=.*,exec_prefix=$(exec_prefix)/bin/,;s,sysconfdir=.*,sysconfdir=$(sysconfdir),;s,pkglibexecdir=.*,pkglibexecdir=$(pkglibexecdir)," $(DESTDIR)$(pkglibexecdir)/$$f; \
 @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	done
 @BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@stamp-elfutils: config.status
 @BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	$(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all bin_PROGRAMS=
diff --git a/initscript/stap-server.in b/initscript/stap-server.in
index 07595ec6..66e03ef3 100644
--- a/initscript/stap-server.in
+++ b/initscript/stap-server.in
@@ -8,26 +8,23 @@
 # config: /etc/sysconfig/stap-server
 # config: /etc/stap-server/conf.d
 
-BINDIR=@bindir@
-
-# Source function library.
 . /etc/rc.d/init.d/functions
 
 # Systemtap function library
-. $BINDIR/stap-env
+. @pkglibexecdir@/stap-env
 
 prog=stap-server
 
 # Commands
-STAP_START_SERVER=$BINDIR/stap-start-server
-STAP_STOP_SERVER=$BINDIR/stap-stop-server
+STAP_START_SERVER=@pkglibexecdir@/stap-start-server
+STAP_STOP_SERVER=@pkglibexecdir@/stap-stop-server
 UNAME=/bin/uname
 
 # Default Global Configuration
-CONFIG_FILE=/etc/sysconfig/stap-server
-CONFIG_PATH=/etc/stap-server/conf.d
-STAT_PATH=/var/run/stap-server
-LOG_FILE=/var/log/stap-server.log
+CONFIG_FILE=@sysconfdir@/sysconfig/stap-server
+CONFIG_PATH=@sysconfdir@/stap-server/conf.d
+STAT_PATH=@localstatedir@/run/stap-server
+LOG_FILE=@localstatedir@/log/stap-server.log
 STAP_USER=stap-server
 
 # Default option settings
@@ -71,7 +68,7 @@ echo_usage () {
   echo $"nickname. When -n is specified, a currently running server with the"
   echo $"given nickname will be searched for. If no currently running server"
   echo $"with the given nickname is found, a server configuration with the"
-  echo $"given nickname will be searched for in /etc/stap-server/conf.d/*.conf."
+  echo $"given nickname will be searched for in @sysconfdir@/stap-server/conf.d/*.conf."
   echo $"If a server configuration for the given nickname is found, the -a, -r,"
   echo $"-I, -R, -B and -u options for that server will be used as if they were"
   echo $"specified on the command line. If no configuration with the given"
@@ -93,7 +90,7 @@ echo_usage () {
   echo $"command line. If no servers are specified on the command line, the"
   echo $"behavior is as follows:"
   echo $""
-  echo $"  start:        Start the servers configured in /etc/stap-server/conf.d/*.conf."
+  echo $"  start:        Start the servers configured in @sysconfdir@/stap-server/conf.d/*.conf."
   echo $"                If none are configured, start a server for the kernel release"
   echo $"                and architecture of the host platform."
   echo $""
diff --git a/stap-authorize-server-cert b/stap-authorize-server-cert
index 13fb9c9f..19444b0f 100755
--- a/stap-authorize-server-cert
+++ b/stap-authorize-server-cert
@@ -11,7 +11,7 @@
 # later version.
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
 
 certfile=$1
 certdb=$2
diff --git a/stap-authorize-signing-cert b/stap-authorize-signing-cert
index 22da27c4..643a07bb 100755
--- a/stap-authorize-signing-cert
+++ b/stap-authorize-signing-cert
@@ -11,7 +11,7 @@
 # later version.
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
 
 certfile=$1
 certdb=$2
diff --git a/stap-client b/stap-client
index 189742cb..e8ee8923 100755
--- a/stap-client
+++ b/stap-client
@@ -22,7 +22,7 @@ trap 'interrupt' SIGINT
 trap 'ignore_signal' SIGHUP SIGPIPE
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
 
 #-----------------------------------------------------------------------------
 # Helper functions.
diff --git a/stap-env b/stap-env
index d061ee21..0b83661e 100755
--- a/stap-env
+++ b/stap-env
@@ -17,6 +17,7 @@
 # INSTALL-HOOK time.
 stap_exec_prefix=
 stap_sysconfdir=`pwd`/net
+stap_pkglibexecdir=
 
 # General configuration
 stap_tmpdir_prefix_client=stap.client
diff --git a/stap-find-or-start-server b/stap-find-or-start-server
index a93b21fe..658ee2b1 100755
--- a/stap-find-or-start-server
+++ b/stap-find-or-start-server
@@ -18,7 +18,7 @@
 # Otherwise, it echoes -1
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
 
 # Is there a server available?
 ${stap_exec_prefix}stap-find-servers >/dev/null 2>&1 && echo 0 && exit 0
diff --git a/stap-find-servers b/stap-find-servers
index 91bb0ea8..7df4c9a5 100755
--- a/stap-find-servers
+++ b/stap-find-servers
@@ -13,7 +13,7 @@
 # network. Information about each server found is printed to stdout.
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
 
 #-----------------------------------------------------------------------------
 # Helper functions.
diff --git a/stap-gen-cert b/stap-gen-cert
index ffd7f6f1..4f2650cd 100755
--- a/stap-gen-cert
+++ b/stap-gen-cert
@@ -11,7 +11,7 @@
 # later version.
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
 
 # Obtain the certificate database directory name.
 serverdb=$1
diff --git a/stap-server b/stap-server
index 9e30a121..e755f72d 100755
--- a/stap-server
+++ b/stap-server
@@ -17,7 +17,7 @@
 trap 'terminate' SIGTERM SIGINT
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
 
 #-----------------------------------------------------------------------------
 # Helper functions.
diff --git a/stap-serverd b/stap-serverd
index d8eb1962..48f0072d 100755
--- a/stap-serverd
+++ b/stap-serverd
@@ -17,7 +17,7 @@
 trap 'terminate' SIGTERM SIGINT
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
 
 #-----------------------------------------------------------------------------
 # Helper functions.
diff --git a/stap-start-server b/stap-start-server
index ab78fc09..56893dc2 100755
--- a/stap-start-server
+++ b/stap-start-server
@@ -13,7 +13,8 @@
 # process id, if successful.
 
 # Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
+
 startup_timeout=20
 
 # start the server
diff --git a/systemtap.spec b/systemtap.spec
index 25ab905b..b33626f5 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -406,10 +406,10 @@ exit 0
 %defattr(-,root,root)
 %attr(4111,root,root) %{_bindir}/staprun
 %{_bindir}/stap-report
-%{_bindir}/stap-env
 %{_bindir}/stap-authorize-cert
 %{_bindir}/stap-authorize-signing-cert
 %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/stap-env
 %{_mandir}/man8/staprun.8*
 %{_mandir}/man8/stap-authorize-signing-cert.8*
 
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 13e6d1a2..2c46e30f 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -155,7 +155,6 @@ proc setup_server {} {
     # The server does not call this instance of 'stap'
     if {[installtest_p]} then {
 	exec /bin/cp -p [exec which stap-client] $net_path/stap
-	exec /bin/cp -p [exec which stap-env] $net_path/stap-env
     } else {
 	exec /bin/cp -p $srcdir/../stap-client $net_path/stap
 	exec /bin/cp -p $srcdir/../stap-env $net_path/stap-env