[cap4-devel] [SCM] cap4 branch master updated. eddfe9ecad31824363a615ad2182d2a32893ab6b

[Christopher D. M. <cas...@us...>]

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