[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.02-18-g0c7bd53



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 "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0c7bd530bb56848a8818f9b6389bd7fed67b1d73

The branch, STABLE2 has been updated
       via  0c7bd530bb56848a8818f9b6389bd7fed67b1d73 (commit)
       via  ec2b14741da88ffa1d3f627d805ed0f7810da80b (commit)
       via  135b0da42006f442697645f5b58aabc32b3a13ef (commit)
      from  9e213333cfac6dcb1e6c71d55e92cfbecfbe3df6 (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 0c7bd530bb56848a8818f9b6389bd7fed67b1d73
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Fri May 16 07:41:23 2008 +0200

    [BUILD] Add --without_kernel_modules configure option
    
    Allow users to disable build of kernel modules.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto redhat com>

commit ec2b14741da88ffa1d3f627d805ed0f7810da80b
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Tue May 6 16:18:26 2008 +0200

    [BUILD] Allow users to set path to init.d
    
    Almost all distributions use /etc/init.d but some still use
    the legacy path to /etc/rc.d/init.d.
    
    Allow builders to set the path instead of using some manual
    workarounds to do later fixup.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto redhat com>

commit 135b0da42006f442697645f5b58aabc32b3a13ef
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Tue May 13 21:02:34 2008 +0200

    [BUILD] Move fencelib in /usr/share
    
    Python bytecompiled objectes are arch indipendent. Move
    the whole thing where it belongs.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto redhat com>

-----------------------------------------------------------------------

Summary of changes:
 configure             |   27 +++++++++++++++++++++++----
 make/defines.mk.input |    5 +++--
 make/install.mk       |    6 +++---
 make/uninstall.mk     |    2 +-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index f64f266..a68d002 100755
--- a/configure
+++ b/configure
@@ -76,6 +76,7 @@ my %options = (
 	mandir  => \$mandir,
 	prefix => \$prefix,
 	sbindir => \$sbindir,
+	initddir => \$initddir,
 	sharedir => \$sharedir,
 	mibdir => \$mibdir,
 	snmpbin => \$snmpbin,
@@ -96,6 +97,7 @@ my %options = (
 	without_gfs2 => \$without_gfs2,
 	without_gnbd => \$without_gnbd,
 	without_rgmanager => \$without_rgmanager,
+	without_kernel_modules => \$without_kernel_modules,
 	disable_kernel_check => \$disable_kernel_check,
 );
 
@@ -145,6 +147,7 @@ my $err = &GetOptions (\%options,
 		    'mandir=s',
 		    'prefix=s',
 		    'sbindir=s',
+		    'initddir=s',
 		    'sharedir=s',
 		    'mibdir=s',
 		    'snmpbin=s',
@@ -165,6 +168,7 @@ my $err = &GetOptions (\%options,
 		    'without_gfs2',
 		    'without_gnbd',
 		    'without_rgmanager',
+		    'without_kernel_modules',
 		    'disable_kernel_check');
 
 if(!$err) {
@@ -181,6 +185,7 @@ if ($help || !$err) {
   print "install flags:\n";
   print "--prefix=\tthe base directory to install into.  (Default: /usr)\n";
   print "--sbindir=\tthe base directory for system binaries.  (Default: {prefix}/sbin)\n";
+  print "--initddir=\tthe base directory for init.d scripts.  (Default: /etc/init.d)\n";
   print "--libdir=\tthe base directory for libraries.  (Default: {prefix}/lib)\n";
   print "--libexecdir=\tthe base directory for executable components.  (Default: {prefix}/libexec)\n";
   print "--sharedir=\tthe base directory for misc cluster files.  (Default: {prefix}/share/cluster)\n";
@@ -229,7 +234,7 @@ if ($help || !$err) {
   print "--xenlibdir=\tthe base directory for xen libraries.  (Default: {libdir})\n";
   print "--fence_agents=\tlist of fence agents to configure.  (Default: all)\n";
   print "\t\tUse --fence_agents=help for a list\n";
-  print "--fenceagentslibdir=\tspecify directory where to install common fence python lib.  (Default: /usr/lib/fence)\n";
+  print "--fenceagentslibdir=\tspecify directory where to install common fence python lib.  (Default: /usr/share/fence)\n";
   print "--enable_xen\tEnable building of Xen-specific pieces\n";
   print "--without_ccs\tDisable ccs building  (Default: enabled)\n";
   print "--without_cman\tDisable cman building  (Default: enabled)\n";
@@ -240,7 +245,8 @@ if ($help || !$err) {
   print "--without_gfs2\tDisable gfs2 building  (Default: enabled)\n";
   print "--without_gnbd\tDisable gnbd building  (Default: enabled)\n";
   print "--without_rgmanager\tDisable rgmanager building  (Default: enabled)\n";
-  print "--disable_kernel_check\tDisable kernel version check (Default: enabled)\n";
+  print "--without_kernel_modules\tDisable kernel modules building  (Default: enabled)\n";
+  print "--disable_kernel_check\tDisable kernel version check  (Default: enabled)\n";
   exit $ret;
 }
 
@@ -484,6 +490,9 @@ if (!$mandir) {
 if (!$sbindir) {
   $sbindir="${prefix}/sbin";
 }
+if (!$initddir) {
+  $initddir="/etc/init.d";
+}
 if (!$sharedir) {
   $sharedir="${prefix}/share/cluster";
 }
@@ -503,7 +512,7 @@ if (!$fence_agents) {
   $fence_agents="all";
 }
 if (!$fenceagentslibdir) {
-  $fenceagentslibdir="/usr/lib/fence";
+  $fenceagentslibdir="/usr/share/fence";
 }
 if (!$enable_xen) {
   $enable_xen="";
@@ -531,10 +540,17 @@ if (!$without_gfs2) {
 }
 if (!$without_gnbd) {
   $without_gnbd="";
-}       
+}
 if (!$without_rgmanager) {
   $without_rgmanager="";
 }
+if (!$without_kernel_modules) {
+  $without_gfskernel=$without_gfs;
+  $without_gnbdkernel=$without_gnbd;
+} else {
+  $without_gfskernel=1;
+  $without_gnbdkernel=1;
+}
 if (!$disable_kernel_check) {
   $disable_kernel_check=0;
 }
@@ -617,6 +633,7 @@ while (<IFILE>) {
   $_ =~ s/\ LIBEXECDIR\@/$libexecdir/;
   $_ =~ s/\ MANDIR\@/$mandir/;
   $_ =~ s/\ SBINDIR\@/$sbindir/;
+  $_ =~ s/\ INITDDIR\@/$initddir/;
   $_ =~ s/\ SHAREDIR\@/$sharedir/;
   $_ =~ s/\ MIBDIR\@/$mibdir/;
   $_ =~ s/\ SNMPBIN\@/$snmpbin/;
@@ -631,8 +648,10 @@ while (<IFILE>) {
   $_ =~ s/\ DISABLE_GROUP\@/$without_group/;
   $_ =~ s/\ DISABLE_FENCE\@/$without_fence/;
   $_ =~ s/\ DISABLE_GFS\@/$without_gfs/;
+  $_ =~ s/\ DISABLE_GFSKERNEL\@/$without_gfskernel/;
   $_ =~ s/\ DISABLE_GFS2\@/$without_gfs2/;
   $_ =~ s/\ DISABLE_GNBD\@/$without_gnbd/;
+  $_ =~ s/\ DISABLE_GNBDKERNEL\@/$without_gnbdkernel/;
   $_ =~ s/\ DISABLE_RGMANAGER\@/$without_rgmanager/;
 
   print OFILE "$_\n";
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 7a2a123..8b7ac7a 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -13,6 +13,7 @@
 
 # Install Locations
 sbindir ?= ${DESTDIR} SBINDIR@
+initddir ?= ${DESTDIR} INITDDIR@
 libdir ?= ${DESTDIR} LIBDIR@
 libexecdir ?= ${DESTDIR} LIBEXECDIR@
 sharedir ?= ${DESTDIR} SHAREDIR@
@@ -69,8 +70,8 @@ virtlibdir ?= @VIRTLIBDIR@
 fence_agents ?= @FENCE_AGENTS@
 fenceagentslibdir ?= @FENCEAGENTSLIBDIR@
 enable_xen ?= @ENABLE_XEN@
-without_gnbd-kernel/src ?= @DISABLE_GNBD@
-without_gfs-kernel/src/gfs ?= @DISABLE_GFS@
+without_gnbd-kernel/src ?= @DISABLE_GNBDKERNEL@
+without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@
 without_cman/lib ?= @DISABLE_CMAN@
 without_ccs ?= @DISABLE_CCS@
 without_cman ?= @DISABLE_CMAN@
diff --git a/make/install.mk b/make/install.mk
index 9bc5f58..fb937ed 100644
--- a/make/install.mk
+++ b/make/install.mk
@@ -24,12 +24,12 @@ ifdef LCRSOT
 	install -m644 ${LCRSOT} ${libexecdir}/lcrso
 endif
 ifdef INITDT
-	install -d ${DESTDIR}/etc/init.d
+	install -d ${initddir}
 	for i in ${INITDT}; do \
 	  if [ -f $(S)/$$i ]; then \
-	    install -m755 $(S)/$$i ${DESTDIR}/etc/init.d; \
+	    install -m755 $(S)/$$i ${initddir}; \
 	  else \
-	    install -m755 $$i ${DESTDIR}/etc/init.d; \
+	    install -m755 $$i ${initddir}; \
 	  fi; \
 	done
 endif
diff --git a/make/uninstall.mk b/make/uninstall.mk
index 2d8094f..9e64522 100644
--- a/make/uninstall.mk
+++ b/make/uninstall.mk
@@ -18,7 +18,7 @@ ifdef LCRSOT
 	${UNINSTALL} ${LCRSOT} ${libexecdir}/lcrso
 endif
 ifdef INITDT
-	${UNINSTALL} ${INITDT} ${DESTDIR}/etc/init.d
+	${UNINSTALL} ${INITDT} ${initddir}
 endif
 ifdef UDEVT
 	${UNINSTALL} ${UDEVT} ${DESTDIR}/etc/udev/rules.d


hooks/post-receive
--
Cluster Project


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]