FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development

 
 
LinkBack Thread Tools
 
Old 05-19-2008, 04:06 AM
 
Default 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=0c7bd530bb 56848a8818f9b6389bd7fed67b1d73

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:
";
print "--prefix= the base directory to install into. (Default: /usr)
";
print "--sbindir= the base directory for system binaries. (Default: {prefix}/sbin)
";
+ print "--initddir= the base directory for init.d scripts. (Default: /etc/init.d)
";
print "--libdir= the base directory for libraries. (Default: {prefix}/lib)
";
print "--libexecdir= the base directory for executable components. (Default: {prefix}/libexec)
";
print "--sharedir= the base directory for misc cluster files. (Default: {prefix}/share/cluster)
";
@@ -229,7 +234,7 @@ if ($help || !$err) {
print "--xenlibdir= the base directory for xen libraries. (Default: {libdir})
";
print "--fence_agents= list of fence agents to configure. (Default: all)
";
print " Use --fence_agents=help for a list
";
- print "--fenceagentslibdir= specify directory where to install common fence python lib. (Default: /usr/lib/fence)
";
+ print "--fenceagentslibdir= specify directory where to install common fence python lib. (Default: /usr/share/fence)
";
print "--enable_xen Enable building of Xen-specific pieces
";
print "--without_ccs Disable ccs building (Default: enabled)
";
print "--without_cman Disable cman building (Default: enabled)
";
@@ -240,7 +245,8 @@ if ($help || !$err) {
print "--without_gfs2 Disable gfs2 building (Default: enabled)
";
print "--without_gnbd Disable gnbd building (Default: enabled)
";
print "--without_rgmanager Disable rgmanager building (Default: enabled)
";
- print "--disable_kernel_check Disable kernel version check (Default: enabled)
";
+ print "--without_kernel_modules Disable kernel modules building (Default: enabled)
";
+ print "--disable_kernel_check Disable kernel version check (Default: enabled)
";
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 "$_
";
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
 

Thread Tools




All times are GMT. The time now is 01:34 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org