changeset 471:96da3a025725

pcp: keep the init script for the smf manifest
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Sun, 05 Feb 2012 13:51:16 -0500
parents 16123d0bdd9f
children 9b3ec2748616
files components/pcp/Makefile components/pcp/patches/104-fix-private-bins-paths.patch components/pcp/pcp.p5m
diffstat 3 files changed, 76 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/components/pcp/Makefile	Thu Feb 02 23:21:58 2012 -0500
+++ b/components/pcp/Makefile	Sun Feb 05 13:51:16 2012 -0500
@@ -26,7 +26,7 @@
 include ../../make-rules/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION=($(CLONEY) $(SOURCE_DIR) $(@D); cd $(@D) ; autoconf)
-COMPONENT_POST_INSTALL_ACTION=(mv $(PROTO_DIR)/usr/man $(PROTO_DIR)/usr/share/man)
+#COMPONENT_POST_INSTALL_ACTION=(mv $(PROTO_DIR)/usr/man $(PROTO_DIR)/usr/share/man)
 CONFIGURE_SCRIPT=./configure
 
 CONFIGURE_OPTIONS.32 += --with-64bit=no
@@ -36,8 +36,6 @@
 
 COMPONENT_INSTALL_ENV += DIST_ROOT=$(PROTO_DIR)
 
-COMPONENT_POST_INSTALL_ACTION=$(RM) -rf $(PROTO_DIR)/etc/init.d
-
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/pcp/patches/104-fix-private-bins-paths.patch	Sun Feb 05 13:51:16 2012 -0500
@@ -0,0 +1,29 @@
+--- a/configure.in	2012-02-05 12:26:26.019808712 -0500
++++ a/configure.in	2012-02-05 12:27:56.307149774 -0500
+@@ -1407,25 +1407,7 @@
+ AC_SUBST(pcp_share_dir)
+ 
+ dnl private PCP executables
+-pcp_binadm_dir=`eval echo $libexecdir`
+-pcp_binadm_dir=`eval echo $pcp_binadm_dir`
+-if test -z "`echo $pcp_binadm_dir | sed 's;/.*\$;;'`"
+-then
+-    if test $target_distro = debian
+-    then
+-        pcp_binadm_dir=/usr/lib/pcp/bin
+-    elif test $target_os = mingw
+-    then
+-        pcp_binadm_dir=/local/bin
+-    elif test -d /usr/libexec
+-    then
+-        pcp_binadm_dir=/usr/libexec/pcp/bin
+-    else
+-        pcp_binadm_dir=$pcp_share_dir/bin
+-    fi
+-else
+-   pcp_binadm_dir=`eval echo $pcp_binadm_dir/pcp/bin`
+-fi
++pcp_binadm_dir=/usr/lib/pcp/bin
+ AC_SUBST(pcp_binadm_dir)
+ 
+ dnl non-shared (i.e. system local) PCP files
--- a/components/pcp/pcp.p5m	Thu Feb 02 23:21:58 2012 -0500
+++ b/components/pcp/pcp.p5m	Sun Feb 05 13:51:16 2012 -0500
@@ -15,6 +15,8 @@
 <transform file path=usr/share/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/perl5/5.10.0/man/.+ -> default mangler.man.stability uncommited>
 <transform file path=usr/lib/.+\.a -> drop>
+#<transform file path=etc/init.d/.+ -> drop>
+#<transform dir path=etc/init.d -> drop>
 set name=pkg.fmri value=pkg:/service/pcp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Performance Co-Pilot - system level performance monitoring and performance management"
 set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
@@ -27,6 +29,10 @@
 dir  path=etc
 dir  path=etc/bash_completion.d
 file path=etc/bash_completion.d/pcp
+dir  path=etc/init.d group=sys
+file path=etc/init.d/pcp mode=0555
+file path=etc/init.d/pmie mode=0555
+file path=etc/init.d/pmproxy mode=0555
 file path=etc/pcp.conf
 file path=etc/pcp.env
 dir  path=etc/pmcd
@@ -111,6 +117,42 @@
 file path=usr/lib/libpcp_trace.a
 link path=usr/lib/libpcp_trace.so target=libpcp_trace.so.2
 file path=usr/lib/libpcp_trace.so.2
