[csw-devel] SF.net SVN: gar:[14219] csw/mgar/pkg/bacula/trunk

[bdwalton at users.sourceforge.net]

Revision: 14219
          http://gar.svn.sourceforge.net/gar/?rev=14219&view=rev
Author:   bdwalton
Date:     2011-04-15 18:57:22 +0000 (Fri, 15 Apr 2011)

Log Message:
-----------
bacula/trunk: fix the solaris init script installation routine even though we will handle it manually instead

Modified Paths:
--------------
    csw/mgar/pkg/bacula/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/bacula/trunk/files/0002-Clean-up-solaris-install-autostart-targets.patch

Modified: csw/mgar/pkg/bacula/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bacula/trunk/Makefile	2011-04-15 17:24:38 UTC (rev 14218)
+++ csw/mgar/pkg/bacula/trunk/Makefile	2011-04-15 18:57:22 UTC (rev 14219)
@@ -147,6 +147,7 @@
 DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += CSWbacula-common.cswreleasenotes
 PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch
+PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch
 
 BUILD_DEP_PKGS  = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel
 BUILD_DEP_PKGS += CSWreadline CSWggettext-dev

Added: csw/mgar/pkg/bacula/trunk/files/0002-Clean-up-solaris-install-autostart-targets.patch
===================================================================
--- csw/mgar/pkg/bacula/trunk/files/0002-Clean-up-solaris-install-autostart-targets.patch	                        (rev 0)
+++ csw/mgar/pkg/bacula/trunk/files/0002-Clean-up-solaris-install-autostart-targets.patch	2011-04-15 18:57:22 UTC (rev 14219)
@@ -0,0 +1,109 @@
+From 99dbe397e04bf9aaa49d26f2e6de8317f4f79796 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Fri, 15 Apr 2011 20:12:01 +0200
+Subject: [PATCH] Clean up solaris install-autostart targets
+
+Use a templated rule to remove redundant targets.
+Take DESTDIR into account.
+Ensure we create /etc/init.d, /etc/rc{0,1,2}.d directories now that we
+       use DESTDIR
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ platforms/solaris/Makefile.in |   67 ++++++++++------------------------------
+ 1 files changed, 17 insertions(+), 50 deletions(-)
+
+diff --git a/platforms/solaris/Makefile.in b/platforms/solaris/Makefile.in
+index df43101..4a8b6f7 100644
+--- a/platforms/solaris/Makefile.in
++++ b/platforms/solaris/Makefile.in
+@@ -12,6 +12,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DIR = $(INSTALL) -d -m 755
+ 
+ nothing:
+ 
+@@ -19,62 +20,28 @@ install: install-autostart
+ 
+ install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
+ 
+-	
+-install-autostart-fd:
+-	@rm -f /etc/rc0.d/K20bacula-fd
+-	@rm -f /etc/rc1.d/S99bacula-fd
+-	@rm -f /etc/rc2.d/S99bacula-fd
+-	@$(INSTALL_PROGRAM) -m 744 bacula-fd /etc/init.d/bacula-fd
++install-autostart-%:
++	@rm -f $(DESTDIR)/etc/rc0.d/K20bacula-$*
++	@rm -f $(DESTDIR)/etc/rc1.d/S99bacula-$*
++	@rm -f $(DESTDIR)/etc/rc2.d/S99bacula-$*
++	@$(INSTALL_DIR) $(DESTDIR)/etc/init.d
++	@$(INSTALL_DIR) $(DESTDIR)/etc/rc0.d $(DESTDIR)/etc/rc1.d \
++		$(DESTDIR)/etc/rc2.d
++	@$(INSTALL_PROGRAM) -m 744 bacula-fd $(DESTDIR)/etc/init.d/bacula-$*
+ 	# set symlinks for script at startup and shutdown
+-	@ln -f -s /etc/init.d/bacula-fd /etc/rc0.d/K20bacula-fd
+-	@ln -f -s /etc/init.d/bacula-fd /etc/rc1.d/S99bacula-fd
+-	@ln -f -s /etc/init.d/bacula-fd /etc/rc2.d/S99bacula-fd
+-
+-
+-install-autostart-sd:
+-	@rm -f /etc/rc0.d/K20bacula-sd
+-	@rm -f /etc/rc1.d/S99bacula-sd
+-	@rm -f /etc/rc2.d/S99bacula-sd
+-	@$(INSTALL_PROGRAM) -m 744 bacula-sd /etc/init.d/bacula-sd
+-	# set symlinks for script at startup and shutdown
+-	@ln -f -s /etc/init.d/bacula-sd /etc/rc0.d/K20bacula-sd
+-	@ln -f -s /etc/init.d/bacula-sd /etc/rc1.d/S99bacula-sd
+-	@ln -f -s /etc/init.d/bacula-sd /etc/rc2.d/S99bacula-sd
+-
+-
+-install-autostart-dir:
+-	@rm -f /etc/rc0.d/K20bacula-dir
+-	@rm -f /etc/rc1.d/S99bacula-dir
+-	@rm -f /etc/rc2.d/S99bacula-dir
+-	@$(INSTALL_PROGRAM) -m 744 bacula-dir /etc/init.d/bacula-dir
+-	# set symlinks for script at startup and shutdown
+-	@ln -f -s /etc/init.d/bacula-dir /etc/rc0.d/K20bacula-dir
+-	@ln -f -s /etc/init.d/bacula-dir /etc/rc1.d/S99bacula-dir
+-	@ln -f -s /etc/init.d/bacula-dir /etc/rc2.d/S99bacula-dir
+-
++	@ln -f -s /etc/init.d/bacula-$* $(DESTDIR)/etc/rc0.d/K20bacula-$*
++	@ln -f -s /etc/init.d/bacula-$* $(DESTDIR)/etc/rc1.d/S99bacula-$*
++	@ln -f -s /etc/init.d/bacula-$* $(DESTDIR)/etc/rc2.d/S99bacula-$*
+ 
+ uninstall: uninstall-autostart
+ 
+ uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir
+ 
+-uninstall-autostart-fd:
+-	@rm -f /etc/rc0.d/K20bacula-fd
+-	@rm -f /etc/rc1.d/S99bacula-fd
+-	@rm -f /etc/rc2.d/S99bacula-fd
+-	@rm -f /etc/init.d/bacula-fd
+-
+-
+-uninstall-autostart-sd:
+-	@rm -f /etc/rc0.d/K20bacula-sd
+-	@rm -f /etc/rc1.d/S99bacula-sd
+-	@rm -f /etc/rc2.d/S99bacula-sd
+-	@rm -f /etc/init.d/bacula-sd
+-
+-uninstall-autostart-dir:
+-	@rm -f /etc/rc0.d/K20bacula-dir
+-	@rm -f /etc/rc1.d/S99bacula-dir
+-	@rm -f /etc/rc2.d/S99bacula-dir
+-	@rm -f /etc/init.d/bacula-dir
++uninstall-autostart-%:
++	@rm -f /etc/rc0.d/K20bacula-$*
++	@rm -f /etc/rc1.d/S99bacula-$*
++	@rm -f /etc/rc2.d/S99bacula-$*
++	@rm -f /etc/init.d/bacula-$*
+ 
+ clean:
+ 	@rm -f 1 2 3
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.