[csw-devel] SF.net SVN: gar:[7008] csw/mgar/pkg/orca/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Oct 29 12:18:24 CET 2009
Revision: 7008
http://gar.svn.sourceforge.net/gar/?rev=7008&view=rev
Author: dmichelsen
Date: 2009-10-29 11:18:23 +0000 (Thu, 29 Oct 2009)
Log Message:
-----------
orca: Move to cswutils gar integration
Modified Paths:
--------------
csw/mgar/pkg/orca/trunk/Makefile
csw/mgar/pkg/orca/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/orca/trunk/files/csworcallator
Removed Paths:
-------------
csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall
csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove
csw/mgar/pkg/orca/trunk/files/csworcallator.init
Modified: csw/mgar/pkg/orca/trunk/Makefile
===================================================================
--- csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 10:48:38 UTC (rev 7007)
+++ csw/mgar/pkg/orca/trunk/Makefile 2009-10-29 11:18:23 UTC (rev 7008)
@@ -28,8 +28,7 @@
MASTER_SITES = http://www.orcaware.com/orca/pub/snapshots/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += CSWorca-web.postinstall CSWorca-web.preremove
-DISTFILES += csworcallator.init csworcallator.xml svc-csworcallator
+DISTFILES += csworcallator csworcallator.xml svc-csworcallator
DISTFILES += csworca_services
PACKAGES = CSWorca CSWorca-web
@@ -37,6 +36,9 @@
CATALOGNAME_CSWorca = orca
CATALOGNAME_CSWorca-web = orca_web
+SPKG_DESC_CSWorca = Performance Data Collector
+SPKG_DESC_CSWorcs-web = Performance Data Viewer
+
PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch
SPKG_SOURCEURL = http://www.orcaware.com/orca
@@ -50,7 +52,7 @@
REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2
REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2
-#libdir = $(exec_prefix)/lib/$(GARNAME)
+sysconfdir = /etc/opt/csw
localstatedir = /var/opt/csw
COMMON_EXPORTS += perlcswlib
@@ -59,8 +61,19 @@
--with-html-dir=$(sharedstatedir)/www/orca \
--disable-librrdtool
-SPKG_CLASSES = none cswinitsmf
+# Exclude se-libraries for old SE Toolkit versions. We depend on 3.5.0 which
+# includes all needed se-libraries.
+EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/lib/SE/.*
+PRESERVECONF = /etc/opt/csw/orcallator.cfg
+PRESERVECONF += /etc/opt/csw/winallator.cfg
+PRESERVECONF += /etc/opt/csw/procallator.cfg
+PRESERVECONF += /etc/opt/csw/orca_services.cfg
+
+INITSMF = /etc/opt/csw/init.d/csworcallator
+
+ARCHALL = 1
+
PKGFILES_CSWorca-web = $(prefix)/apache2/.*
PKGFILES_CSWorca-web += $(sharedstatedir)/www/orca/.*
PKGFILES_CSWorca-web += $(bindir)/orca
@@ -73,8 +86,9 @@
post-install-modulated:
@ginstall -d $(DESTDIR)$(sysconfdir)/init.d
- @ginstall $(WORKDIR)/csworcallator.init $(DESTDIR)$(sysconfdir)/init.d/csworcallator
- @ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services
+ @# TBD: Use custom manifest for Solaris 10 SMF support
+ @#ginstall $(WORKDIR)/csworcallator $(DESTDIR)$(sysconfdir)/init.d/csworcallator
+ @#ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services
@$(MAKE_COOKIE)
post-merge:
Modified: csw/mgar/pkg/orca/trunk/checksums
===================================================================
--- csw/mgar/pkg/orca/trunk/checksums 2009-10-29 10:48:38 UTC (rev 7007)
+++ csw/mgar/pkg/orca/trunk/checksums 2009-10-29 11:18:23 UTC (rev 7008)
@@ -1,8 +1,6 @@
-ba8e48e429008f53037e85fef2fcfe36 download/orca-snapshot-r535.tar.bz2
-401650ab4f3fcb9c04af2c48493e1070 download/CSWorca-web.postinstall
-03a866c2a3c4b915e110408a9ede07cf download/CSWorca-web.preremove
-72c1eaa8d3f1ab48363e7ed5792e2855 download/csworcallator.init
-a99644ffcc9164d9d0f4df2b44c61917 download/csworcallator.xml
-23a2b76456b96c5fcff4a1d92c02e140 download/svc-csworcallator
-4c74f4f1449fabd0838d0cd71678144c download/csworca_services
-ce08f37aa52f7b27bc82cc9c976d56b4 download/orca-snapshot-r535-se-3.5.0.patch
+4c74f4f1449fabd0838d0cd71678144c csworca_services
+72c1eaa8d3f1ab48363e7ed5792e2855 csworcallator
+a99644ffcc9164d9d0f4df2b44c61917 csworcallator.xml
+ce08f37aa52f7b27bc82cc9c976d56b4 orca-snapshot-r535-se-3.5.0.patch
+ba8e48e429008f53037e85fef2fcfe36 orca-snapshot-r535.tar.bz2
+23a2b76456b96c5fcff4a1d92c02e140 svc-csworcallator
Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall
===================================================================
--- csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall 2009-10-29 10:48:38 UTC (rev 7007)
+++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.postinstall 2009-10-29 11:18:23 UTC (rev 7008)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-ORCA_ETCDIR=${CSW_PREFIX}/etc
-
-# Copy templates
-template_list="\
- orcallator.cfg \
- winallator.cfg \
- procallator.cfg \
- orca_services.cfg"
-
-echo Copying CSW templates:
-for file in $template_list
-do
- filepath=${ORCA_ETCDIR}/$file
- if [ ! -f "$filepath" ] && [ -f "$filepath.CSW" ]; then
- echo " creating $filepath"
- cp $filepath.CSW $filepath
- else
- echo " preserving $filepath"
- fi
-done
-
-exit 0
Deleted: csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove
===================================================================
--- csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove 2009-10-29 10:48:38 UTC (rev 7007)
+++ csw/mgar/pkg/orca/trunk/files/CSWorca-web.preremove 2009-10-29 11:18:23 UTC (rev 7008)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-ORCA_ETCDIR=${CSW_PREFIX}/etc
-
-# Copy templates
-template_list="\
- orcallator.cfg \
- winallator.cfg \
- procallator.cfg \
- orca_services.cfg"
-
-echo Removing unmodified CSW templates:
-for file in $template_list
-do
- filepath=${ORCA_ETCDIR}/$file
- if [ -f "${filepath}" ] && [ -f "${filepath}.CSW" ] && cmp -s "${filepath}" "${filepath}.CSW"; then
- echo " removing $filepath"
- rm -f "${filepath}"
- else
- echo " preserving $filepath"
- fi
-done
-
-exit 0
Copied: csw/mgar/pkg/orca/trunk/files/csworcallator (from rev 6981, csw/mgar/pkg/orca/trunk/files/csworcallator.init)
===================================================================
--- csw/mgar/pkg/orca/trunk/files/csworcallator (rev 0)
+++ csw/mgar/pkg/orca/trunk/files/csworcallator 2009-10-29 11:18:23 UTC (rev 7008)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# $HeadURL: file:///var/www/svn/repositories-public/orcaware-public/orca/trunk/data_gatherers/orcallator/S99orcallator.sh.in $
+# $LastChangedRevision: 495 $
+# $LastChangedDate: 2005-09-15 21:11:11 -0700 (Thu, 15 Sep 2005) $
+# $LastChangedBy: blair at orcaware.com $
+
+prefix=/opt/csw
+exec_prefix=/opt/csw
+bindir=/opt/csw/bin
+
+start_orcallator="$bindir/start_orcallator"
+stop_orcallator="$bindir/stop_orcallator"
+
+case "$1" in
+ start)
+ if test -x $start_orcallator; then
+ umask 022
+ $start_orcallator
+ else
+ echo "$0: $start_orcallator does not exist or is not executable."
+ fi
+ ;;
+
+ stop)
+ if test -x $stop_orcallator; then
+ $stop_orcallator
+ else
+ echo "$0: $stop_orcallator does not exist or is not executable."
+ fi
+ ;;
+
+ *)
+ echo "usage: $0 {start|stop}"
+ exit 1
+ ;;
+esac
+
+exit 0
Deleted: csw/mgar/pkg/orca/trunk/files/csworcallator.init
===================================================================
--- csw/mgar/pkg/orca/trunk/files/csworcallator.init 2009-10-29 10:48:38 UTC (rev 7007)
+++ csw/mgar/pkg/orca/trunk/files/csworcallator.init 2009-10-29 11:18:23 UTC (rev 7008)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# $HeadURL: file:///var/www/svn/repositories-public/orcaware-public/orca/trunk/data_gatherers/orcallator/S99orcallator.sh.in $
-# $LastChangedRevision: 495 $
-# $LastChangedDate: 2005-09-15 21:11:11 -0700 (Thu, 15 Sep 2005) $
-# $LastChangedBy: blair at orcaware.com $
-
-prefix=/opt/csw
-exec_prefix=/opt/csw
-bindir=/opt/csw/bin
-
-start_orcallator="$bindir/start_orcallator"
-stop_orcallator="$bindir/stop_orcallator"
-
-case "$1" in
- start)
- if test -x $start_orcallator; then
- umask 022
- $start_orcallator
- else
- echo "$0: $start_orcallator does not exist or is not executable."
- fi
- ;;
-
- stop)
- if test -x $stop_orcallator; then
- $stop_orcallator
- else
- echo "$0: $stop_orcallator does not exist or is not executable."
- fi
- ;;
-
- *)
- echo "usage: $0 {start|stop}"
- exit 1
- ;;
-esac
-
-exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list