+dir  path=usr/lib/pcp
+dir  path=usr/lib/pcp/bin
+file path=usr/lib/pcp/bin/autofsd-probe
+file path=usr/lib/pcp/bin/chkhelp
+file path=usr/lib/pcp/bin/install-sh
+file path=usr/lib/pcp/bin/mkaf
+file path=usr/lib/pcp/bin/newhelp
+file path=usr/lib/pcp/bin/pmcd
+file path=usr/lib/pcp/bin/pmcd_wait
+file path=usr/lib/pcp/bin/pmcpp
+file path=usr/lib/pcp/bin/pmhostname
+file path=usr/lib/pcp/bin/pmie_check
+file path=usr/lib/pcp/bin/pmie_daily
+file path=usr/lib/pcp/bin/pmie_email
+file path=usr/lib/pcp/bin/pmiestatus
+file path=usr/lib/pcp/bin/pmlock
+file path=usr/lib/pcp/bin/pmlogconf
+file path=usr/lib/pcp/bin/pmlogconf-setup
+file path=usr/lib/pcp/bin/pmlogextract
+file path=usr/lib/pcp/bin/pmlogger
+file path=usr/lib/pcp/bin/pmlogger_check
+file path=usr/lib/pcp/bin/pmlogger_daily
+file path=usr/lib/pcp/bin/pmlogger_merge
+file path=usr/lib/pcp/bin/pmlogreduce
+file path=usr/lib/pcp/bin/pmlogrewrite
+file path=usr/lib/pcp/bin/pmnewlog
+file path=usr/lib/pcp/bin/pmnsadd
+file path=usr/lib/pcp/bin/pmnscomp
+file path=usr/lib/pcp/bin/pmnsdel
+file path=usr/lib/pcp/bin/pmnsmerge
+file path=usr/lib/pcp/bin/pmpost
+file path=usr/lib/pcp/bin/pmproxy
+file path=usr/lib/pcp/bin/pmsignal
+file path=usr/lib/pcp/bin/pmsleep
+file path=usr/lib/pcp/bin/pmwtf
+file path=usr/lib/pcp/bin/telnet-probe
 dir  path=usr/perl5
 dir  path=usr/perl5/5.10.0
 dir  path=usr/perl5/5.10.0/lib
@@ -479,41 +521,6 @@
 file path=usr/share/man/man4/pmieconf.4
 file path=usr/share/man/man4/pmns.4
 dir  path=usr/share/pcp
-dir  path=usr/share/pcp/bin
-file path=usr/share/pcp/bin/autofsd-probe
-file path=usr/share/pcp/bin/chkhelp
-file path=usr/share/pcp/bin/install-sh
-file path=usr/share/pcp/bin/mkaf
-file path=usr/share/pcp/bin/newhelp
-file path=usr/share/pcp/bin/pmcd
-file path=usr/share/pcp/bin/pmcd_wait
-file path=usr/share/pcp/bin/pmcpp
-file path=usr/share/pcp/bin/pmhostname
-file path=usr/share/pcp/bin/pmie_check
-file path=usr/share/pcp/bin/pmie_daily
-file path=usr/share/pcp/bin/pmie_email
-file path=usr/share/pcp/bin/pmiestatus
-file path=usr/share/pcp/bin/pmlock
-file path=usr/share/pcp/bin/pmlogconf
-file path=usr/share/pcp/bin/pmlogconf-setup
-file path=usr/share/pcp/bin/pmlogextract
-file path=usr/share/pcp/bin/pmlogger
-file path=usr/share/pcp/bin/pmlogger_check
-file path=usr/share/pcp/bin/pmlogger_daily
-file path=usr/share/pcp/bin/pmlogger_merge
-file path=usr/share/pcp/bin/pmlogreduce
-file path=usr/share/pcp/bin/pmlogrewrite
-file path=usr/share/pcp/bin/pmnewlog
-file path=usr/share/pcp/bin/pmnsadd
-file path=usr/share/pcp/bin/pmnscomp
-file path=usr/share/pcp/bin/pmnsdel
-file path=usr/share/pcp/bin/pmnsmerge
-file path=usr/share/pcp/bin/pmpost
-file path=usr/share/pcp/bin/pmproxy
-file path=usr/share/pcp/bin/pmsignal
-file path=usr/share/pcp/bin/pmsleep
-file path=usr/share/pcp/bin/pmwtf
-file path=usr/share/pcp/bin/telnet-probe
 dir  path=usr/share/pcp/demos
 dir  path=usr/share/pcp/demos/pmclient
 file path=usr/share/pcp/demos/pmclient/Makefile
@@ -551,11 +558,11 @@
 file path=usr/share/pcp/examples/pmie/WEBREPORT
 dir  path=usr/share/pcp/lib
 file path=usr/share/pcp/lib/ReplacePmnsSubtree
-file path=usr/share/pcp/lib/lockpmns
+file path=usr/share/pcp/lib/lockpmns mode=0555
 file path=usr/share/pcp/lib/pmdaproc.sh
 file path=usr/share/pcp/lib/rc-proc.sh
 file path=usr/share/pcp/lib/rc-proc.sh.minimal
-file path=usr/share/pcp/lib/unlockpmns
+file path=usr/share/pcp/lib/unlockpmns mode=0555
 dir  path=var
 dir  path=var/lib
 dir  path=var/lib/pcp
@@ -947,9 +954,9 @@
 file path=var/lib/pcp/pmdas/zimbra/zimbraprobe
 dir  path=var/lib/pcp/pmns
 file path=var/lib/pcp/pmns/.NeedRebuild
-file path=var/lib/pcp/pmns/Make.stdpmid
+file path=var/lib/pcp/pmns/Make.stdpmid mode=0555
 file path=var/lib/pcp/pmns/Makefile
-file path=var/lib/pcp/pmns/Rebuild
+file path=var/lib/pcp/pmns/Rebuild mode=0555
 file path=var/lib/pcp/pmns/root_mmv
 file path=var/lib/pcp/pmns/root_pmcd
 file path=var/lib/pcp/pmns/root_solaris