Menu
▾
▴
cap4-devel — cap4 development mailing list (commits sent here)
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(16) |
Sep
(19) |
Oct
(7) |
Nov
(108) |
Dec
(51) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(50) |
Feb
(14) |
Mar
(23) |
Apr
(26) |
May
(9) |
Jun
(9) |
Jul
(12) |
Aug
(6) |
Sep
(6) |
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
(12) |
Feb
(27) |
Mar
(4) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(2) |
Apr
(1) |
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(21) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Christopher D. M. <cas...@us...> - 2013-02-21 16:10:58
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 80eea995a1eabbaa9d42f12c0e3c7312314129ce (commit)
from 58afec446c37b7ea2d1afbee0e2ffdcb56264dcb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 80eea995a1eabbaa9d42f12c0e3c7312314129ce
Author: CDM <cas...@us...>
Date: Thu Feb 21 09:10:43 2013 -0700
CDM: new collectl
-----------------------------------------------------------------------
Summary of changes:
src/collectl/Makefile | 2 +-
src/pdsh/Makefile | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/collectl/Makefile b/src/collectl/Makefile
index 8ff8468..d212364 100644
--- a/src/collectl/Makefile
+++ b/src/collectl/Makefile
@@ -1,6 +1,6 @@
include ../make.def
-VERSION=3.6.3
+VERSION=3.6.5
SRC=collectl-$(VERSION)
#TAR=$(SRC).src.tar.gz
SRPM=$(SRC)-2.src.rpm
diff --git a/src/pdsh/Makefile b/src/pdsh/Makefile
index fb125ba..df31487 100644
--- a/src/pdsh/Makefile
+++ b/src/pdsh/Makefile
@@ -1,3 +1,4 @@
+#PDSH_WITH_OPTIONS="genders"
include ../make.def
VERSION=2.29
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2013-02-19 00:19:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 58afec446c37b7ea2d1afbee0e2ffdcb56264dcb (commit)
from 3837e0abc605fb9b25c3ca85343fa84db8772c8f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 58afec446c37b7ea2d1afbee0e2ffdcb56264dcb
Author: CDM <cas...@us...>
Date: Mon Feb 18 17:18:58 2013 -0700
CDM: add new pdsh
-----------------------------------------------------------------------
Summary of changes:
src/pdsh/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/pdsh/Makefile b/src/pdsh/Makefile
index 7b5292c..fb125ba 100644
--- a/src/pdsh/Makefile
+++ b/src/pdsh/Makefile
@@ -1,6 +1,6 @@
include ../make.def
-VERSION=2.28
+VERSION=2.29
SRC=pdsh-$(VERSION)
TAR=$(SRC).tar.bz2
URL="http://pdsh.googlecode.com/files/$(TAR)"
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-10-19 17:14:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 2340fa0859b15cf3436e3eb6f7d1608e275cacf9 (commit)
via 487720f3d27e856b4f55307fa37d3c4bdf2a4c73 (commit)
from eddfe9ecad31824363a615ad2182d2a32893ab6b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2340fa0859b15cf3436e3eb6f7d1608e275cacf9
Author: CDM <cas...@us...>
Date: Fri Oct 19 11:09:43 2012 -0600
new version
commit 487720f3d27e856b4f55307fa37d3c4bdf2a4c73
Author: CDM <cas...@us...>
Date: Fri Oct 19 11:06:05 2012 -0600
CDM: new host list and added clustershell package
-----------------------------------------------------------------------
Summary of changes:
src/clustershell/Makefile | 8 ++++++++
src/python-hostlist/Makefile | 2 +-
2 files changed, 9 insertions(+), 1 deletions(-)
create mode 100644 src/clustershell/Makefile
diff --git a/src/clustershell/Makefile b/src/clustershell/Makefile
new file mode 100644
index 0000000..0c53303
--- /dev/null
+++ b/src/clustershell/Makefile
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=1.6
+SRC=clustershell-$(VERSION)
+TAR=$(SRC).tar.gz
+URL="https://github.com/downloads/cea-hpc/clustershell/$(TAR)"
+
+include ../make.workbench
diff --git a/src/python-hostlist/Makefile b/src/python-hostlist/Makefile
index f31ad5b..318ebf0 100644
--- a/src/python-hostlist/Makefile
+++ b/src/python-hostlist/Makefile
@@ -1,6 +1,6 @@
include ../make.def
-VERSION=1.11
+VERSION=1.13
SRC=python-hostlist-$(VERSION)
TAR=$(SRC).tar.gz
URL="http://www.nsc.liu.se/~kent/python-hostlist/$(TAR)"
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-03-01 20:33:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via eddfe9ecad31824363a615ad2182d2a32893ab6b (commit)
from 04aaaf666d9c578fd4aefe2b59f46fbd3e3a85ea (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eddfe9ecad31824363a615ad2182d2a32893ab6b
Author: CDM <cas...@us...>
Date: Thu Mar 1 13:15:33 2012 -0700
CDM: fix module installation for rpm
-----------------------------------------------------------------------
Summary of changes:
libexec/sh/cfunc | 11 +++++++++++
src/make.def | 11 +++++++++++
src/make.workbench | 4 ++--
src/modules/Makefile | 42 ++++++++++++++++++------------------------
4 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/libexec/sh/cfunc b/libexec/sh/cfunc
index 39bcc87..7937ff0 100755
--- a/libexec/sh/cfunc
+++ b/libexec/sh/cfunc
@@ -117,6 +117,17 @@ check_validvar() {
[ "x${2}" = "x" ] && cerror "Undefined VARIABLE ${1}" && usage
}
+pkg_search() {
+ [ $# -lt 2 ] && cerror "yum|rpm|apt|apt-cache|deb packagename" && usage
+ if [ $1 = "yum" -o $1 = "rpm" ]; then
+ yum search $2 | grep ^$2
+ elif [ $1 = "apt-cache" -o $1 = "apt" -o $1 = "deb" ]; then
+ apt-cache search $2 | grep ^$2
+ else
+ cerror "$1 is not a known method to search for $1"
+ fi
+}
+
make_tool() {
[ $# -lt 1 ] && cerror "make_tool TOOL PREFIXOPTION" && exit 1
local tool=$1
diff --git a/src/make.def b/src/make.def
index da02fa5..95725f6 100644
--- a/src/make.def
+++ b/src/make.def
@@ -48,6 +48,17 @@ define untar-src
fi;
endef
+define is-available-as-distro-package
+ @echo "Searching for package: $2 using $1"
+ @if [ $1 = "yum" -o $1 = "rpm" ]; then \
+ yum search $2 | grep ^$2; \
+ echo $? ; \
+ elif [ $1 = "apt-cache" -o $1 = "apt" -o $1 = "deb" ]; then \
+ apt-cache search $2 | grep ^$2; \
+ echo $? ; \
+ fi;
+endef
+
# print a header
define print-header
@echo "========================================================="; \
diff --git a/src/make.workbench b/src/make.workbench
index 5591f2e..88c6592 100644
--- a/src/make.workbench
+++ b/src/make.workbench
@@ -21,13 +21,13 @@ downloadstatus:
rpmstatus:
$(call print-header,"cap4 src $@ $(SRC)")
- @[ -d RPMS ] && find ./RPMS -name *.rpm | xargs ls --color
+ @[ -d RPMS ] && find ./RPMS -name \*.rpm | xargs ls --color
@sleep 1
rpminstall: rpm
$(call print-header,"cap4 src $@ $(SRC)")
@echo "Run the following command as root in: "
- @[ -d RPMS ] && find $(shell pwd)/RPMS -name *.rpm | xargs echo yum install
+ @[ -d RPMS ] && find $(shell pwd)/RPMS -name \*.rpm | xargs echo yum install
rpmupgrade: rpm
$(call print-header,"cap4 src $@ $(SRC)")
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 70ba9a0..3e2937e 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -1,29 +1,23 @@
include ../make.def
-VERSION=3.2.9
-SUBVERSION=c
-SRC=modules-$(VERSION)
-TAR=$(SRC)$(SUBVERSION).tar.gz
-URL="http://sourceforge.net/projects/modules/files/Modules/$(SRC)/$(TAR)"
+VERSION=3.2.8a
+SRC=environment-modules-$(VERSION)
+SRPM=$(SRC)-2.rf.src.rpm
+TAR=$(SRPM)
+#TAR=$(SRC).src.tar.gz
+#URL="http://sourceforge.net/projects/collectl/files/collectl/$(SRC)/$(SRPM)"
+URL="http://pkgs.repoforge.org/environment-modules/$(TAR)"
-$(SRC): $(TAR)
- $(call print-header,"cap4 src untar $@")
- $(call untar-src,$(TAR))
- ln -sf $@ src
- @[ -d $@ ] && touch $@
-
-.configure-$(SRC): $(SRC)
- $(call print-header,"cap4 src configure $(SRC) for $(PREFIX)")
- cd src && ./configure --prefix=$(PREFIX) > .configure-$(SRC) 2>&1
- touch $@
-
-.make-$(SRC): .configure-$(SRC)
- $(call print-header,"cap4 src $@ $(SRC)")
- make -C src > .make-$(SRC) 2>&1
- touch $@
-
-install: .make-$(SRC)
- $(call print-header,"cap4 src $@ $(SRC)")
- make -C src install > .make-$(SRC) 2>&1
+#
+# sf source pull, if we decide to install it locally instead, need to use this below
+#
+#VERSION=3.2.9
+#SUBVERSION=c
+#RPMPKGNAME=environment-modules
+#SFDIR=modules-$(VERSION)
+#SRC=modules-$(VERSION)$(SUBVERSION)
+#TAR=$(SRC).tar.gz
+#URL="http://sourceforge.net/projects/modules/files/Modules/$(SFDIR)/$(TAR)"
include ../make.workbench
+
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-03-01 17:14:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 04aaaf666d9c578fd4aefe2b59f46fbd3e3a85ea (commit)
from 7eaddd44c21676bccbb51c7a27b1620a8a4524d6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 04aaaf666d9c578fd4aefe2b59f46fbd3e3a85ea
Author: CDM <cas...@us...>
Date: Thu Mar 1 10:14:19 2012 -0700
CDM: add color printing, more fixes to deploy, add rpmupgrade tag
-----------------------------------------------------------------------
Summary of changes:
deploy | 8 ++--
libexec/sh/cfunc | 87 ++++++++++++++++++++++++++++++++++++---------
src/genders/Makefile | 7 ++--
src/gendersllnl/Makefile | 9 +++++
src/make.workbench | 10 +++++
5 files changed, 96 insertions(+), 25 deletions(-)
create mode 100644 src/gendersllnl/Makefile
diff --git a/deploy b/deploy
index 3e75e68..21c303f 100755
--- a/deploy
+++ b/deploy
@@ -40,8 +40,8 @@ else
fi
usage() {
- echo $0 --tool TOOLNAME --rpm
- echo $0 --tool TOOLNAME --prefix PREFIXDIRECTORY
+ cinfo "$0 --tool TOOLNAME --rpm --clean|--distclean"
+ cinfo "$0 --tool TOOLNAME --prefix PREFIXDIRECTORY --clean|--distclean"
exit 1
}
@@ -50,11 +50,11 @@ parsecli "$@"
check_validvar TOOL $TOOL
if [ $RPM -eq 1 ]; then
- cinfo MAKE "$TOOL => RPM"
+ [ $DEBUG -gt 0 ] && cprint MAKE "$TOOL => RPM"
make_tool $TOOL
else
check_validvar PREFIX $PREFIX
- cinfo MAKE "$TOOL => $PREFIX"
+ [ $DEBUG -gt 0 ] && cprint MAKE "$TOOL => $PREFIX"
make_tool $TOOL $PREFIX
fi
diff --git a/libexec/sh/cfunc b/libexec/sh/cfunc
index 19749f5..39bcc87 100755
--- a/libexec/sh/cfunc
+++ b/libexec/sh/cfunc
@@ -29,13 +29,64 @@
################################################################################
RPM=0
+CLEAN=0
+DISTCLEAN=0
+DEBUG=0
+VERBOSE=0
+
+cprint() {
+ local tag=$1
+ check_validvar tag $tag
+ shift
+
+ # Text color variables
+ txtred='\e[0;31m' # red
+ txtgrn='\e[0;32m' # green
+ txtylw='\e[0;33m' # yellow
+ txtblu='\e[0;34m' # blue
+ txtpur='\e[0;35m' # purple
+ txtcyn='\e[0;36m' # cyan
+ txtwht='\e[0;37m' # white
+ bldred='\e[1;31m' # red - Bold
+ bldgrn='\e[1;32m' # green
+ bldylw='\e[1;33m' # yellow
+ bldblu='\e[1;34m' # blue
+ bldpur='\e[1;35m' # purple
+ bldcyn='\e[1;36m' # cyan
+ bldwht='\e[1;37m' # white
+ txtund=$(tput sgr 0 1) # Underline
+ txtbld=$(tput bold) # Bold
+ txtrst='\e[0m' # Text reset
+
+ # Feedback indicators
+ info=${bldwht}*${txtrst}
+ pass=${bldblu}*${txtrst}
+ warn=${bldred}!${txtrst}
+
+ # Indicator usage
+ case "$tag" in
+ "info") echo -e "${bldblu}$@";;
+ "pass") echo -e "${bldgrn}$@";;
+ "debug") echo -e "${bldcyn}$@";;
+ "warn") echo -e "${bldylw}$@";;
+ "error") echo -e "${bldred}$@";;
+ *) echo -e "${bldpur}$@";;
+ esac
+ tput sgr0
+}
+
+cinfo() { cprint info "$@"; }
+cdebug() { cprint debug "$@"; }
+cpass() { cprint pass "$@"; }
+cwarn() { cprint warn "$@"; }
+cerror() { cprint error "$@"; }
parsecli() {
ARG="$@"
# Note that we use `"$@"' to let each command-line parameter expand to a
# separate word. The quotes around `$@' are essential!
# We need TEMP as the `eval set --' would nuke the return value of getopt.
- TEMP=`getopt -o hc:: -l tool:,prefix:,rpm,help,usage,debug \
+ TEMP=`getopt -o hc:: -l tool:,prefix:,rpm,clean,distclean,help,usage,debug \
-n 'ERROR' -- "$@"`
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
# Note the quotes around `$TEMP': they are essential!
@@ -46,32 +97,28 @@ parsecli() {
--tool) TOOL=$2; shift 2 ;;
--prefix) PREFIX=$2; shift 2 ;;
--rpm) RPM=1; shift ;;
+ --clean) CLEAN=1; shift ;;
+ --distclean) DISTCLEAN=1; shift ;;
--help|--usage) usage ;;
--debug) DEBUG=1; shift ;;
+ --verbose) DEBUG=1; shift ;;
--) shift ; break ;;
- *) echo "Internal error!" ; exit 1 ;;
+ *) cerror "Internal error!" ; exit 1 ;;
esac
done
- if [ $DEBUG ] ; then
- echo "Remaining args:"
+ if [ $DEBUG -gt 1 ] ; then
+ cdebug "Remaining args:"
for arg do echo '--> '"\`$arg\`" ; done
fi
}
check_validvar() {
- [ $# -lt 1 ] && echo "VARIABLE_NAME VARIABLE_VALUE" && usage
- [ "x${2}" = "x" ] && echo "Undefined VARIABLE ${1}" && usage
-}
-
-cinfo() {
- local tag=$1
- check_validvar tag $tag
- shift
- echo "$tag: $@"
+ [ $# -lt 1 ] && cerror "VARIABLE_NAME VARIABLE_VALUE" && usage
+ [ "x${2}" = "x" ] && cerror "Undefined VARIABLE ${1}" && usage
}
make_tool() {
- [ $# -lt 1 ] && echo "make_tool TOOL PREFIXOPTION" && exit 1
+ [ $# -lt 1 ] && cerror "make_tool TOOL PREFIXOPTION" && exit 1
local tool=$1
shift
@@ -81,18 +128,22 @@ make_tool() {
# CAPHOME defined and if defined is there a tool there library
[ "x${CAPHOME}" = "x" ] ||
[ "x${CAPHOME}" != "x" -a ! -d ${CAPHOME}/src/${tool} ] &&
- echo "Missing make directory src for $tool" && exit 1
+ cerror "Missing make directory src for $tool" && exit 1
maketooldir=${CAPHOME}/src/${tool}
fi
if [ $RPM -eq 1 -a "x${PREFIX}" != "x" ]; then
- echo "UNDER DEVELOPMENT: make_tool called with a prefix for rpm"
+ cinfo "UNDER DEVELOPMENT: make_tool called with a prefix for rpm"
exit 1
- elif [ $RPM -eq 1 ]; then
+ fi
+ [ $CLEAN -eq 1 -a $DISTCLEAN -eq 0 ] && make -C $maketooldir clean
+ [ $DISTCLEAN -eq 1 ] && make -C $maketooldir distclean
+ if [ $RPM -eq 1 ]; then
make -C $maketooldir rpm
+ make -C $maketooldir rpmstatus
+ make -C $maketooldir rpminstall
else
- make -C $maketooldir distclean
PREFIX=$PREFIX make -C $maketooldir install
fi
}
diff --git a/src/genders/Makefile b/src/genders/Makefile
index 5e04e23..35fb6bc 100644
--- a/src/genders/Makefile
+++ b/src/genders/Makefile
@@ -1,8 +1,9 @@
include ../make.def
-VERSION=1.11
-SRC=python-hostlist-$(VERSION)
+BASEVERSION=1.18
+VERSION=1.18-1
+SRC=genders-$(BASEVERSION)
TAR=$(SRC).tar.gz
-URL="http://www.nsc.liu.se/~kent/python-hostlist/$(TAR)"
+URL="https://sourceforge.net/projects/genders/files/genders/$(VERSION)/$(TAR)"
include ../make.workbench
diff --git a/src/gendersllnl/Makefile b/src/gendersllnl/Makefile
new file mode 100644
index 0000000..8f888cd
--- /dev/null
+++ b/src/gendersllnl/Makefile
@@ -0,0 +1,9 @@
+include ../make.def
+
+BASEVERSION=1.19
+VERSION=1.19-1
+SRC=gendersllnl-$(BASEVERSION)
+TAR=$(SRC).tar.gz
+URL="https://sourceforge.net/projects/genders/files/gendersllnl/$(VERSION)/$(TAR)"
+
+include ../make.workbench
diff --git a/src/make.workbench b/src/make.workbench
index f0086a5..5591f2e 100644
--- a/src/make.workbench
+++ b/src/make.workbench
@@ -24,6 +24,16 @@ rpmstatus:
@[ -d RPMS ] && find ./RPMS -name *.rpm | xargs ls --color
@sleep 1
+rpminstall: rpm
+ $(call print-header,"cap4 src $@ $(SRC)")
+ @echo "Run the following command as root in: "
+ @[ -d RPMS ] && find $(shell pwd)/RPMS -name *.rpm | xargs echo yum install
+
+rpmupgrade: rpm
+ $(call print-header,"cap4 src $@ $(SRC)")
+ @echo "Run the following command as root in: "
+ @[ -d RPMS ] && find $(shell pwd)/RPMS -name *.rpm | xargs echo yum upgrade
+
clean distclean:
$(call print-header,"cap4 src $@ $(SRC)")
rm -fr $(TAR) $(SRC) .rpmbuild-$(SRC) .rpmbuild BUILD BUILDROOT RPMS SOURCES SPECS SRPMS .make-$(SRC) .configure-$(SRC) src
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-29 20:01:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 7eaddd44c21676bccbb51c7a27b1620a8a4524d6 (commit)
via f41346e70065bf122faca51af7201b718f16ed37 (commit)
from b91876d58ddbface949852383ec43be0891d0ef9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7eaddd44c21676bccbb51c7a27b1620a8a4524d6
Author: CDM <cas...@us...>
Date: Wed Feb 29 13:00:09 2012 -0700
CDM: make deploy actually call make properly
commit f41346e70065bf122faca51af7201b718f16ed37
Author: CDM <cas...@us...>
Date: Wed Feb 29 11:45:11 2012 -0700
CDM: some function fixes to call
-----------------------------------------------------------------------
Summary of changes:
deploy | 15 +++++++++------
etc/profile.d/cap.csh | 3 ++-
etc/profile.d/cap.sh | 1 +
libexec/sh/cfunc | 28 ++++++++++++++++------------
src/make.def | 1 +
src/make.workbench | 2 +-
src/modules/Makefile | 16 ++++++++++++++--
7 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/deploy b/deploy
index d16fdbe..3e75e68 100755
--- a/deploy
+++ b/deploy
@@ -27,14 +27,17 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
################################################################################
-#set -x
-[ ! -f /usr/libexec/cap4/sh/cfunc ] && [ "x${CAPDEVHOME}" = "x" ] && echo "Missing cfunc library" && exit 1
-[ "x${CAPDEVHOME}" != "x" ] && [ ! -f ${CAPDEVHOME}/libexec/sh/cfunc ] && echo "Missing cfunc library" && exit 1
-
-[ [ -f /usr/libexec/cap4/sh/cfunc ] && . /usr/libexec/cap4/sh/cfunc ] ||
-[ [ "x${CAPDEVHOME}" != "x" ] && [ -f ${CAPDEVHOME}/libexec/sh/cfunc ] echo "Using development cfunc library in $CAPDEVHOME" && . ${CAPDEVHOME}/libexec/sh/cfunc ]
+if [ -f /usr/libexec/cap4/sh/cfunc ]; then
+ . /usr/libexec/cap4/sh/cfunc
+else
+ # CAPHOME defined and if defined is there a cfunc library
+ [ "x${CAPHOME}" = "x" ] ||
+ [ "x${CAPHOME}" != "x" -a ! -f ${CAPHOME}/libexec/sh/cfunc ] &&
+ echo "Missing cfunc library" && exit 1
+ . ${CAPHOME}/libexec/sh/cfunc
+fi
usage() {
echo $0 --tool TOOLNAME --rpm
diff --git a/etc/profile.d/cap.csh b/etc/profile.d/cap.csh
index a2ba686..76b6b4f 100644
--- a/etc/profile.d/cap.csh
+++ b/etc/profile.d/cap.csh
@@ -27,8 +27,9 @@
############################################################################
# if cap is installed in system level directories, it should be in our path already,
-CAPHOME=INSERT_CAPHOME_HERE
+set CAPHOME=INSERT_CAPHOME_HERE
if ( $CAPHOME != "SYSTEM" ) then
+ setenv CAPHOME $CAPHOME
setenv PATH $CAPHOME/bin:$PATH
setenv MANPATH $CAPHOME/man:$MANPATH
endif
diff --git a/etc/profile.d/cap.sh b/etc/profile.d/cap.sh
index 20ac733..fc261e7 100644
--- a/etc/profile.d/cap.sh
+++ b/etc/profile.d/cap.sh
@@ -29,6 +29,7 @@
# if cap is installed in system level directories, it should be in our path already,
CAPHOME=INSERT_CAPHOME_HERE
if [ $CAPHOME != "SYSTEM" ]; then
+ export CAPHOME
export PATH=$CAPHOME/bin:$PATH
export MANPATH=$CAPHOME/man:$MANPATH
fi
diff --git a/libexec/sh/cfunc b/libexec/sh/cfunc
index 1ed5d98..19749f5 100755
--- a/libexec/sh/cfunc
+++ b/libexec/sh/cfunc
@@ -28,10 +28,6 @@
#
################################################################################
-# $$$$$$$$$$$$$$$$$$
-# begin main program
-# $$$$$$$$$$$$$$$$$$
-
RPM=0
parsecli() {
@@ -63,8 +59,8 @@ parsecli() {
}
check_validvar() {
- [ $# -lt 1 ] && echo "VARIABLE_NAME VARIABLE_VALUE" && exit 1
- [ "x${2}" = "x" ] && echo "Undefined VARIABLE ${1}" && exit 1
+ [ $# -lt 1 ] && echo "VARIABLE_NAME VARIABLE_VALUE" && usage
+ [ "x${2}" = "x" ] && echo "Undefined VARIABLE ${1}" && usage
}
cinfo() {
@@ -79,17 +75,25 @@ make_tool() {
local tool=$1
shift
- [ [ ! -d /usr/src/cap4/$tool ] && [ "x${CAPHOME}" = "x" ] ] && \
- [ [ "x${CAPDEVHOME}" != "x" ] && [ ! -d ${CAPDEVHOME}/src/make/$tool ] ] && \
- echo "Missing make src for $tool" && exit 1
-
+ if [ -d /usr/src/cap4/${tool} ]; then
+ maketooldir=/usr/src/cap4/${tool}
+ else
+ # CAPHOME defined and if defined is there a tool there library
+ [ "x${CAPHOME}" = "x" ] ||
+ [ "x${CAPHOME}" != "x" -a ! -d ${CAPHOME}/src/${tool} ] &&
+ echo "Missing make directory src for $tool" && exit 1
+ maketooldir=${CAPHOME}/src/${tool}
+ fi
- if [ $RPM -eq 1 -a $2 ]; then
+ if [ $RPM -eq 1 -a "x${PREFIX}" != "x" ]; then
echo "UNDER DEVELOPMENT: make_tool called with a prefix for rpm"
exit 1
elif [ $RPM -eq 1 ]; then
- make -C
+ make -C $maketooldir rpm
+ else
+ make -C $maketooldir distclean
+ PREFIX=$PREFIX make -C $maketooldir install
fi
}
diff --git a/src/make.def b/src/make.def
index e95541e..da02fa5 100644
--- a/src/make.def
+++ b/src/make.def
@@ -1,4 +1,5 @@
# functions taken from cbench make.def
+PREFIX ?= /usr/local
# downlad a url with wget
define download-wget-url
diff --git a/src/make.workbench b/src/make.workbench
index 4f86982..f0086a5 100644
--- a/src/make.workbench
+++ b/src/make.workbench
@@ -26,5 +26,5 @@ rpmstatus:
clean distclean:
$(call print-header,"cap4 src $@ $(SRC)")
- rm -fr $(TAR) $(SRC) .rpmbuild-$(SRC) .rpmbuild BUILD BUILDROOT RPMS SOURCES SPECS SRPMS .make-$(SRC) src
+ rm -fr $(TAR) $(SRC) .rpmbuild-$(SRC) .rpmbuild BUILD BUILDROOT RPMS SOURCES SPECS SRPMS .make-$(SRC) .configure-$(SRC) src
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 87d398c..70ba9a0 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -7,11 +7,23 @@ TAR=$(SRC)$(SUBVERSION).tar.gz
URL="http://sourceforge.net/projects/modules/files/Modules/$(SRC)/$(TAR)"
$(SRC): $(TAR)
- $(call print-header,"cap4 untar src $@")
+ $(call print-header,"cap4 src untar $@")
$(call untar-src,$(TAR))
ln -sf $@ src
@[ -d $@ ] && touch $@
-.make-$(SRC): $(SRC)
+.configure-$(SRC): $(SRC)
+ $(call print-header,"cap4 src configure $(SRC) for $(PREFIX)")
+ cd src && ./configure --prefix=$(PREFIX) > .configure-$(SRC) 2>&1
+ touch $@
+
+.make-$(SRC): .configure-$(SRC)
+ $(call print-header,"cap4 src $@ $(SRC)")
+ make -C src > .make-$(SRC) 2>&1
+ touch $@
+
+install: .make-$(SRC)
+ $(call print-header,"cap4 src $@ $(SRC)")
+ make -C src install > .make-$(SRC) 2>&1
include ../make.workbench
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-29 17:06:33
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via b91876d58ddbface949852383ec43be0891d0ef9 (commit)
from 15babbd57a532cdb3cfb058d092497501dccd9ec (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b91876d58ddbface949852383ec43be0891d0ef9
Author: CDM <cas...@us...>
Date: Wed Feb 29 10:05:47 2012 -0700
CDM: setup profile if non system correctly with sed command call
-----------------------------------------------------------------------
Summary of changes:
etc/profile.d/cap.csh | 2 +-
etc/profile.d/cap.sh | 2 +-
install.sh | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/etc/profile.d/cap.csh b/etc/profile.d/cap.csh
index db49656..a2ba686 100644
--- a/etc/profile.d/cap.csh
+++ b/etc/profile.d/cap.csh
@@ -27,7 +27,7 @@
############################################################################
# if cap is installed in system level directories, it should be in our path already,
-CAPHOME=SYSTEM
+CAPHOME=INSERT_CAPHOME_HERE
if ( $CAPHOME != "SYSTEM" ) then
setenv PATH $CAPHOME/bin:$PATH
setenv MANPATH $CAPHOME/man:$MANPATH
diff --git a/etc/profile.d/cap.sh b/etc/profile.d/cap.sh
index d9d9c68..20ac733 100644
--- a/etc/profile.d/cap.sh
+++ b/etc/profile.d/cap.sh
@@ -27,7 +27,7 @@
############################################################################
# if cap is installed in system level directories, it should be in our path already,
-CAPHOME=SYSTEM
+CAPHOME=INSERT_CAPHOME_HERE
if [ $CAPHOME != "SYSTEM" ]; then
export PATH=$CAPHOME/bin:$PATH
export MANPATH=$CAPHOME/man:$MANPATH
diff --git a/install.sh b/install.sh
index a2f26c5..fc00905 100755
--- a/install.sh
+++ b/install.sh
@@ -72,10 +72,12 @@ ln -sf ${_cap_home}/bin/deploy ${BUILD_ROOT}/usr/bin/deploy
#
mkdir -p ${BUILD_ROOT}/etc/profile.d
if [ ${_cap_home} != "." ]; then
+ sed -i -e "s!INSERT_CAPHOME_HERE!SYSTEM!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.csh
+ sed -i -e "s!INSERT_CAPHOME_HERE!SYSTEM!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.sh
ln -sf ${_cap_home}/etc/profile.d/cap.sh ${BUILD_ROOT}/etc/profile.d/cap.sh
ln -sf ${_cap_home}/etc/profile.d/cap.csh ${BUILD_ROOT}/etc/profile.d/cap.csh
else
- sed -i -e "s!SYSTEM!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.csh
- sed -i -e "s!SYSTEM!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.sh
+ sed -i -e "s!INSERT_CAPHOME_HERE!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.csh
+ sed -i -e "s!INSERT_CAPHOME_HERE!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.sh
fi
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-29 16:58:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 15babbd57a532cdb3cfb058d092497501dccd9ec (commit)
from 35c14d1b9667e8ea8b9daf68b374a64b1d625f56 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 15babbd57a532cdb3cfb058d092497501dccd9ec
Author: CDM <cas...@us...>
Date: Wed Feb 29 09:57:18 2012 -0700
CDM: add profile scripts to install that only modify the environment if the install is in a non-standard location
-----------------------------------------------------------------------
Summary of changes:
cap.spec | 3 ++
build.sh => etc/profile.d/cap.csh | 43 +++++++++++-------------------------
build.sh => etc/profile.d/cap.sh | 41 +++++++++++------------------------
install.sh | 19 +++++++++++++---
src/make.workbench | 2 +-
src/modules/Makefile | 17 ++++++++++++++
6 files changed, 62 insertions(+), 63 deletions(-)
copy build.sh => etc/profile.d/cap.csh (50%)
mode change 100755 => 100644
copy build.sh => etc/profile.d/cap.sh (51%)
mode change 100755 => 100644
create mode 100644 src/modules/Makefile
diff --git a/cap.spec b/cap.spec
index b4749b4..0e03c22 100644
--- a/cap.spec
+++ b/cap.spec
@@ -95,6 +95,7 @@ Authors:
%files
%defattr(-,root,root)
+%{_cap_home}/etc/*
%{_cap_home}/src/*
%{_cap_home}/share/doc/*
%{_cap_home}/bin/*
@@ -103,6 +104,8 @@ Authors:
/usr/libexec/cap4
/usr/src/cap4
/usr/bin/deploy
+/etc/profile.d/cap.sh
+/etc/profile.d/cap.csh
#%config(noreplace) %{_capconf_home}/sysconfig/cap
#%config(noreplace) %{_capconf_home}/profile.d/cap.csh
#%config(noreplace) %{_capconf_home}/profile.d/cap.sh
diff --git a/build.sh b/etc/profile.d/cap.csh
old mode 100755
new mode 100644
similarity index 50%
copy from build.sh
copy to etc/profile.d/cap.csh
index 5ac1188..db49656
--- a/build.sh
+++ b/etc/profile.d/cap.csh
@@ -1,15 +1,14 @@
-#!/bin/bash
-############################################################################
-# Name: build
-# File: build.sh
-# Purpose: build perl doc man pages
+#############################################################################
+# Name: cap.csh
+# File: cap.csh
+# Purpose: profile script for cap (tcsh and csh style)
# Bug Reports: cap4-devel_AT_lists_DOT_sf_DOT_net
#
-# Last Changed:
-# $Id: build.sh 1138 2007-11-12 16:32:33Z jatencio $
+# Last Modified:
+# $Id: cap.csh 1054 2007-09-05 13:48:25Z cashmont $
#
# Copyright:
-# © Copyright 2006, 2007,2012 Hewlett-Packard Development Company, L.P
+# © Copyright 2006, 2007, 2012 Hewlett-Packard Development Company, L.P
#
# License: GPL v2
# This program is free software; you can redistribute it and/or modify
@@ -27,25 +26,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################
-BUILD_ROOT=$1
-exit
-
-# Build the man pages commands
-#find usr/bin usr/sbin -type f -exec perldoc -d{}.1 -oman {} \;
-#find usr/bin usr/sbin -type f -name *.1 -exec gzip -9 {} \;
-
-#
-# change permissions properly
-#
-#find usr/bin usr/sbin usr/libexec/drivers -exec chmod a+rx {} \;
-#mkdir -p usr/share/man/man1
-#mv usr/bin/*.gz usr/sbin/*.gz usr/share/man/man1
-
-# Build the man pages perl modules and cli drivers
-#find usr/libexec -name '*.p?' -exec perldoc -d{}.3 -oman {} \;
-
-# move libexec drivers to man3
-#mkdir -p usr/share/man/man3
-#find usr/libexec -name '*.3' -exec gzip -9 {} \;
-#find usr/libexec -name '*.gz' -exec mv {} usr/share/man/man3/ \; -print
-
+# if cap is installed in system level directories, it should be in our path already,
+CAPHOME=SYSTEM
+if ( $CAPHOME != "SYSTEM" ) then
+ setenv PATH $CAPHOME/bin:$PATH
+ setenv MANPATH $CAPHOME/man:$MANPATH
+endif
diff --git a/build.sh b/etc/profile.d/cap.sh
old mode 100755
new mode 100644
similarity index 51%
copy from build.sh
copy to etc/profile.d/cap.sh
index 5ac1188..d9d9c68
--- a/build.sh
+++ b/etc/profile.d/cap.sh
@@ -1,15 +1,14 @@
-#!/bin/bash
-############################################################################
-# Name: build
-# File: build.sh
-# Purpose: build perl doc man pages
+#############################################################################
+# Name: cap.sh
+# File: cap.sh
+# Purpose: profile script for cap (sh, ksh and bash style)
# Bug Reports: cap4-devel_AT_lists_DOT_sf_DOT_net
#
-# Last Changed:
-# $Id: build.sh 1138 2007-11-12 16:32:33Z jatencio $
+# Last Modified:
+# $Id: cap.sh 1054 2007-09-05 13:48:25Z cashmont $
#
# Copyright:
-# © Copyright 2006, 2007,2012 Hewlett-Packard Development Company, L.P
+# © Copyright 2006, 2007, 2012 Hewlett-Packard Development Company, L.P
#
# License: GPL v2
# This program is free software; you can redistribute it and/or modify
@@ -27,25 +26,11 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################
-BUILD_ROOT=$1
-exit
-
-# Build the man pages commands
-#find usr/bin usr/sbin -type f -exec perldoc -d{}.1 -oman {} \;
-#find usr/bin usr/sbin -type f -name *.1 -exec gzip -9 {} \;
-
-#
-# change permissions properly
-#
-#find usr/bin usr/sbin usr/libexec/drivers -exec chmod a+rx {} \;
-#mkdir -p usr/share/man/man1
-#mv usr/bin/*.gz usr/sbin/*.gz usr/share/man/man1
-
-# Build the man pages perl modules and cli drivers
-#find usr/libexec -name '*.p?' -exec perldoc -d{}.3 -oman {} \;
+# if cap is installed in system level directories, it should be in our path already,
+CAPHOME=SYSTEM
+if [ $CAPHOME != "SYSTEM" ]; then
+ export PATH=$CAPHOME/bin:$PATH
+ export MANPATH=$CAPHOME/man:$MANPATH
+fi
-# move libexec drivers to man3
-#mkdir -p usr/share/man/man3
-#find usr/libexec -name '*.3' -exec gzip -9 {} \;
-#find usr/libexec -name '*.gz' -exec mv {} usr/share/man/man3/ \; -print
diff --git a/install.sh b/install.sh
index eb934d9..a2f26c5 100755
--- a/install.sh
+++ b/install.sh
@@ -28,14 +28,10 @@
############################################################################
#set -x
-#pwd
BUILD_ROOT=$1
# place stuff in /opt/cap4 and softlink to it from standard space instead
_cap_home=$2
-#_capconf_home=/etc
-#_capdb_home=/var/lib/cap
-#_cap_workorder_home=/var/spool/cap
[ $# -lt 1 ] && echo "$0 BUILD_ROOT _cap_home" && exit 1
[ "x${_cap_home}" = "x" ] && _cap_home=/opt/cap4
@@ -56,6 +52,10 @@ cp -rp --preserve=link libexec/* ${BUILD_ROOT}/${_cap_home}/libexec/
mkdir -p ${BUILD_ROOT}/${_cap_home}/share/doc
cp -rp --preserve=link doc/* ${BUILD_ROOT}/${_cap_home}/share/doc/
+# etc
+mkdir -p ${BUILD_ROOT}/${_cap_home}/etc
+cp -rp --preserve=link etc/* ${BUILD_ROOT}/${_cap_home}/etc/
+
#
# softlinks from /usr/*/cap4 -> ${_cap_home}/*
#
@@ -67,4 +67,15 @@ mkdir -p ${BUILD_ROOT}/usr/src
ln -sf ${_cap_home}/src ${BUILD_ROOT}/usr/src/cap4
mkdir -p ${BUILD_ROOT}/usr/bin
ln -sf ${_cap_home}/bin/deploy ${BUILD_ROOT}/usr/bin/deploy
+#
+# setup profile links or paths
+#
+mkdir -p ${BUILD_ROOT}/etc/profile.d
+if [ ${_cap_home} != "." ]; then
+ ln -sf ${_cap_home}/etc/profile.d/cap.sh ${BUILD_ROOT}/etc/profile.d/cap.sh
+ ln -sf ${_cap_home}/etc/profile.d/cap.csh ${BUILD_ROOT}/etc/profile.d/cap.csh
+else
+ sed -i -e "s!SYSTEM!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.csh
+ sed -i -e "s!SYSTEM!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.sh
+fi
diff --git a/src/make.workbench b/src/make.workbench
index 92db9e3..4f86982 100644
--- a/src/make.workbench
+++ b/src/make.workbench
@@ -26,5 +26,5 @@ rpmstatus:
clean distclean:
$(call print-header,"cap4 src $@ $(SRC)")
- rm -fr $(TAR) $(SRC) .rpmbuild-$(SRC) .rpmbuild BUILD BUILDROOT RPMS SOURCES SPECS SRPMS .make-$(SRC)
+ rm -fr $(TAR) $(SRC) .rpmbuild-$(SRC) .rpmbuild BUILD BUILDROOT RPMS SOURCES SPECS SRPMS .make-$(SRC) src
diff --git a/src/modules/Makefile b/src/modules/Makefile
new file mode 100644
index 0000000..87d398c
--- /dev/null
+++ b/src/modules/Makefile
@@ -0,0 +1,17 @@
+include ../make.def
+
+VERSION=3.2.9
+SUBVERSION=c
+SRC=modules-$(VERSION)
+TAR=$(SRC)$(SUBVERSION).tar.gz
+URL="http://sourceforge.net/projects/modules/files/Modules/$(SRC)/$(TAR)"
+
+$(SRC): $(TAR)
+ $(call print-header,"cap4 untar src $@")
+ $(call untar-src,$(TAR))
+ ln -sf $@ src
+ @[ -d $@ ] && touch $@
+
+.make-$(SRC): $(SRC)
+
+include ../make.workbench
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-29 15:59:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 35c14d1b9667e8ea8b9daf68b374a64b1d625f56 (commit)
from 53b26aecdbd7d52fbd0232753aa294718ad346c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 35c14d1b9667e8ea8b9daf68b374a64b1d625f56
Author: CDM <cas...@us...>
Date: Wed Feb 29 08:59:41 2012 -0700
CDM: move toolbox to src directory, add install target to Makefile, add bin/deploy program to install cap src tools
-----------------------------------------------------------------------
Summary of changes:
Makefile | 10 ++-
cap.spec | 40 ++------
doc/cap-program-template => deploy | 53 ++++++++---
install.sh | 30 +++++--
libexec/sh/cfunc | 131 +++++++++++++++++++++++++
{toolbox => src}/Makefile | 4 +-
{toolbox => src}/collectl-utils/Makefile | 0
{toolbox => src}/collectl/Makefile | 0
{toolbox => src}/conman/Makefile | 0
{toolbox => src}/diskscrub/Makefile | 0
{toolbox => src}/freeipmi/Makefile | 0
{toolbox => src}/genders/Makefile | 0
{toolbox => src}/io-watchdog/Makefile | 0
{toolbox => src}/make.def | 0
{toolbox => src}/make.workbench | 10 +-
{toolbox => src}/mcelog/Makefile | 4 +-
{toolbox => src}/munge/Makefile | 0
{toolbox => src}/nfsroot/Makefile | 0
{toolbox => src}/nodediag/Makefile | 0
{toolbox => src}/onesis/Makefile | 4 +-
{toolbox => src}/padb/Makefile | 0
{toolbox => src}/pdsh/Makefile | 0
{toolbox => src}/powerman/Makefile | 0
{toolbox => src}/python-hostlist/Makefile | 0
{toolbox => src}/slurm-spank-plugins/Makefile | 0
{toolbox => src}/slurm/Makefile | 0
{toolbox => src}/sqlog/Makefile | 0
{toolbox => src}/torque/Makefile | 0
28 files changed, 224 insertions(+), 62 deletions(-)
copy doc/cap-program-template => deploy (65%)
mode change 100644 => 100755
create mode 100755 libexec/sh/cfunc
rename {toolbox => src}/Makefile (85%)
rename {toolbox => src}/collectl-utils/Makefile (100%)
rename {toolbox => src}/collectl/Makefile (100%)
rename {toolbox => src}/conman/Makefile (100%)
rename {toolbox => src}/diskscrub/Makefile (100%)
rename {toolbox => src}/freeipmi/Makefile (100%)
rename {toolbox => src}/genders/Makefile (100%)
rename {toolbox => src}/io-watchdog/Makefile (100%)
rename {toolbox => src}/make.def (100%)
rename {toolbox => src}/make.workbench (68%)
rename {toolbox => src}/mcelog/Makefile (78%)
rename {toolbox => src}/munge/Makefile (100%)
rename {toolbox => src}/nfsroot/Makefile (100%)
rename {toolbox => src}/nodediag/Makefile (100%)
rename {toolbox => src}/onesis/Makefile (81%)
rename {toolbox => src}/padb/Makefile (100%)
rename {toolbox => src}/pdsh/Makefile (100%)
rename {toolbox => src}/powerman/Makefile (100%)
rename {toolbox => src}/python-hostlist/Makefile (100%)
rename {toolbox => src}/slurm-spank-plugins/Makefile (100%)
rename {toolbox => src}/slurm/Makefile (100%)
rename {toolbox => src}/sqlog/Makefile (100%)
rename {toolbox => src}/torque/Makefile (100%)
diff --git a/Makefile b/Makefile
index 6afe450..a398564 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,20 @@
# developer Makefile for cap4
#
+prefix ?= /opt/cap4
+
+install:
+ @echo "Installing cap4 in $(prefix)"
+ @export CAP4DEVHOME=`pwd`; ./install.sh $(prefix) .
+
dist: tgz
svndist: svntgz
tgz rpm srpm deb: build-cap4.sh
- export CAP4DEVHOME=`pwd`; ./build-cap4.sh official $@
+ @echo "Building official cap4 $@"
+ @export CAP4DEVHOME=`pwd`; ./build-cap4.sh official $@
gittgz svntgz gitrpm svnrpm gitsrpm svnsrpm gitdeb svndeb: build-cap4.sh
+ @echo "Building snapshot cap4 $@"
export CAP4DEVHOME=`pwd` && ./build-cap4.sh snapshot $(shell echo $@ | sed -e 's/svn//g' -e 's/git//g')
diff --git a/cap.spec b/cap.spec
index 84453f9..b4749b4 100644
--- a/cap.spec
+++ b/cap.spec
@@ -82,35 +82,11 @@ Authors:
./install.sh ${RPM_BUILD_ROOT}
%post
-# workorder
-mkdir -p %{_cap_workorder_home}
-
-# determine if we are new install, or upgrading
-if [ $1 -ne 1 ]; then
- # we are upgrading
-
- # determine if we need to modify our cap.conf
- if grep SPECONF_FIELDS %{_capconf_home}/cap/conf/cap.conf | grep -v TYPE; then
- # we need to upgrade our cap.conf to correct SPECONF_FIELDS,
- # the following will fail if this has been modified
- echo "updating SPECONF_FIELDS %{_capconf_home}/cap/conf/cap.conf";
- sed -i.orig '/^SPECONF_FIELDS/c\SPECONF_FIELDS = FILENAME, MD5SUM, TYPE, STAT, PERM, SIZE, UID, GID' %{_capconf_home}/cap/conf/cap.conf
-
- fi
-
-fi
-
-if [ -f /usr/bin/conman ]; then
- echo "Linking cap_console to conman"
- ln -sf /usr/bin/conman /usr/bin/cap_console
-elif [ -f /usr/bin/console ]; then
- echo "Linking cap_console to console"
- ln -sf /usr/bin/console /usr/bin/cap_console
-fi
+./postinstall.sh ${RPM_BUILD_ROOT}
%postun
-echo "CAP workorder files may still be located in %{_cap_workorder_home}!"
+%preun
#%preun test
@@ -119,6 +95,14 @@ echo "CAP workorder files may still be located in %{_cap_workorder_home}!"
%files
%defattr(-,root,root)
+%{_cap_home}/src/*
+%{_cap_home}/share/doc/*
+%{_cap_home}/bin/*
+%{_cap_home}/libexec/*
+/usr/share/doc/cap4
+/usr/libexec/cap4
+/usr/src/cap4
+/usr/bin/deploy
#%config(noreplace) %{_capconf_home}/sysconfig/cap
#%config(noreplace) %{_capconf_home}/profile.d/cap.csh
#%config(noreplace) %{_capconf_home}/profile.d/cap.sh
@@ -131,12 +115,10 @@ echo "CAP workorder files may still be located in %{_cap_workorder_home}!"
#%{_cap_home}/sbin/*
#%{_cap_home}/bin/*
#%{_cap_home}/include/cap/*
-%{_cap_home}/libexec/toolbox/*
+#%{_cap_workorder_home}
#%{_cap_home}/share/man/man1/*
#%{_cap_home}/share/man/man3/*
#%{_capconf_home}/cap
-%{_cap_home}/share/doc/*
-#%{_cap_workorder_home}
#%files test
#%defattr(-,root,root)
diff --git a/doc/cap-program-template b/deploy
old mode 100644
new mode 100755
similarity index 65%
copy from doc/cap-program-template
copy to deploy
index 7c8c6e8..d16fdbe
--- a/doc/cap-program-template
+++ b/deploy
@@ -1,8 +1,8 @@
-#!/usr/bin/perl
+#!/bin/bash
################################################################################
-# Name: PROGRAMNAME
-# File: PROGRAMNAME.EXTENSION
-# Purpose: DESCRIPTION
+# Name: deploy
+# File: deploy
+# Purpose: call make in src to build/install as rpm or a directory
# Bug Reports: cap4-devel_AT_lists_DOT_sf_DOT_net
#
# Last Modified:
@@ -27,24 +27,49 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
################################################################################
+#set -x
-# $$$$$$$$$$$$$$$$$$
-# begin main program
-# $$$$$$$$$$$$$$$$$$
+[ ! -f /usr/libexec/cap4/sh/cfunc ] && [ "x${CAPDEVHOME}" = "x" ] && echo "Missing cfunc library" && exit 1
+[ "x${CAPDEVHOME}" != "x" ] && [ ! -f ${CAPDEVHOME}/libexec/sh/cfunc ] && echo "Missing cfunc library" && exit 1
-BEGIN {
- die "Please define CAPHOME!\n" if !defined($ENV{CAPHOME});
+[ [ -f /usr/libexec/cap4/sh/cfunc ] && . /usr/libexec/cap4/sh/cfunc ] ||
+[ [ "x${CAPDEVHOME}" != "x" ] && [ -f ${CAPDEVHOME}/libexec/sh/cfunc ] echo "Using development cfunc library in $CAPDEVHOME" && . ${CAPDEVHOME}/libexec/sh/cfunc ]
+
+
+usage() {
+ echo $0 --tool TOOLNAME --rpm
+ echo $0 --tool TOOLNAME --prefix PREFIXDIRECTORY
+ exit 1
}
-use lib ( $ENV{CAPHOME} eq "/usr" ? "/usr/libexec/cap" : "$ENV{CAPHOME}/libexec");
+parsecli "$@"
+
+check_validvar TOOL $TOOL
+
+if [ $RPM -eq 1 ]; then
+ cinfo MAKE "$TOOL => RPM"
+ make_tool $TOOL
+else
+ check_validvar PREFIX $PREFIX
+ cinfo MAKE "$TOOL => $PREFIX"
+ make_tool $TOOL $PREFIX
+fi
+
+# now look for src and call for tool to be built
+
+
+: <<=cut
+
+=pod
-=head1 NAME
+=head1 deploy
-PROGRAMNAME - Brief description of your program
+deploy - deploy cap src programs as rpms/debs or in a specific directory for use
=head1 SYNOPSIS
- $ How to use your program (with use statements, from the command line)
+ $ deploy --tool TOOLNAME --rpm
+ $ deploy --tool TOOLNAME --prefix PREFIXDIRECTORY
=head1 DESCRIPTION
@@ -63,7 +88,7 @@ Updated software and documentation may be found at the CAP web site:
=head1 COPYRIGHT AND LICENSE
-© Copyright 2007 Hewlett-Packard Development Company, L.P
+© Copyright 2012 Hewlett-Packard Development Company, L.P
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff --git a/install.sh b/install.sh
index 0d1a103..eb934d9 100755
--- a/install.sh
+++ b/install.sh
@@ -40,15 +40,31 @@ _cap_home=$2
[ $# -lt 1 ] && echo "$0 BUILD_ROOT _cap_home" && exit 1
[ "x${_cap_home}" = "x" ] && _cap_home=/opt/cap4
-# copy toolbox install
-mkdir -p ${BUILD_ROOT}/${_cap_home}/libexec/toolbox
-cp -rp --preserve=link toolbox/* ${BUILD_ROOT}/${_cap_home}/libexec/toolbox/
+# bins
+mkdir -p ${BUILD_ROOT}/${_cap_home}/bin
+cp -rp --preserve=link deploy ${BUILD_ROOT}/${_cap_home}/bin/
-# copy toolbox install
+# src
+mkdir -p ${BUILD_ROOT}/${_cap_home}/src
+cp -rp --preserve=link src/* ${BUILD_ROOT}/${_cap_home}/src/
+
+# libexec
+mkdir -p ${BUILD_ROOT}/${_cap_home}/libexec
+cp -rp --preserve=link libexec/* ${BUILD_ROOT}/${_cap_home}/libexec/
+
+# docs
mkdir -p ${BUILD_ROOT}/${_cap_home}/share/doc
cp -rp --preserve=link doc/* ${BUILD_ROOT}/${_cap_home}/share/doc/
-# copy man pages
-# soft link if we want
-#### etc,bin,sbin,man, links
+#
+# softlinks from /usr/*/cap4 -> ${_cap_home}/*
+#
+mkdir -p ${BUILD_ROOT}/usr/share/doc
+ln -sf ${_cap_home}/share/doc ${BUILD_ROOT}/usr/share/doc/cap4
+mkdir -p ${BUILD_ROOT}/usr/libexec
+ln -sf ${_cap_home}/libexec ${BUILD_ROOT}/usr/libexec/cap4
+mkdir -p ${BUILD_ROOT}/usr/src
+ln -sf ${_cap_home}/src ${BUILD_ROOT}/usr/src/cap4
+mkdir -p ${BUILD_ROOT}/usr/bin
+ln -sf ${_cap_home}/bin/deploy ${BUILD_ROOT}/usr/bin/deploy
diff --git a/libexec/sh/cfunc b/libexec/sh/cfunc
new file mode 100755
index 0000000..1ed5d98
--- /dev/null
+++ b/libexec/sh/cfunc
@@ -0,0 +1,131 @@
+#!/bin/bash
+################################################################################
+# Name: cfunc
+# File: cfunc
+# Purpose: call make in src to build/install as rpm or a directory
+# Bug Reports: cap4-devel_AT_lists_DOT_sf_DOT_net
+#
+# Last Modified:
+# $Id: cap-program-template 1349 2009-01-28 16:09:23Z jatencio $
+#
+# Copyright:
+# © Copyright 2012 Hewlett-Packard Development Company, L.P
+#
+# License: GPL v2
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+################################################################################
+
+# $$$$$$$$$$$$$$$$$$
+# begin main program
+# $$$$$$$$$$$$$$$$$$
+
+RPM=0
+
+parsecli() {
+ ARG="$@"
+ # Note that we use `"$@"' to let each command-line parameter expand to a
+ # separate word. The quotes around `$@' are essential!
+ # We need TEMP as the `eval set --' would nuke the return value of getopt.
+ TEMP=`getopt -o hc:: -l tool:,prefix:,rpm,help,usage,debug \
+ -n 'ERROR' -- "$@"`
+ if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+ # Note the quotes around `$TEMP': they are essential!
+ eval set -- "$TEMP"
+
+ while true ; do
+ case "$1" in
+ --tool) TOOL=$2; shift 2 ;;
+ --prefix) PREFIX=$2; shift 2 ;;
+ --rpm) RPM=1; shift ;;
+ --help|--usage) usage ;;
+ --debug) DEBUG=1; shift ;;
+ --) shift ; break ;;
+ *) echo "Internal error!" ; exit 1 ;;
+ esac
+ done
+ if [ $DEBUG ] ; then
+ echo "Remaining args:"
+ for arg do echo '--> '"\`$arg\`" ; done
+ fi
+}
+
+check_validvar() {
+ [ $# -lt 1 ] && echo "VARIABLE_NAME VARIABLE_VALUE" && exit 1
+ [ "x${2}" = "x" ] && echo "Undefined VARIABLE ${1}" && exit 1
+}
+
+cinfo() {
+ local tag=$1
+ check_validvar tag $tag
+ shift
+ echo "$tag: $@"
+}
+
+make_tool() {
+ [ $# -lt 1 ] && echo "make_tool TOOL PREFIXOPTION" && exit 1
+ local tool=$1
+ shift
+
+ [ [ ! -d /usr/src/cap4/$tool ] && [ "x${CAPHOME}" = "x" ] ] && \
+ [ [ "x${CAPDEVHOME}" != "x" ] && [ ! -d ${CAPDEVHOME}/src/make/$tool ] ] && \
+ echo "Missing make src for $tool" && exit 1
+
+
+
+ if [ $RPM -eq 1 -a $2 ]; then
+ echo "UNDER DEVELOPMENT: make_tool called with a prefix for rpm"
+ exit 1
+ elif [ $RPM -eq 1 ]; then
+ make -C
+ fi
+}
+
+: <<=cut
+
+=pod
+
+=head1 cfunc
+
+cfunc - library of bash functions for cap4
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+More detailed description of your program. Include CLI, Options, Variable Names, Exported Subroutines, Internal Subroutines.
+
+=head1 SEE ALSO
+
+Local documentation should be accessible in
+ /usr/share/doc/cap4/
+
+Submit any questions/requests/gripes to the CAP-users mailing list:
+ cap4-users_AT_lists_DOT_sf_DOT_net
+
+Updated software and documentation may be found at the CAP web site:
+ http://www.capforge.org
+
+=head1 COPYRIGHT AND LICENSE
+
+© Copyright 2012 Hewlett-Packard Development Company, L.P
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+=cut
diff --git a/toolbox/Makefile b/src/Makefile
similarity index 85%
rename from toolbox/Makefile
rename to src/Makefile
index 5357459..4065939 100644
--- a/toolbox/Makefile
+++ b/src/Makefile
@@ -6,13 +6,13 @@ TOOLDIRS = conman freeipmi genders nodediag pdsh powerman diskscrub \
OTHERS = munge nfsroot slurm-spank-plugins io-watchdog padb sqlog diskscrub slurm torque
download downloadstatus clean distclean:
- $(call print-header,"cap4 toolbox $@")
+ $(call print-header,"cap4 src $@")
@for TOOLS in $(TOOLDIRS) $(OTHERS); do \
[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS $@; \
done;
rpm rpmstatus:
- $(call print-header,"cap4 toolbox $@")
+ $(call print-header,"cap4 src $@")
@for TOOLS in $(TOOLDIRS); do \
[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS $@; \
done;
diff --git a/toolbox/collectl-utils/Makefile b/src/collectl-utils/Makefile
similarity index 100%
rename from toolbox/collectl-utils/Makefile
rename to src/collectl-utils/Makefile
diff --git a/toolbox/collectl/Makefile b/src/collectl/Makefile
similarity index 100%
rename from toolbox/collectl/Makefile
rename to src/collectl/Makefile
diff --git a/toolbox/conman/Makefile b/src/conman/Makefile
similarity index 100%
rename from toolbox/conman/Makefile
rename to src/conman/Makefile
diff --git a/toolbox/diskscrub/Makefile b/src/diskscrub/Makefile
similarity index 100%
rename from toolbox/diskscrub/Makefile
rename to src/diskscrub/Makefile
diff --git a/toolbox/freeipmi/Makefile b/src/freeipmi/Makefile
similarity index 100%
rename from toolbox/freeipmi/Makefile
rename to src/freeipmi/Makefile
diff --git a/toolbox/genders/Makefile b/src/genders/Makefile
similarity index 100%
rename from toolbox/genders/Makefile
rename to src/genders/Makefile
diff --git a/toolbox/io-watchdog/Makefile b/src/io-watchdog/Makefile
similarity index 100%
rename from toolbox/io-watchdog/Makefile
rename to src/io-watchdog/Makefile
diff --git a/toolbox/make.def b/src/make.def
similarity index 100%
rename from toolbox/make.def
rename to src/make.def
diff --git a/toolbox/make.workbench b/src/make.workbench
similarity index 68%
rename from toolbox/make.workbench
rename to src/make.workbench
index c8f3caf..92db9e3 100644
--- a/toolbox/make.workbench
+++ b/src/make.workbench
@@ -3,28 +3,28 @@ default: .make-$(SRC)
download: $(TAR)
$(TAR):
- $(call print-header,"cap4 toolbox download $@")
+ $(call print-header,"cap4 src download $@")
$(call download-curl-url,$(URL))
rpm: .rpmbuild-$(SRC)
.rpmbuild-$(SRC): $(TAR)
- $(call print-header,"cap4 toolbox rpmbuild $(SRC)")
+ $(call print-header,"cap4 src rpmbuild $(SRC)")
$(call rpmbuild-src,$(TAR))
@[ -f .rpmbuild ] && mv .rpmbuild .rpmbuild-$(SRC)
@touch $@
downloadstatus:
- $(call print-header,"cap4 toolbox $@ $(TAR)")
+ $(call print-header,"cap4 src $@ $(TAR)")
@[ -f $(TAR) ] && echo `ls --color $(TAR)`=`file $(TAR) | sed -e 's/$(TAR)://g'`
@sleep 1
rpmstatus:
- $(call print-header,"cap4 toolbox $@ $(SRC)")
+ $(call print-header,"cap4 src $@ $(SRC)")
@[ -d RPMS ] && find ./RPMS -name *.rpm | xargs ls --color
@sleep 1
clean distclean:
- $(call print-header,"cap4 toolbox $@ $(SRC)")
+ $(call print-header,"cap4 src $@ $(SRC)")
rm -fr $(TAR) $(SRC) .rpmbuild-$(SRC) .rpmbuild BUILD BUILDROOT RPMS SOURCES SPECS SRPMS .make-$(SRC)
diff --git a/toolbox/mcelog/Makefile b/src/mcelog/Makefile
similarity index 78%
rename from toolbox/mcelog/Makefile
rename to src/mcelog/Makefile
index ddff614..053f266 100644
--- a/toolbox/mcelog/Makefile
+++ b/src/mcelog/Makefile
@@ -10,11 +10,11 @@ default: .make-$(SRC)
gitdownload: $(SRC)
$(SRC):
- $(call print-header,"cap4 toolbox git pull $@")
+ $(call print-header,"cap4 src git pull $@")
$(call gitpull-src,$(URL),$(SRC))
.make-$(SRC): $(SRC)
- $(call print-header,"cap4 toolbox make $(SRC)")
+ $(call print-header,"cap4 src make $(SRC)")
make -C $(SRC) > .make-$(SRC) 2>&1
@echo "Run as root make install"
@touch $@
diff --git a/toolbox/munge/Makefile b/src/munge/Makefile
similarity index 100%
rename from toolbox/munge/Makefile
rename to src/munge/Makefile
diff --git a/toolbox/nfsroot/Makefile b/src/nfsroot/Makefile
similarity index 100%
rename from toolbox/nfsroot/Makefile
rename to src/nfsroot/Makefile
diff --git a/toolbox/nodediag/Makefile b/src/nodediag/Makefile
similarity index 100%
rename from toolbox/nodediag/Makefile
rename to src/nodediag/Makefile
diff --git a/toolbox/onesis/Makefile b/src/onesis/Makefile
similarity index 81%
rename from toolbox/onesis/Makefile
rename to src/onesis/Makefile
index 89d5c01..2a0c6a5 100644
--- a/toolbox/onesis/Makefile
+++ b/src/onesis/Makefile
@@ -10,7 +10,7 @@ default: .make-$(SRC)
svndownload: $(SRC)
$(SRC):
- $(call print-header,"cap4 toolbox svn checkout $@")
+ $(call print-header,"cap4 src svn checkout $@")
mkdir -p $(SRC)
$(call svncheckout-src,$(URL)/trunk,trunk)
mv trunk $(SRC)/
@@ -19,7 +19,7 @@ $(SRC):
@touch $@
.make-$(SRC): $(SRC)
- $(call print-header,"cap4 toolbox make $(SRC)")
+ $(call print-header,"cap4 src make $(SRC)")
@echo "run as root: make -C $(SRC)/trunk svnrpm"
@touch $@
diff --git a/toolbox/padb/Makefile b/src/padb/Makefile
similarity index 100%
rename from toolbox/padb/Makefile
rename to src/padb/Makefile
diff --git a/toolbox/pdsh/Makefile b/src/pdsh/Makefile
similarity index 100%
rename from toolbox/pdsh/Makefile
rename to src/pdsh/Makefile
diff --git a/toolbox/powerman/Makefile b/src/powerman/Makefile
similarity index 100%
rename from toolbox/powerman/Makefile
rename to src/powerman/Makefile
diff --git a/toolbox/python-hostlist/Makefile b/src/python-hostlist/Makefile
similarity index 100%
rename from toolbox/python-hostlist/Makefile
rename to src/python-hostlist/Makefile
diff --git a/toolbox/slurm-spank-plugins/Makefile b/src/slurm-spank-plugins/Makefile
similarity index 100%
rename from toolbox/slurm-spank-plugins/Makefile
rename to src/slurm-spank-plugins/Makefile
diff --git a/toolbox/slurm/Makefile b/src/slurm/Makefile
similarity index 100%
rename from toolbox/slurm/Makefile
rename to src/slurm/Makefile
diff --git a/toolbox/sqlog/Makefile b/src/sqlog/Makefile
similarity index 100%
rename from toolbox/sqlog/Makefile
rename to src/sqlog/Makefile
diff --git a/toolbox/torque/Makefile b/src/torque/Makefile
similarity index 100%
rename from toolbox/torque/Makefile
rename to src/torque/Makefile
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-28 17:28:33
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 53b26aecdbd7d52fbd0232753aa294718ad346c1 (commit)
from 4178f45da0c038441b160e9514a2df9eecd14de9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 53b26aecdbd7d52fbd0232753aa294718ad346c1
Author: CDM <cas...@us...>
Date: Tue Feb 28 10:28:18 2012 -0700
CDM: fixes to make rpm|svnrpm|gitrpm work
-----------------------------------------------------------------------
Summary of changes:
cap.spec | 55 ++++++++++++++++++++++++-------------------------------
install.sh | 4 ++--
2 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/cap.spec b/cap.spec
index 1899eb8..84453f9 100644
--- a/cap.spec
+++ b/cap.spec
@@ -23,10 +23,12 @@ Source0: http://www.capforge.com/downloads/cap/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
-%define _cap_home /usr
-%define _capconf_home /etc
-%define _capdb_home /var/lib/cap
-%define _cap_workorder_home /var/spool/cap
+# if no cap_home passed in assume /opt/cap4
+%{!?_cap_home: %define _cap_home /opt/cap4}
+#-%define _capconf_home /etc
+#-%define _capdb_home /var/lib/cap
+#-%define _cap_workorder_home /var/spool/cap
+
%description
The Cluster Administration Package (CAP) is meant to ease integration,
@@ -70,23 +72,14 @@ Authors:
%pre
-#if pdsh -h 2>&1 | grep modules | grep exec ; then
-# echo pdsh exec available
-#else
-# echo pdsh exec not available
-#fi
-
-
%prep
%setup -q -n %{name}-%{version}
%build
-
-tools/build.sh ${RPM_BUILD_ROOT}
+./build.sh ${RPM_BUILD_ROOT}
%install
-
-tools/install.sh ${RPM_BUILD_ROOT}
+./install.sh ${RPM_BUILD_ROOT}
%post
# workorder
@@ -126,23 +119,23 @@ echo "CAP workorder files may still be located in %{_cap_workorder_home}!"
%files
%defattr(-,root,root)
-%config(noreplace) %{_capconf_home}/sysconfig/cap
-%config(noreplace) %{_capconf_home}/profile.d/cap.csh
-%config(noreplace) %{_capconf_home}/profile.d/cap.sh
-%config(noreplace) %{_capconf_home}/cap/conf/cap.conf
-%config(noreplace) %{_capconf_home}/cap/conf.d/client_proxy.conf
-%config(noreplace) %{_capconf_home}/cap/conf.d/client_cache.conf
-%config(noreplace) %{_capconf_home}/cap/conf.d/workorder.conf
-%docdir %{_capconf_home}/share/doc/cap4
-%{_capconf_home}/rc.d/init.d/*
-%{_cap_home}/sbin/*
-%{_cap_home}/bin/*
-%{_cap_home}/include/cap/*
-%{_cap_home}/libexec/cap/*
-%{_cap_home}/share/man/man1/*
-%{_cap_home}/share/man/man3/*
+#%config(noreplace) %{_capconf_home}/sysconfig/cap
+#%config(noreplace) %{_capconf_home}/profile.d/cap.csh
+#%config(noreplace) %{_capconf_home}/profile.d/cap.sh
+#%config(noreplace) %{_capconf_home}/cap/conf/cap.conf
+#%config(noreplace) %{_capconf_home}/cap/conf.d/client_proxy.conf
+#%config(noreplace) %{_capconf_home}/cap/conf.d/client_cache.conf
+#%config(noreplace) %{_capconf_home}/cap/conf.d/workorder.conf
+#%docdir %{_capconf_home}/share/doc/cap4
+#%{_capconf_home}/rc.d/init.d/*
+#%{_cap_home}/sbin/*
+#%{_cap_home}/bin/*
+#%{_cap_home}/include/cap/*
+%{_cap_home}/libexec/toolbox/*
+#%{_cap_home}/share/man/man1/*
+#%{_cap_home}/share/man/man3/*
#%{_capconf_home}/cap
-%{_cap_home}/share/doc/cap4/*
+%{_cap_home}/share/doc/*
#%{_cap_workorder_home}
#%files test
diff --git a/install.sh b/install.sh
index 44278b4..0d1a103 100755
--- a/install.sh
+++ b/install.sh
@@ -27,8 +27,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################
-set -x
-pwd
+#set -x
+#pwd
BUILD_ROOT=$1
# place stuff in /opt/cap4 and softlink to it from standard space instead
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-28 17:07:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 4178f45da0c038441b160e9514a2df9eecd14de9 (commit)
from 1996f19a6628e5d2c5d84d6882aa502aa2d923ac (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4178f45da0c038441b160e9514a2df9eecd14de9
Author: CDM <cas...@us...>
Date: Tue Feb 28 10:06:12 2012 -0700
CDM: build a deb with new system, now to test rpmbuild
-----------------------------------------------------------------------
Summary of changes:
build-cap4.sh | 2 +
build.sh | 51 ++++++++++++++++++++++++++++++++++
debian/DEBIAN/conffiles | 1 -
debian/DEBIAN/control | 48 ++++++++++++++++----------------
{docs => doc}/COPYRIGHT | 0
{docs => doc}/GPL_V2 | 0
{docs => doc}/cap-program-template | 0
install.sh | 54 ++++++++++++++++++++++++++++++++++++
8 files changed, 131 insertions(+), 25 deletions(-)
create mode 100755 build.sh
rename {docs => doc}/COPYRIGHT (100%)
rename {docs => doc}/GPL_V2 (100%)
rename {docs => doc}/cap-program-template (100%)
create mode 100755 install.sh
diff --git a/build-cap4.sh b/build-cap4.sh
index 29d7fc6..fb145cb 100755
--- a/build-cap4.sh
+++ b/build-cap4.sh
@@ -124,6 +124,8 @@ elif [ $PKG = deb ]; then
rm -fr /tmp/cap4-debian
fi
mkdir -p /tmp/cap4-debian
+ cd $CAP4DEVHOME
+ $CAP4DEVHOME/install.sh /tmp/cap4-debian
cd ${SOURCE_BUILD_ROOT}
cp -r debian/DEBIAN /tmp/cap4-debian
sed ${REL_SEDCMD} $CAP4DEVHOME/debian/DEBIAN/control > /tmp/cap4-debian/DEBIAN/control
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..5ac1188
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+############################################################################
+# Name: build
+# File: build.sh
+# Purpose: build perl doc man pages
+# Bug Reports: cap4-devel_AT_lists_DOT_sf_DOT_net
+#
+# Last Changed:
+# $Id: build.sh 1138 2007-11-12 16:32:33Z jatencio $
+#
+# Copyright:
+# © Copyright 2006, 2007,2012 Hewlett-Packard Development Company, L.P
+#
+# License: GPL v2
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+############################################################################
+
+BUILD_ROOT=$1
+exit
+
+# Build the man pages commands
+#find usr/bin usr/sbin -type f -exec perldoc -d{}.1 -oman {} \;
+#find usr/bin usr/sbin -type f -name *.1 -exec gzip -9 {} \;
+
+#
+# change permissions properly
+#
+#find usr/bin usr/sbin usr/libexec/drivers -exec chmod a+rx {} \;
+#mkdir -p usr/share/man/man1
+#mv usr/bin/*.gz usr/sbin/*.gz usr/share/man/man1
+
+# Build the man pages perl modules and cli drivers
+#find usr/libexec -name '*.p?' -exec perldoc -d{}.3 -oman {} \;
+
+# move libexec drivers to man3
+#mkdir -p usr/share/man/man3
+#find usr/libexec -name '*.3' -exec gzip -9 {} \;
+#find usr/libexec -name '*.gz' -exec mv {} usr/share/man/man3/ \; -print
+
diff --git a/debian/DEBIAN/conffiles b/debian/DEBIAN/conffiles
index fc6374a..e69de29 100644
--- a/debian/DEBIAN/conffiles
+++ b/debian/DEBIAN/conffiles
@@ -1 +0,0 @@
-/etc/cap/cap.conf
diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control
index e9eb28b..5be7b1e 100644
--- a/debian/DEBIAN/control
+++ b/debian/DEBIAN/control
@@ -12,28 +12,28 @@ Replaces:
Installed-Size: 3300
Maintainer: CAP DEVELOPERS <cap-devel_AT_sf_DOT_net>
Description: The Cluster Administration Package (CAP) is meant to ease integration,
-configuration, and systems management for clustering. It is the "glue"
-that allows cluster administrators to leverage existing technologies
-in a functional framework. This is done by delivering functionality
-into three component categories.
-
-The first is "Information Management." From this category functions
-can be written to generate standard unix configuration files or to
-produce a file arrangement suitable for other clustering technologies.
-
-The next category is "Control." This category allows an administrator
-to control their cluster as one system using common methods one uses to
-control a single system, such as power and console. With the addition of
-management devices, a cluster administrator can also control uids or
-gather system sensor data when possible.
-
-The last category is "Installation." When installing a multitude of
-systems a cluster administrator wants a common method or set of methods
-to ensure a set of functionality if delivered to each node in their
-cluster. By leveraging existing technologies, CAP can ensure it can adapt
-to fit the needs of other installation methods available. clusters.
-
-Authors:
---------
- CAPforge.org
+ configuration, and systems management for clustering. It is the "glue"
+ that allows cluster administrators to leverage existing technologies
+ in a functional framework. This is done by delivering functionality
+ into three component categories.
+ .
+ The first is "Information Management." From this category functions
+ can be written to generate standard unix configuration files or to
+ produce a file arrangement suitable for other clustering technologies.
+ .
+ The next category is "Control." This category allows an administrator
+ to control their cluster as one system using common methods one uses to
+ control a single system, such as power and console. With the addition of
+ management devices, a cluster administrator can also control uids or
+ gather system sensor data when possible.
+ .
+ The last category is "Installation." When installing a multitude of
+ systems a cluster administrator wants a common method or set of methods
+ to ensure a set of functionality if delivered to each node in their
+ cluster. By leveraging existing technologies, CAP can ensure it can adapt
+ to fit the needs of other installation methods available. clusters.
+ .
+ Authors:
+ --------
+ CAPforge.org
diff --git a/docs/COPYRIGHT b/doc/COPYRIGHT
similarity index 100%
rename from docs/COPYRIGHT
rename to doc/COPYRIGHT
diff --git a/docs/GPL_V2 b/doc/GPL_V2
similarity index 100%
rename from docs/GPL_V2
rename to doc/GPL_V2
diff --git a/docs/cap-program-template b/doc/cap-program-template
similarity index 100%
rename from docs/cap-program-template
rename to doc/cap-program-template
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..44278b4
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+############################################################################
+# Name: install
+# File: install.sh
+# Purpose: install cap to build root directory
+# Bug Reports: cap4-devel_AT_lists_DOT_sf_DOT_net
+#
+# Last Changed:
+# $Id: install.sh 1138 2007-11-12 16:32:33Z jatencio $
+#
+# Copyright:
+# © Copyright 2006, 2007, 2012 Hewlett-Packard Development Company, L.P
+#
+# License: GPL v2
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+############################################################################
+
+set -x
+pwd
+BUILD_ROOT=$1
+
+# place stuff in /opt/cap4 and softlink to it from standard space instead
+_cap_home=$2
+#_capconf_home=/etc
+#_capdb_home=/var/lib/cap
+#_cap_workorder_home=/var/spool/cap
+
+[ $# -lt 1 ] && echo "$0 BUILD_ROOT _cap_home" && exit 1
+[ "x${_cap_home}" = "x" ] && _cap_home=/opt/cap4
+
+# copy toolbox install
+mkdir -p ${BUILD_ROOT}/${_cap_home}/libexec/toolbox
+cp -rp --preserve=link toolbox/* ${BUILD_ROOT}/${_cap_home}/libexec/toolbox/
+
+# copy toolbox install
+mkdir -p ${BUILD_ROOT}/${_cap_home}/share/doc
+cp -rp --preserve=link doc/* ${BUILD_ROOT}/${_cap_home}/share/doc/
+
+# copy man pages
+# soft link if we want
+#### etc,bin,sbin,man, links
+
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-25 00:02:10
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 1996f19a6628e5d2c5d84d6882aa502aa2d923ac (commit)
from ee8eddbbf5188ca60541b01fa7e396d90273720a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1996f19a6628e5d2c5d84d6882aa502aa2d923ac
Author: CDM <cas...@us...>
Date: Fri Feb 24 17:00:24 2012 -0700
CDM: more testin fixes, still not there
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
build-cap4.sh | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 9871967..6afe450 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,6 @@ svndist: svntgz
tgz rpm srpm deb: build-cap4.sh
export CAP4DEVHOME=`pwd`; ./build-cap4.sh official $@
-gittgz svntgz svnrpm svnsrpm svndeb: build-cap4.sh
+gittgz svntgz gitrpm svnrpm gitsrpm svnsrpm gitdeb svndeb: build-cap4.sh
export CAP4DEVHOME=`pwd` && ./build-cap4.sh snapshot $(shell echo $@ | sed -e 's/svn//g' -e 's/git//g')
diff --git a/build-cap4.sh b/build-cap4.sh
index d703cd3..29d7fc6 100755
--- a/build-cap4.sh
+++ b/build-cap4.sh
@@ -47,7 +47,7 @@ VERSION=$(grep ^Version: $CAP4DEVHOME/cap.spec | awk '{print $2}')
#
git_version() {
GITVERSION=`git describe --always`
- GITMODIFIED=`(git status | grep "modified:\|added:\|deleted:" -q) && echo "-M"`
+ GITMODIFIED=`(git status | grep "modified:\|added:\|deleted:" -q) && echo "_M"`
RELEASE=$GITVERSION$GITMODIFIED
}
svnversion() {
@@ -125,7 +125,6 @@ elif [ $PKG = deb ]; then
fi
mkdir -p /tmp/cap4-debian
cd ${SOURCE_BUILD_ROOT}
- prefix=/tmp/cap4-debian make install
cp -r debian/DEBIAN /tmp/cap4-debian
sed ${REL_SEDCMD} $CAP4DEVHOME/debian/DEBIAN/control > /tmp/cap4-debian/DEBIAN/control
cd /tmp
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-24 23:55:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via ee8eddbbf5188ca60541b01fa7e396d90273720a (commit)
from ed925278691d7b6dfe47f167d3d46d103e3595ff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ee8eddbbf5188ca60541b01fa7e396d90273720a
Author: CDM <cas...@us...>
Date: Fri Feb 24 16:55:08 2012 -0700
CDM: add initial support for Debian, still developing
-----------------------------------------------------------------------
Summary of changes:
build-cap4.sh | 4 ++--
debian/DEBIAN/conffiles | 1 +
debian/DEBIAN/control | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 2 deletions(-)
create mode 100644 debian/DEBIAN/conffiles
create mode 100644 debian/DEBIAN/control
diff --git a/build-cap4.sh b/build-cap4.sh
index 3211624..d703cd3 100755
--- a/build-cap4.sh
+++ b/build-cap4.sh
@@ -130,9 +130,9 @@ elif [ $PKG = deb ]; then
sed ${REL_SEDCMD} $CAP4DEVHOME/debian/DEBIAN/control > /tmp/cap4-debian/DEBIAN/control
cd /tmp
if [ -z $RELEASE ]; then
- DIST_DEB=cap4-${VERSION}-1.deb
+ DIST_DEB=cap-${VERSION}-1.deb
else
- DIST_DEB=cap4-${VERSION}-1_${RELEASE}.deb
+ DIST_DEB=cap-${VERSION}-1_${RELEASE}.deb
fi
dpkg -b /tmp/cap4-debian ${DIST_DEB}
rm -fr /tmp/cap4-debian
diff --git a/debian/DEBIAN/conffiles b/debian/DEBIAN/conffiles
new file mode 100644
index 0000000..fc6374a
--- /dev/null
+++ b/debian/DEBIAN/conffiles
@@ -0,0 +1 @@
+/etc/cap/cap.conf
diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control
new file mode 100644
index 0000000..e9eb28b
--- /dev/null
+++ b/debian/DEBIAN/control
@@ -0,0 +1,39 @@
+Package: cap-4.1
+Version: RELEASE
+Section: misc
+Priority: extra
+Architecture: all
+Depends: coreutils, util-linux, rsync
+Pre-Depends: perl
+Recommends: pdsh
+Suggests: pdsh
+Conflicts:
+Replaces:
+Installed-Size: 3300
+Maintainer: CAP DEVELOPERS <cap-devel_AT_sf_DOT_net>
+Description: The Cluster Administration Package (CAP) is meant to ease integration,
+configuration, and systems management for clustering. It is the "glue"
+that allows cluster administrators to leverage existing technologies
+in a functional framework. This is done by delivering functionality
+into three component categories.
+
+The first is "Information Management." From this category functions
+can be written to generate standard unix configuration files or to
+produce a file arrangement suitable for other clustering technologies.
+
+The next category is "Control." This category allows an administrator
+to control their cluster as one system using common methods one uses to
+control a single system, such as power and console. With the addition of
+management devices, a cluster administrator can also control uids or
+gather system sensor data when possible.
+
+The last category is "Installation." When installing a multitude of
+systems a cluster administrator wants a common method or set of methods
+to ensure a set of functionality if delivered to each node in their
+cluster. By leveraging existing technologies, CAP can ensure it can adapt
+to fit the needs of other installation methods available. clusters.
+
+Authors:
+--------
+ CAPforge.org
+
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-24 23:46:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via ed925278691d7b6dfe47f167d3d46d103e3595ff (commit)
from 30d9ddcdb0ca0885292773fe05a964dbe9ea9522 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ed925278691d7b6dfe47f167d3d46d103e3595ff
Author: CDM <cas...@us...>
Date: Fri Feb 24 16:45:57 2012 -0700
CDM: fix git version checks
-----------------------------------------------------------------------
Summary of changes:
build-cap4.sh | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-24 21:01:40
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 30d9ddcdb0ca0885292773fe05a964dbe9ea9522 (commit)
from b3eff3fcbaf1757190267f6627cc7fd47a21ab14 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 30d9ddcdb0ca0885292773fe05a964dbe9ea9522
Author: CDM <cas...@us...>
Date: Fri Feb 24 14:01:23 2012 -0700
CDM: progress to date on getting git or svn version, still testing
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 ++--
build-cap4.sh | 24 +++++++++++++++++++++---
2 files changed, 23 insertions(+), 5 deletions(-)
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-24 20:29:37
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via b3eff3fcbaf1757190267f6627cc7fd47a21ab14 (commit)
via 6fe6f214476637a89101cc65dcd2b30ab244b79e (commit)
from b0969b906a2e3d11f71b4b877e24b8018a00af66 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b3eff3fcbaf1757190267f6627cc7fd47a21ab14
Author: CDM <cas...@us...>
Date: Fri Feb 24 13:28:52 2012 -0700
CDM: add Makefile to make tgz/rpm/deb, needs testing
commit 6fe6f214476637a89101cc65dcd2b30ab244b79e
Author: CDM <cas...@us...>
Date: Fri Feb 24 11:12:29 2012 -0700
CDM: add build files for tgz/rpm/deb work from cap4.0/onesis work, not to add Makefile to make it work right
-----------------------------------------------------------------------
Summary of changes:
Makefile | 13 +++++
build-cap4.sh | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
cap.spec | 20 ++++-----
3 files changed, 159 insertions(+), 11 deletions(-)
create mode 100644 Makefile
create mode 100755 build-cap4.sh
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-24 17:38:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via b0969b906a2e3d11f71b4b877e24b8018a00af66 (commit)
from f848deda99a8c177093c36ba591f0ae05618bd50 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b0969b906a2e3d11f71b4b877e24b8018a00af66
Author: CDM <cas...@us...>
Date: Fri Feb 24 10:37:47 2012 -0700
CDM: make a docs dir for stuff, and cleanup svn call to checkout
-----------------------------------------------------------------------
Summary of changes:
COPYRIGHT => docs/COPYRIGHT | 0
GPL_V2 => docs/GPL_V2 | 0
docs/cap-program-template | 74 +++++++++++++++++++++++++++++++++++++++++++
toolbox/make.def | 4 +-
toolbox/onesis/Makefile | 9 ++---
5 files changed, 80 insertions(+), 7 deletions(-)
rename COPYRIGHT => docs/COPYRIGHT (100%)
rename GPL_V2 => docs/GPL_V2 (100%)
create mode 100644 docs/cap-program-template
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-24 17:01:44
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via f848deda99a8c177093c36ba591f0ae05618bd50 (commit)
from 901b5e37dadfde6578a5ae7fb79081c18bce9e39 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f848deda99a8c177093c36ba591f0ae05618bd50
Author: CDM <cas...@us...>
Date: Fri Feb 24 10:00:54 2012 -0700
CDM: add method to checkout via svn and add onesis, need to work out svnrpm build call
-----------------------------------------------------------------------
Summary of changes:
toolbox/make.def | 7 ++++++-
toolbox/onesis/Makefile | 28 ++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletions(-)
create mode 100644 toolbox/onesis/Makefile
hooks/post-receive
--
cap4
|
|
From: Christopher D. M. <cas...@us...> - 2012-02-24 00:30:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".
The branch, master has been updated
via 901b5e37dadfde6578a5ae7fb79081c18bce9e39 (commit)
from 925a72e5c18ee3329b01cffd9f70938f2e2cd75c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 901b5e37dadfde6578a5ae7fb79081c18bce9e39
Author: CDM <cas...@us...>
Date: Thu Feb 23 17:29:33 2012 -0700
CDM: test email again
-----------------------------------------------------------------------
Summary of changes:
cap.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
cap4
|
|
From: <cd...@us...> - 2012-02-23 20:25:51
|
Revision: 1409
http://cap4.svn.sourceforge.net/cap4/?rev=1409&view=rev
Author: cdm4hp
Date: 2012-02-23 20:25:44 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
CDM: last svn commit and make rpm use local dir trees to store rpm to sanity check completion
Modified Paths:
--------------
trunk/toolbox/Makefile
trunk/toolbox/make.def
trunk/toolbox/make.workbench
Modified: trunk/toolbox/Makefile
===================================================================
--- trunk/toolbox/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
+++ trunk/toolbox/Makefile 2012-02-23 20:25:44 UTC (rev 1409)
@@ -10,6 +10,9 @@
@for TOOLS in $(TOOLDIRS); do \
[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS download; \
done;
+ @for TOOLS in $(OTHERS); do \
+ [ -d $$TOOLS ] && $(MAKE) -C $$TOOLS download; \
+ done;
rpm:
$(call print-header,"cap4 toolbox rpmbuild")
@@ -17,8 +20,17 @@
[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS rpm; \
done;
+otherrpm:
+ $(call print-header,"cap4 toolbox rpmbuild")
+ @for TOOLS in $(OTHERS); do \
+ [ -d $$TOOLS ] && $(MAKE) -C $$TOOLS rpm; \
+ done;
+
clean distclean:
$(call print-header,"cap4 toolbox clean")
@for TOOLS in $(TOOLDIRS); do \
[ -d $$TOOLS ] && $(MAKE) -C $$TOOLS clean; \
done;
+ @for TOOLS in $(OTHERS); do \
+ [ -d $$TOOLS ] && $(MAKE) -C $$TOOLS clean; \
+ done;
Modified: trunk/toolbox/make.def
===================================================================
--- trunk/toolbox/make.def 2012-02-23 17:33:57 UTC (rev 1408)
+++ trunk/toolbox/make.def 2012-02-23 20:25:44 UTC (rev 1409)
@@ -49,11 +49,12 @@
@if [ -f $1 ]; then \
file $1 | grep -q RPM; \
if [ $$? -eq 0 ]; then \
- rpmbuild --rebuild $1 > .rpmbuild 2>&1; \
+ rpmbuild --define "%_topdir $(CURDIR)" --rebuild $1 > .rpmbuild 2>&1; \
else \
- rpmbuild -tb $1 > .rpmbuild 2>&1; \
+ rpmbuild --define "%_topdir $(CURDIR)" -tb $1 > .rpmbuild 2>&1; \
fi; \
else \
echo "$1 not found, download manually or set http_proxy env variable?"; exit 1; \
fi;
endef
+
Modified: trunk/toolbox/make.workbench
===================================================================
--- trunk/toolbox/make.workbench 2012-02-23 17:33:57 UTC (rev 1408)
+++ trunk/toolbox/make.workbench 2012-02-23 20:25:44 UTC (rev 1409)
@@ -13,5 +13,5 @@
@touch $@
clean distclean:
- rm -fr $(TAR) .rpmbuild-$(SRC) .rpmbuild
+ rm -fr $(TAR) .rpmbuild-$(SRC) .rpmbuild BUILD BUILDROOT RPMS SOURCES SPECS SRPMS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cd...@us...> - 2012-02-23 17:34:08
|
Revision: 1408
http://cap4.svn.sourceforge.net/cap4/?rev=1408&view=rev
Author: cdm4hp
Date: 2012-02-23 17:33:57 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
CDM: add more tools to test out and what we have used in the past
Modified Paths:
--------------
trunk/toolbox/Makefile
trunk/toolbox/make.workbench
Added Paths:
-----------
trunk/toolbox/diskscrub/
trunk/toolbox/diskscrub/Makefile
trunk/toolbox/io-watchdog/
trunk/toolbox/io-watchdog/Makefile
trunk/toolbox/munge/
trunk/toolbox/munge/Makefile
trunk/toolbox/nfsroot/
trunk/toolbox/nfsroot/Makefile
trunk/toolbox/padb/
trunk/toolbox/padb/Makefile
trunk/toolbox/slurm/
trunk/toolbox/slurm/Makefile
trunk/toolbox/slurm-spank-plugins/
trunk/toolbox/slurm-spank-plugins/Makefile
trunk/toolbox/sqlog/
trunk/toolbox/sqlog/Makefile
trunk/toolbox/torque/
trunk/toolbox/torque/Makefile
Modified: trunk/toolbox/Makefile
===================================================================
--- trunk/toolbox/Makefile 2012-02-23 00:23:46 UTC (rev 1407)
+++ trunk/toolbox/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -1,8 +1,10 @@
include ./make.def
-TOOLDIRS = conman freeipmi genders nodediag pdsh powerman \
+TOOLDIRS = conman freeipmi genders nodediag pdsh powerman diskscrub \
python-hostlist collectl collectl-utils
+OTHERS = munge nfsroot slurm-spank-plugins io-watchdog padb sqlog diskscrub slurm torque
+
download:
$(call print-header,"cap4 toolbox download")
@for TOOLS in $(TOOLDIRS); do \
Added: trunk/toolbox/diskscrub/Makefile
===================================================================
--- trunk/toolbox/diskscrub/Makefile (rev 0)
+++ trunk/toolbox/diskscrub/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=2.4.1
+SRC=scrub-$(VERSION)
+TAR=$(SRC).tar.gz
+URL="http://diskscrub.googlecode.com/files/$(TAR)"
+
+include ../make.workbench
Added: trunk/toolbox/io-watchdog/Makefile
===================================================================
--- trunk/toolbox/io-watchdog/Makefile (rev 0)
+++ trunk/toolbox/io-watchdog/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=0.8
+SRC=io-watchdog-$(VERSION)
+TAR=$(SRC).tar.bz2
+URL="http://io-watchdog.googlecode.com/files/$(TAR)"
+
+include ../make.workbench
Modified: trunk/toolbox/make.workbench
===================================================================
--- trunk/toolbox/make.workbench 2012-02-23 00:23:46 UTC (rev 1407)
+++ trunk/toolbox/make.workbench 2012-02-23 17:33:57 UTC (rev 1408)
@@ -13,5 +13,5 @@
@touch $@
clean distclean:
- rm -fr $(TAR) .rpmbuild-$(SRC)
+ rm -fr $(TAR) .rpmbuild-$(SRC) .rpmbuild
Added: trunk/toolbox/munge/Makefile
===================================================================
--- trunk/toolbox/munge/Makefile (rev 0)
+++ trunk/toolbox/munge/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=0.5.10
+SRC=munge-$(VERSION)
+TAR=$(SRC).tar.bz2
+URL="http://munge.googlecode.com/files/$(TAR)"
+
+include ../make.workbench
Added: trunk/toolbox/nfsroot/Makefile
===================================================================
--- trunk/toolbox/nfsroot/Makefile (rev 0)
+++ trunk/toolbox/nfsroot/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=3.14
+SRC=nfsroot-$(VERSION)
+TAR=$(SRC).tar.bz2
+URL="http://nfsroot.googlecode.com/files/$(TAR)"
+
+include ../make.workbench
Added: trunk/toolbox/padb/Makefile
===================================================================
--- trunk/toolbox/padb/Makefile (rev 0)
+++ trunk/toolbox/padb/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=3.3
+SRC=padb-$(VERSION)
+TAR=$(SRC).tar.gz
+URL="http://padb.googlecode.com/files/$(TAR)"
+
+include ../make.workbench
Added: trunk/toolbox/slurm/Makefile
===================================================================
--- trunk/toolbox/slurm/Makefile (rev 0)
+++ trunk/toolbox/slurm/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=2.3.3
+SRC=slurm-$(VERSION)
+TAR=$(SRC).tar.bz2
+URL="http://schedmd.com/download/latest/$(TAR)"
+
+include ../make.workbench
Added: trunk/toolbox/slurm-spank-plugins/Makefile
===================================================================
--- trunk/toolbox/slurm-spank-plugins/Makefile (rev 0)
+++ trunk/toolbox/slurm-spank-plugins/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=0.13
+SRC=slurm-spank-plugins-$(VERSION)
+TAR=$(SRC).tar.bz2
+URL="http://slurm-spank-plugins.googlecode.com/files/$(TAR)"
+
+include ../make.workbench
Added: trunk/toolbox/sqlog/Makefile
===================================================================
--- trunk/toolbox/sqlog/Makefile (rev 0)
+++ trunk/toolbox/sqlog/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=0.19
+SRC=sqlog-$(VERSION)
+TAR=$(SRC).tar.bz2
+URL="http://sqlog.googlecode.com/files/$(TAR)"
+
+include ../make.workbench
Added: trunk/toolbox/torque/Makefile
===================================================================
--- trunk/toolbox/torque/Makefile (rev 0)
+++ trunk/toolbox/torque/Makefile 2012-02-23 17:33:57 UTC (rev 1408)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=4.0.0
+SRC=torque-$(VERSION)
+TAR=$(SRC).tar.gz
+URL="http://www.adaptivecomputing.com/resources/downloads/torque/$(TAR)"
+
+include ../make.workbench
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cd...@us...> - 2012-02-23 00:23:52
|
Revision: 1407
http://cap4.svn.sourceforge.net/cap4/?rev=1407&view=rev
Author: cdm4hp
Date: 2012-02-23 00:23:46 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
CDM: add collectl-utils to top level Makefile
Modified Paths:
--------------
trunk/toolbox/Makefile
Modified: trunk/toolbox/Makefile
===================================================================
--- trunk/toolbox/Makefile 2012-02-23 00:22:57 UTC (rev 1406)
+++ trunk/toolbox/Makefile 2012-02-23 00:23:46 UTC (rev 1407)
@@ -1,7 +1,7 @@
include ./make.def
TOOLDIRS = conman freeipmi genders nodediag pdsh powerman \
- python-hostlist collectl
+ python-hostlist collectl collectl-utils
download:
$(call print-header,"cap4 toolbox download")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cd...@us...> - 2012-02-23 00:23:03
|
Revision: 1406
http://cap4.svn.sourceforge.net/cap4/?rev=1406&view=rev
Author: cdm4hp
Date: 2012-02-23 00:22:57 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
CDM: add collectl-utils
Added Paths:
-----------
trunk/toolbox/collectl-utils/
trunk/toolbox/collectl-utils/Makefile
Added: trunk/toolbox/collectl-utils/Makefile
===================================================================
--- trunk/toolbox/collectl-utils/Makefile (rev 0)
+++ trunk/toolbox/collectl-utils/Makefile 2012-02-23 00:22:57 UTC (rev 1406)
@@ -0,0 +1,10 @@
+include ../make.def
+
+VERSION=3.2.0
+SRC=collectl-utils-$(VERSION)
+#TAR=$(SRC).src.tar.gz
+SRPM=$(SRC)-1.src.rpm
+TAR=$(SRPM)
+URL="http://sourceforge.net/projects/collectl-utils/files/$(SRC)/$(SRPM)"
+
+include ../make.workbench
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cd...@us...> - 2012-02-23 00:16:39
|
Revision: 1405
http://cap4.svn.sourceforge.net/cap4/?rev=1405&view=rev
Author: cdm4hp
Date: 2012-02-23 00:16:33 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
CDM: add collectl and make things work for a src.rpm or tgz to build with rpm call
Modified Paths:
--------------
trunk/toolbox/Makefile
trunk/toolbox/collectl/Makefile
trunk/toolbox/make.def
trunk/toolbox/make.workbench
Modified: trunk/toolbox/Makefile
===================================================================
--- trunk/toolbox/Makefile 2012-02-23 00:02:56 UTC (rev 1404)
+++ trunk/toolbox/Makefile 2012-02-23 00:16:33 UTC (rev 1405)
@@ -1,7 +1,7 @@
include ./make.def
TOOLDIRS = conman freeipmi genders nodediag pdsh powerman \
- python-hostlist
+ python-hostlist collectl
download:
$(call print-header,"cap4 toolbox download")
Modified: trunk/toolbox/collectl/Makefile
===================================================================
--- trunk/toolbox/collectl/Makefile 2012-02-23 00:02:56 UTC (rev 1404)
+++ trunk/toolbox/collectl/Makefile 2012-02-23 00:16:33 UTC (rev 1405)
@@ -2,7 +2,9 @@
VERSION=3.6.1
SRC=collectl-$(VERSION)
-TAR=$(SRC).src.tar.gz
-URL="http://sourceforge.net/projects/collectl/files/collectl/$(SRC)/$(TAR)"
+#TAR=$(SRC).src.tar.gz
+SRPM=$(SRC)-4.src.rpm
+TAR=$(SRPM)
+URL="http://sourceforge.net/projects/collectl/files/collectl/$(SRC)/$(SRPM)"
include ../make.workbench
Modified: trunk/toolbox/make.def
===================================================================
--- trunk/toolbox/make.def 2012-02-23 00:02:56 UTC (rev 1404)
+++ trunk/toolbox/make.def 2012-02-23 00:16:33 UTC (rev 1405)
@@ -44,3 +44,16 @@
echo "=========================================================";
endef
+define rpmbuild-src
+ @echo "Building: $1"
+ @if [ -f $1 ]; then \
+ file $1 | grep -q RPM; \
+ if [ $$? -eq 0 ]; then \
+ rpmbuild --rebuild $1 > .rpmbuild 2>&1; \
+ else \
+ rpmbuild -tb $1 > .rpmbuild 2>&1; \
+ fi; \
+ else \
+ echo "$1 not found, download manually or set http_proxy env variable?"; exit 1; \
+ fi;
+endef
Modified: trunk/toolbox/make.workbench
===================================================================
--- trunk/toolbox/make.workbench 2012-02-23 00:02:56 UTC (rev 1404)
+++ trunk/toolbox/make.workbench 2012-02-23 00:16:33 UTC (rev 1405)
@@ -8,9 +8,10 @@
rpm: .rpmbuild-$(SRC)
.rpmbuild-$(SRC): $(TAR)
- rpmbuild -tb $(TAR) > .rpmbuild-$(SRC) 2>&1
+ $(call rpmbuild-src,$(TAR))
+ @[ -f .rpmbuild ] && mv .rpmbuild .rpmbuild-$(SRC)
@touch $@
clean distclean:
- rm -fr $(TAR) .rpmbuild-$(SRC)
+ rm -fr $(TAR) .rpmbuild-$(SRC)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cd...@us...> - 2012-02-23 00:03:02
|
Revision: 1404
http://cap4.svn.sourceforge.net/cap4/?rev=1404&view=rev
Author: cdm4hp
Date: 2012-02-23 00:02:56 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
CDM: add collectl source, need to test if rpmbuild works in it
Added Paths:
-----------
trunk/toolbox/collectl/
trunk/toolbox/collectl/Makefile
Added: trunk/toolbox/collectl/Makefile
===================================================================
--- trunk/toolbox/collectl/Makefile (rev 0)
+++ trunk/toolbox/collectl/Makefile 2012-02-23 00:02:56 UTC (rev 1404)
@@ -0,0 +1,8 @@
+include ../make.def
+
+VERSION=3.6.1
+SRC=collectl-$(VERSION)
+TAR=$(SRC).src.tar.gz
+URL="http://sourceforge.net/projects/collectl/files/collectl/$(SRC)/$(TAR)"
+
+include ../make.workbench
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
