[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-13-g5157e06
Lifeng Sun
lifongsun at gmail.com
Thu Jun 14 13:01:19 UTC 2012
The following commit has been merged in the master branch:
commit 3b643f22dbcb930ea0d1d47bbefe2450e8399e84
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Thu Jun 14 09:14:28 2012 +0800
Remove xrootd stuff.
diff --git a/debian/rules b/debian/rules
index 1bfe7b6..5b5f22f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -618,9 +618,9 @@ install-arch: build-arch
< $(DTMP)$(SYSCONFDIR)/root/system.rootrc > rootrc.tmp
mv rootrc.tmp $(DTMP)$(SYSCONFDIR)/root/system.rootrc
- # Rename proofserv, xrdgsiproxy, xrdpwdadmin, xrdcp, and xrd in
- # /usr/bin to end in `.bin' and make wrapper script in /usr/bin
- for i in proofserv xrdgsiproxy xrdpwdadmin xrdcp xrd ; do \
+ # Rename proofserv in /usr/bin to end in `.bin' and make wrapper
+ # script in /usr/bin
+ i=proofserv; do \
if test -f $(DTMP)$(PREFIX)/bin/$$i && \
test -f debian/skel/$$i.in ; then \
mv $(DTMP)$(PREFIX)/bin/$$i \
diff --git a/debian/script/makebuilddepend.sh b/debian/script/makebuilddepend.sh
index 64c9f55..7aba978 100755
--- a/debian/script/makebuilddepend.sh
+++ b/debian/script/makebuilddepend.sh
@@ -116,7 +116,6 @@ if test "x$1" = "xrpm" ; then
root-plugin-net-netx) ;;
root-plugin-net-srp)
echo "BuildRequires: srp-devel" ;;
- root-plugin-net-xrootd) ;;
root-plugin-net-bonjour)
echo -n ", libavahi-core-dev" ;;
root-plugin-proof-peac) ;;
@@ -149,7 +148,6 @@ EOF
root-system-doc) ;;
root-system-proofd) ;;
root-system-rootd) ;;
- root-system-xrootd) need_krb=1 ;;
ttf-root*) ;;
*)
echo "*** Warning *** Unknown package $i - please update $0" \
@@ -295,7 +293,6 @@ for i in $* ; do
echo -n ",krb5-user|heimdal-clients" ;;
root-plugin-net-netx) ;;
root-plugin-net-srp) echo -n ", libsrputil-dev" ;;
- root-plugin-net-xrootd) ;;
root-plugin-net-bonjour)
echo -n ", libavahi-core-dev" ;;
root-plugin-proof-peac) ;;
@@ -318,7 +315,6 @@ for i in $* ; do
root-system-doc) ;;
root-system-proofd) ;;
root-system-rootd) ;;
- root-system-xrootd) need_krb5=1 ;;
ttf-root*) ;;
*)
echo "*** Warning *** Unknown package $i - please update $0" \
diff --git a/debian/script/makelist b/debian/script/makelist
index 49aba10..3ab6b1c 100755
--- a/debian/script/makelist
+++ b/debian/script/makelist
@@ -29,13 +29,6 @@ ifneq ($(DIRS),)
include config/Makefile.config
include config/Makefile.$(ARCH)
include $(foreach i, $(DIRS), $(i)/Module.mk)
-# Special case of xrootd
-ifeq ($(DIRS), net/xrootd)
-XRDLIBS := $(patsubst lib/%, $(LPATH)/%, \
- $(filter-out lib/libXrdProofd.so, $(wildcard lib/libXrd*.so)))
-ALLLIBS := $(XRDLIBS:$(RLIBD)/%=$(RLIBD)/%)
-ALLEXECS:= $(filter-out bin/xrootd bin/olbd, $(ALLEXECS))
-endif # $(DIRS) = xrootd
endif # ! $(DIRS) =
ifneq ($(filter cint/cint,$(DIRS)),)
include cint/ROOT/cintdlls.mk
@@ -70,15 +63,10 @@ DEVLIBS := $(ALLLIBS)
else # ! $(LIB) = $(DEV)
# If the development and library package is the same (plugins), then we need
# only add the soversion to the library directory
-ifeq ($(DIRS), net/xrootd)
-PKGLIBS := $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%) \
- $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/%)
-else
PKGLIBS := $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(SOVER)) \
$(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(MAJOR)) \
$(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%) \
$(ALLLIBS:$(RLIBD)/%=$(RLIBD)/%.$(SOVER))
-endif # $(DIRS) = net/xrootd
endif # $(LIB) = $(DEV)
endif # $(LIB)
ifneq ($(NOMAP),1)
@@ -98,17 +86,10 @@ ifneq ($(LIB), $(DEV))
ln -fs $(SOVER)/$$b . ; \
ln -fs $(SOVER)/$$b.$(SOVER) . ; done)
else # $(LIB) = $(DEV)
-ifeq ($(DIRS), net/xrootd)
- @(cd $(BUILD)/$(RLIBD) && \
- for i in $(ALLLIBS) ; do \
- b=`basename $$i` ; \
- ln -fs $(SOVER)/$$b . ; done)
-else # $(DIRS) != net/xrootd
@(cd $(BUILD)/$(RLIBD) && \
for i in $(ALLLIBS) ; do \
b=`basename $$i` ; \
ln -fs $(SOVER)/$$b.$(SOVER) . ; done)
-endif # $(DIRS) = net/xrootd
endif # $(LIB) = $(DEV)
endif # $(LIB)
diff --git a/debian/script/makelists.sh b/debian/script/makelists.sh
index c6c7ea9..b0467b1 100755
--- a/debian/script/makelists.sh
+++ b/debian/script/makelists.sh
@@ -137,7 +137,6 @@ for d in $l ; do
net/net) set_lib_names $base "" ;;
net/ldap) set_lib_names $base $sub ;;
net/rootd) lib=root-system-$sub ; dev=$lib ; bin=$lib ;;
- net/xrootd) set_plugin_names $base $sub ;;
net/globusauth) set_plugin_names $base globus ;;
net/bonjour) set_lib_names $base $sub ;;
net/krb5auth) set_plugin_names $base krb5 ;;
diff --git a/debian/skel/root-plugin-net-xrootd.install.in b/debian/skel/root-plugin-net-xrootd.install.in
deleted file mode 100644
index cfb51c4..0000000
--- a/debian/skel/root-plugin-net-xrootd.install.in
+++ /dev/null
@@ -1,13 +0,0 @@
- at prefix@/bin/xprep
- at prefix@/bin/xrdstagetool
- at prefix@/bin/xrdcp
- at prefix@/bin/xrdcp.bin
- at prefix@/bin/xrdgsiproxy
- at prefix@/bin/xrdgsiproxy.bin
- at prefix@/bin/xrdpwdadmin
- at prefix@/bin/xrdpwdadmin.bin
- at prefix@/share/man/man1/xprep.1*
- at prefix@/share/man/man1/xrdcp.1*
- at prefix@/share/man/man1/xrdgsiproxy.1*
- at prefix@/share/man/man1/xrdpwdadmin.1*
- at prefix@/share/man/man1/xrdstagetool.1*
diff --git a/debian/skel/root-plugin-net-xrootd.links.in b/debian/skel/root-plugin-net-xrootd.links.in
deleted file mode 100644
index aae18db..0000000
--- a/debian/skel/root-plugin-net-xrootd.links.in
+++ /dev/null
@@ -1,7 +0,0 @@
- at prefix@/share/man/man1/xrdcp.1.gz @prefix@/share/man/man1/xrdcp.bin.1.gz
- at prefix@/share/man/man1/xrdgsiproxy.1.gz @prefix@/share/man/man1/xrdgsiproxy.bin.1.gz
- at prefix@/share/man/man1/xrdpwdadmin.1.gz @prefix@/share/man/man1/xrdpwdadmin.bin.1.gz
-
-
-
-
diff --git a/debian/skel/root-system-xrootd.control b/debian/skel/root-system-xrootd.control
deleted file mode 100644
index 4bfca40..0000000
--- a/debian/skel/root-system-xrootd.control
+++ /dev/null
@@ -1,27 +0,0 @@
-Package: root-plugin-net-xrootd
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: root-system-xrootd
-Breaks: root-system-xrootd (<< 5.19.03-1)
-Homepage: http://xrootd.slac.stanford.edu
-Description: Plugins for xrootd protocol
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
- This package contains the plug-ins for xrootd protocol.
-
-Package: root-system-xrootd
-Architecture: any
-Depends: root-system-common, lsb-base (>= 3.0-6), ${shlibs:Depends}, ${misc:Depends}
-Recommends: root-plugin-net-xrootd
-Provides: root-file-server
-Homepage: http://xrootd.slac.stanford.edu
-Description: Extented ROOT file server
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
- This package contains the xrootd server for ROOT, the eXtended
- Request Daemon (xrd) and associated software.
-
diff --git a/debian/skel/root-system-xrootd.init.in b/debian/skel/root-system-xrootd.init.in
deleted file mode 100644
index 3bc2eff..0000000
--- a/debian/skel/root-system-xrootd.init.in
+++ /dev/null
@@ -1,224 +0,0 @@
-#! /bin/sh
-#
-# skeleton Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-# Modified for Debian
-# by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-#
-# Version: @(#)skeleton 1.9 26-Feb-2001 miquels at cistron.nl
-#
-### BEGIN INIT INFO
-# Provides: root-system-xrootd
-# Required-Start: $remote_fs
-# Required-Stop: $remote_fs
-# Should-Start: $network, $named
-# Should-Stop: $network, $named
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Extended ROOT file server
-# Description: Extended Server of ROOT files via special ROOT
-# protocol, and Open Load Balancer server.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-XDAEMON=@prefix@/bin/xrootd
-ODAEMON=@prefix@/bin/olbd
-CDAEMON=@prefix@/bin/cmsd
-XNAME=xrootd
-ONAME=olbd
-CNAME=cmsd
-DESC="Extended ROOT file server"
-XDESC="Extended ROOT file server"
-ODESC="Open Load Balancer server"
-CDESC="Cluster Management System server"
-USER=root
-test -x $DAEMON || exit 0
-
-# Include root defaults if available
-if [ -f @sysconfdir@/default/root-system-xrootd ] ; then
- . @sysconfdir@/default/root-system-xrootd
-fi
-
-# Load the VERBOSE setting and other rcS variables
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-# Define LSB log_* functions.
-. /lib/lsb/init-functions
-
-# Check enables
-enable_xrootd=`echo $ENABLE_XROOTD | tr '[:upper:]' '[:lower:]'`
-enable_olbd=`echo $ENABLE_OLBD| tr '[:upper:]' '[:lower:]'`
-enable_cmsd=`echo $ENABLE_CMSD| tr '[:upper:]' '[:lower:]'`
-
-# xrood options
-# Configuration file
-if test "x$XROOTD_CONFIG_FILE" != "x" ; then
- XDAEMON_OPTS="$XDAEMON_OPTS -c $XROOTD_CONFIG_FILE"
-fi
-# Log file
-if test "x$XROOTD_LOG_FILE" != "x" ; then
- XDAEMON_OPTS="$XDAEMON_OPTS -l $XROOTD_LOG_FILE"
-fi
-# port to listen to
-if test "x$XROOTD_PORT" != "x" ; then
- XDAEMON_OPTS="$XDAEMON_OPTS -p $XROOTD_PORT"
-fi
-# Redirection
-if test "x$XROOTD_REDIRECTOR" != "xyes" ; then
- XDAEMON_OPTS="$XDAEMON_OPTS -r"
-fi
-# Base directory
-if test "x$XROOTD_BASEDIR" != "xyes" ; then
- XDAEMON_OPTS="$XDAEMON_OPTS $XROOTD_BASEDIR"
-fi
-
-# olbd options
-# Confguration file
-if test "x$OLBD_CONFIG_FILE" != "x" ; then
- ODAEMON_OPTS="$ODAEMON_OPTS -c $OLBD_CONFIG_FILE"
-fi
-# Log file
-if test "x$OLBD_LOG_FILE" != "x" ; then
- ODAEMON_OPTS="$ODAEMON_OPTS -l $OLBD_LOG_FILE"
-fi
-# Port to listen to
-if test "x$OLBD_PORT" != "x" ; then
- ODAEMON_OPTS="$ODAEMON_OPTS -p $OLBD_PORT"
-fi
-# Redirection.
-if test "x$OLBD_REDIRECTOR" != "xyes" ; then
- ODAEMON_OPTS="$ODAEMON_OPTS -r"
-fi
-
-# cmsd options
-# Confguration file
-if test "x$CMSD_CONFIG_FILE" != "x" ; then
- CDAEMON_OPTS="$CDAEMON_OPTS -c $CMSD_CONFIG_FILE"
-fi
-# Log file
-if test "x$CMSD_LOG_FILE" != "x" ; then
- CDAEMON_OPTS="$CDAEMON_OPTS -l $CMSD_LOG_FILE"
-fi
-# Port to listen to
-if test "x$CMSD_PORT" != "x" ; then
- CDAEMON_OPTS="$CDAEMON_OPTS -p $CMSD_PORT"
-fi
-
-# User
-if test "x$XROOTD_USER" = "xroot" ; then
- :
-elif test "x$XROOTD_USER" != "x" ; then
- USER=$XROOTD_USER
-fi
-
-# Check if we're enabled
-case $enable_rootd:$enable_olbd:$enable_cmsd in
- yes:*:*) ;;
- *:yes:*) ;;
- *:*:yes) ;;
- *) exit 0;;
-esac
-
-# function to start the main server
-startitx ()
-{
- [ "$VERBOSE" != no ] && log_progress_msg "$XNAME"
- start-stop-daemon --make-pidfile --chuid $USER --start --quiet \
- --pidfile /var/run/$XNAME.pid --exec $XDAEMON \
- --background -- $XDAEMON_OPTS
-}
-startito ()
-{
- [ "$VERBOSE" != no ] && log_progress_msg "$ONAME"
- start-stop-daemon --make-pidfile --chuid $USER --start --quiet \
- --pidfile /var/run/$ONAME.pid --exec $ODAEMON \
- --background -- $ODAEMON_OPTS
-}
-startitc ()
-{
- [ "$VERBOSE" != no ] && log_progress_msg "$CNAME"
- start-stop-daemon --make-pidfile --chuid $USER --start --quiet \
- --pidfile /var/run/$CNAME.pid --exec $CDAEMON \
- --background -- $CDAEMON_OPTS
-}
-
-stopitx()
-{
- start-stop-daemon --user $USER --stop --oknodo --quiet --pidfile \
- /var/run/$XNAME.pid --exec $XDAEMON
-}
-stopito()
-{
- start-stop-daemon --user $USER --stop --oknodo --quiet --pidfile \
- /var/run/$ONAME.pid --exec $ODAEMON
-}
-stopitc()
-{
- start-stop-daemon --user $USER --stop --oknodo --quiet --pidfile \
- /var/run/$CNAME.pid --exec $CDAEMON
-}
-
-# executable code
-case "$1" in
- start)
- ret=0
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC"
- if test "x$enable_xrootd" = "xyes" ; then
- startitx
- ret=$?
- fi
- if test $ret -eq 0 && test "x$enable_olbd" = "xyes" ; then
- startito
- ret=$?
- fi
- [ "$VERBOSE" != no ] && log_end_msg $ret
- [ $ret -ne 0 ] && exit $ret
- ;;
- stop)
- ret=0
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC"
- if test "x$enable_xrootd" = "xyes" ; then
- [ "$VERBOSE" != no ] && log_progress_msg "$XNAME"
- stopitx
- ret=$?
- fi
- if test "x$enable_olbd" = "xyes" ; then
- [ "$VERBOSE" != no ] && log_progress_msg "$ONAME"
- stopito
- ret=$?
- fi
- [ "$VERBOSE" != no ] && log_end_msg $ret
- [ $ret -ne 0 ] && exit $ret
- ;;
- restart|force-reload)
- #
- # If the "reload" option is implemented, move the "force-reload"
- # option to the "reload" entry above. If not, "force-reload" is
- # just the same as "restart".
- #
- ret=0
- [ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC"
- if test "x$enable_xrootd" = "xyes" ; then
- stopitx
- startitx
- ret=$?
- fi
- if test $ret -eq 0 && test "x$enable_olbd" = "xyes" ; then
- stopito
- startito
- ret=$?
- fi
- [ "$VERBOSE" != no ] && log_end_msg $ret
- [ $ret -ne 0 ] && exit $ret
- ;;
- *)
- N=@sysconfdir@/init.d/root-system-$XNAME
- # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $N {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
-#
-# EOF
-#
diff --git a/debian/skel/root-system-xrootd.install.in b/debian/skel/root-system-xrootd.install.in
deleted file mode 100644
index 2454107..0000000
--- a/debian/skel/root-system-xrootd.install.in
+++ /dev/null
@@ -1,8 +0,0 @@
- at prefix@/bin/cmsd
-#@prefix@/bin/olbd
- at prefix@/bin/xrd.bin
- at prefix@/bin/xrootd
- at prefix@/share/man/man1/cmsd.1*
-#@prefix@/share/man/man1/olbd.1*
- at prefix@/share/man/man1/xrd.1*
- at prefix@/share/man/man1/xrootd.1*
diff --git a/debian/skel/root-system-xrootd.links.in b/debian/skel/root-system-xrootd.links.in
deleted file mode 100644
index 0b27fc7..0000000
--- a/debian/skel/root-system-xrootd.links.in
+++ /dev/null
@@ -1,2 +0,0 @@
- at prefix@/share/man/man1/xrd.1.gz @prefix@/share/man/man1/xrd.bin.1.gz
-
diff --git a/debian/skel/xrd.in b/debian/skel/xrd.in
deleted file mode 100644
index 162485f..0000000
--- a/debian/skel/xrd.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-rootplugins=@prefix@/lib/root/@libvers@
-rootbindir=@prefix@/bin
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$rootplugins
-
-exec $rootbindir/xrd.bin "$@"
-
-# EOF
-
diff --git a/debian/skel/xrdcp.in b/debian/skel/xrdcp.in
deleted file mode 100644
index 62344f6..0000000
--- a/debian/skel/xrdcp.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-rootplugins=@prefix@/lib/root/@libvers@
-rootbindir=@prefix@/bin
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$rootplugins
-
-exec $rootbindir/xrdcp.bin "$@"
-
-# EOF
-
diff --git a/debian/skel/xrdgsiproxy.in b/debian/skel/xrdgsiproxy.in
deleted file mode 100755
index 52b6e79..0000000
--- a/debian/skel/xrdgsiproxy.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-rootplugins=@prefix@/lib/root/@libvers@
-rootbindir=@prefix@/bin
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$rootplugins
-
-exec $rootbindir/xrdgsiproxy.bin "$@"
-
-# EOF
-
diff --git a/debian/skel/xrdpwdadmin.in b/debian/skel/xrdpwdadmin.in
deleted file mode 100755
index 345b2e2..0000000
--- a/debian/skel/xrdpwdadmin.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-rootplugins=@prefix@/lib/root/@libvers@
-rootbindir=@prefix@/bin
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$rootplugins
-
-exec $rootbindir/xrdpwdadmin.bin "$@"
-
-# EOF
-
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list