Cluster Project branch, STABLE2, updated. cluster-2.03.02-30-g8a7314e

[fabbione@sourceware.org]

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=8a7314ea3f3d30cbf10b127fc5516a078d000adc

The branch, STABLE2 has been updated
       via  8a7314ea3f3d30cbf10b127fc5516a078d000adc (commit)
       via  cbc0bf25dc72a03b206aa99ca76bad2061d63e52 (commit)
       via  5e63f75175f340453ecd498b3a4a5c366e4e4ab2 (commit)
      from  776cef92f7ca1542d63771923f4ccaeedabd613e (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 8a7314ea3f3d30cbf10b127fc5516a078d000adc
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Wed May 21 09:12:31 2008 +0200

    [BUILD] Fix install permissions
    
    Virtually every distro was complaining about scripts
    permissions. Clearly we were doing it wrong. Fix them all.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit cbc0bf25dc72a03b206aa99ca76bad2061d63e52
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Wed May 21 09:11:58 2008 +0200

    [BUILD] Fix rg_test linking
    
    rg_test does not need libccs
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit 5e63f75175f340453ecd498b3a4a5c366e4e4ab2
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Tue May 20 11:00:02 2008 +0200

    [BUILD] Fix sparc #ifdef according to the new gcc tables
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

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

Summary of changes:
 cman/qdisk/disk_util.c           |    2 +-
 rgmanager/include/platform.h     |    2 +-
 rgmanager/src/clulib/vft.c       |    2 +-
 rgmanager/src/daemons/Makefile   |    2 +-
 rgmanager/src/resources/Makefile |   17 ++++++++++-------
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/cman/qdisk/disk_util.c b/cman/qdisk/disk_util.c
index f5539c0..afa3640 100644
--- a/cman/qdisk/disk_util.c
+++ b/cman/qdisk/disk_util.c
@@ -71,7 +71,7 @@ getuptime(struct timeval *tv)
 	if (!fp)
 		return -1;
 
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc__)
 	rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
 		    &junk.tv_sec, &junk.tv_usec);
 #else
diff --git a/rgmanager/include/platform.h b/rgmanager/include/platform.h
index 7a49cc2..8f0ac48 100644
--- a/rgmanager/include/platform.h
+++ b/rgmanager/include/platform.h
@@ -67,7 +67,7 @@ Configure is gone...
 #define swab64(x) x=be_swap64(x)
 
 
-#ifdef __sparc64__
+#if defined(__sparc__)
 #define ALIGNED __attribute__((aligned))
 #define PACKED  __attribute__((aligned,packed))
 #else
diff --git a/rgmanager/src/clulib/vft.c b/rgmanager/src/clulib/vft.c
index 154bc98..6978cca 100644
--- a/rgmanager/src/clulib/vft.c
+++ b/rgmanager/src/clulib/vft.c
@@ -734,7 +734,7 @@ getuptime(struct timeval *tv)
 	if (!fp)
 		return -1;
 
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc__)
 	rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
 		    &junk.tv_sec, &junk.tv_usec);
 #else
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 62904f9..08959f3 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -105,7 +105,7 @@ ${TARGET2}: ${OBJS2}
 # packages should run 'make check' as part of the build process.
 #
 ${TARGET3}: ${SHAREDOBJS} ${OBJS3}
-	$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
+	$(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) \
 			$(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS)
 
 ${TARGET4}: ${SHAREDOBJS} ${OBJS4}
diff --git a/rgmanager/src/resources/Makefile b/rgmanager/src/resources/Makefile
index 5e5897b..5d0268d 100644
--- a/rgmanager/src/resources/Makefile
+++ b/rgmanager/src/resources/Makefile
@@ -26,9 +26,9 @@ RESOURCES=fs.sh service.sh ip.sh nfsclient.sh nfsexport.sh \
 
 METADATA=apache.metadata openldap.metadata samba.metadata \
 	mysql.metadata postgres-8.metadata tomcat-5.metadata \
-	named.metadata lvm.metadata
+	named.metadata lvm.metadata default_event_script.sl
 
-GENERAL_TARGETS=ocf-shellfuncs svclib_nfslock default_event_script.sl
+GENERAL_TARGETS=ocf-shellfuncs svclib_nfslock
 
 UTIL_TARGETS= \
 	utils/ra-skelet.sh utils/messages.sh \
@@ -45,15 +45,18 @@ $(TARGET):
 install: all
 	install -d ${sharedir}/utils
 	for i in $(RESOURCES); do \
-	 install $(S)/$$i ${sharedir}; \
+	 install -m755 $(S)/$$i ${sharedir}; \
 	done
-	for i in $(GENERAL_TARGETS) $(METADATA); do \
-	 install -m 644 $(S)/$$i ${sharedir}; \
+	for i in $(METADATA); do \
+	 install -m644 $(S)/$$i ${sharedir}; \
+	done
+	for i in $(GENERAL_TARGETS); do \
+	 install -m755 $(S)/$$i ${sharedir}; \
 	done
 	for i in $(UTIL_TARGETS); do \
-	 install $(S)/$$i ${sharedir}/utils; \
+	 install -m755 $(S)/$$i ${sharedir}/utils; \
 	done
-	install -m644 $(TARGET) ${sharedir}/utils
+	install -m755 $(TARGET) ${sharedir}/utils
 
 uninstall:
 	${UNINSTALL} ${RESOURCES} ${GENERAL_TARGETS} \


hooks/post-receive
--
Cluster Project