[SCM] CTDB repository - branch master updated - ctdb-2.1-8-gb054193
Amitay Isaacs
amitay at samba.org
Tue Jan 22 17:17:31 MST 2013
The branch, master has been updated
via b054193d1d19a8eef998fa690899501f79badb8a (commit)
via 109f428aa34f8f4cc0329880d2f4a5593a6cc6f3 (commit)
via 258092aaf6b7a9bdc14f0fb35e8bd7f7dc742b3f (commit)
via d202b2fdd4fd70172e5e44583627b57a1b7ad2ed (commit)
via 3c6a9b73364c9543366fa033c778145dc7a152a9 (commit)
via 95fc493a7d4145f976cb3fe928d9e92faec4dd71 (commit)
via 506ecd186759675a1cf50a0a05a285fee03fc51e (commit)
from 0e651e9da0f1f3c836b4474612ab13d0ccd272d9 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b054193d1d19a8eef998fa690899501f79badb8a
Author: Mathieu Parent <math.parent at gmail.com>
Date: Mon Jan 14 17:48:01 2013 +0100
common: Don't lie on unimplemented gratuitous arp
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
commit 109f428aa34f8f4cc0329880d2f4a5593a6cc6f3
Author: Mathieu Parent <math.parent at gmail.com>
Date: Mon Jan 14 17:21:01 2013 +0100
tests: Test portability
Curiously test_ctdb_sys_check_iface_exists fails on Linux
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
commit 258092aaf6b7a9bdc14f0fb35e8bd7f7dc742b3f
Author: Mathieu Parent <math.parent at gmail.com>
Date: Mon Jan 14 12:13:24 2013 +0100
common: FreeBSD+kFreeBSD: Implement get_process_name (same as in Linux)
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
commit d202b2fdd4fd70172e5e44583627b57a1b7ad2ed
Author: Mathieu Parent <math.parent at gmail.com>
Date: Mon Jan 14 11:23:46 2013 +0100
common: Detailed platform-specific FIXME
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
commit 3c6a9b73364c9543366fa033c778145dc7a152a9
Author: Mathieu Parent <math.parent at gmail.com>
Date: Sun Jan 13 14:15:20 2013 +0100
build: Update config.guess 2012-12-30 and config.sub to 2013-01-11
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
commit 95fc493a7d4145f976cb3fe928d9e92faec4dd71
Author: Mathieu Parent <math.parent at gmail.com>
Date: Sat Jan 12 16:43:03 2013 +0100
doc: allows to -> allows one to
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
commit 506ecd186759675a1cf50a0a05a285fee03fc51e
Author: Mathieu Parent <math.parent at gmail.com>
Date: Sat Jan 12 15:14:48 2013 +0100
build: Add missing LDFLAGS
Original Author: Simon Ruderich <simon at ruderich.org>
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 9 +-
common/system_aix.c | 11 +-
common/system_freebsd.c | 27 ++-
common/system_gnu.c | 13 +-
common/system_kfreebsd.c | 28 ++-
config.guess | 426 ++++++++++++++++++++--------------------
config.sub | 274 +++++++++++++++++---------
config/ctdb.sysconfig | 2 +-
doc/ctdbd.1.xml | 2 +-
tests/src/ctdb_porting_tests.c | 305 ++++++++++++++++++++++++++++
10 files changed, 768 insertions(+), 329 deletions(-)
mode change 100755 => 100644 config.guess
mode change 100755 => 100644 config.sub
create mode 100644 tests/src/ctdb_porting_tests.c
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index fef2e45..e704d63 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,6 +104,7 @@ TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch tests/bin/ctdb_fetch_one \
tests/bin/ctdb_takeover_tests tests/bin/ctdb_update_record \
tests/bin/ctdb_update_record_persistent \
tests/bin/ctdb_tool_libctdb tests/bin/ctdb_tool_stubby \
+ tests/bin/ctdb_porting_tests \
@INFINIBAND_BINS@
BINS = bin/ctdb @CTDB_SCSI_IO@ bin/smnotify bin/ping_pong bin/ltdbtool @CTDB_PMDA@
@@ -173,7 +174,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o tools/ctdb_vacuum.o libctdb/libctdb.a
bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ)
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS)
+ @$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
@echo Linking $@
@@ -195,7 +196,7 @@ utils/smnotify/gen_smnotify.c: utils/smnotify/smnotify.x utils/smnotify/smnotify
bin/ping_pong: utils/ping_pong/ping_pong.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o
+ @$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o $(LIB_FLAGS)
bin/pmdactdb: $(CTDB_CLIENT_OBJ) utils/pmda/pmda_ctdb.o
@echo Linking $@
@@ -257,6 +258,10 @@ tests/bin/ctdb_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_persistent.o
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+tests/bin/ctdb_porting_tests: $(CTDB_CLIENT_OBJ) tests/src/ctdb_porting_tests.o
+ @echo Linking $@
+ $(CC) $(CFLAGS) -o $@ tests/src/ctdb_porting_tests.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+
tests/bin/ctdb_transaction: $(CTDB_CLIENT_OBJ) tests/src/ctdb_transaction.o
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_transaction.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
diff --git a/common/system_aix.c b/common/system_aix.c
index 16b627c..35363d3 100644
--- a/common/system_aix.c
+++ b/common/system_aix.c
@@ -206,8 +206,8 @@ int ctdb_sys_close_capture_socket(void *private_data)
*/
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
{
- /* We dont do grat arp on aix yet */
- return 0;
+ /* FIXME AIX: We dont do gratuitous arp yet */
+ return -1;
}
@@ -359,6 +359,7 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
bool ctdb_sys_check_iface_exists(const char *iface)
{
+ /* FIXME AIX: Interface always considered present */
return true;
}
@@ -375,18 +376,18 @@ int ctdb_get_peer_pid(const int fd, pid_t *peer_pid)
char *ctdb_get_process_name(pid_t pid)
{
- /* FIXME: not implemented */
+ /* FIXME AIX: get_process_name not implemented */
return NULL;
}
bool ctdb_get_lock_info(pid_t req_pid, struct ctdb_lock_info *lock_info)
{
- /* FIXME: not implemented */
+ /* FIXME AIX: get_lock_info not implemented */
return false;
}
bool ctdb_get_blocker_pid(struct ctdb_lock_info *reqlock, pid_t *blocker_pid)
{
- /* FIXME: not implemented */
+ /* FIXME AIX: get_blocker_pid not implemented */
return false;
}
diff --git a/common/system_freebsd.c b/common/system_freebsd.c
index 37f1c74..641e77a 100644
--- a/common/system_freebsd.c
+++ b/common/system_freebsd.c
@@ -75,8 +75,8 @@ static uint16_t tcp_checksum6(uint16_t *data, size_t n, struct ip6_hdr *ip6)
*/
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
{
- /* FIXME We dont do gratuitous arp on Hurd yet */
- return 0;
+ /* FIXME FreeBSD: We dont do gratuitous arp yet */
+ return -1;
}
@@ -360,29 +360,44 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
bool ctdb_sys_check_iface_exists(const char *iface)
{
+ /* FIXME FreeBSD: Interface always considered present */
return true;
}
int ctdb_get_peer_pid(const int fd, pid_t *peer_pid)
{
- /* FIXME not implemented */
+ /* FIXME FreeBSD: get_peer_pid not implemented */
return 1;
}
char *ctdb_get_process_name(pid_t pid)
{
- /* FIXME: not implemented */
+ char path[32];
+ char buf[PATH_MAX];
+ char *ptr;
+ int n;
+
+ snprintf(path, sizeof(path), "/proc/%d/exe", pid);
+ n = readlink(path, buf, sizeof(buf));
+ if (n < 0) {
+ return NULL;
+ }
+
+ /* Remove any extra fields */
+ buf[n] = '\0';
+ ptr = strtok(buf, " ");
+ return strdup(ptr);
return NULL;
}
bool ctdb_get_lock_info(pid_t req_pid, struct ctdb_lock_info *lock_info)
{
- /* FIXME: not implemented */
+ /* FIXME FreeBSD: get_lock_info not implemented */
return false;
}
bool ctdb_get_blocker_pid(struct ctdb_lock_info *reqlock, pid_t *blocker_pid)
{
- /* FIXME: not implemented */
+ /* FIXME FreeBSD: get_blocker_pid not implemented */
return false;
}
diff --git a/common/system_gnu.c b/common/system_gnu.c
index 8a3b5b1..0d79ab5 100644
--- a/common/system_gnu.c
+++ b/common/system_gnu.c
@@ -74,8 +74,8 @@ static uint16_t tcp_checksum6(uint16_t *data, size_t n, struct ip6_hdr *ip6)
*/
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
{
- /* FIXME We dont do gratuitous arp on Hurd yet */
- return 0;
+ /* FIXME GNU/Hurd: We dont do gratuitous arp yet */
+ return -1;
}
@@ -353,29 +353,30 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
bool ctdb_sys_check_iface_exists(const char *iface)
{
+ /* FIXME GNU/Hurd: Interface always considered present */
return true;
}
int ctdb_get_peer_pid(const int fd, pid_t *peer_pid)
{
- /* FIXME not implemented */
+ /* FIXME GNU/Hurd: get_peer_pid not implemented */
return 1;
}
char *ctdb_get_process_name(pid_t pid)
{
- /* FIXME: not implemented */
+ /* FIXME GNU/Hurd: get_process_name not implemented */
return NULL;
}
bool ctdb_get_lock_info(pid_t req_pid, struct ctdb_lock_info *lock_info)
{
- /* FIXME: not implemented */
+ /* FIXME GNU/Hurd: get_lock_info not implemented */
return false;
}
bool ctdb_get_blocker_pid(struct ctdb_lock_info *reqlock, pid_t *blocker_pid)
{
- /* FIXME: not implemented */
+ /* FIXME GNU/Hurd: get_blocker_pid not implemented */
return false;
}
diff --git a/common/system_kfreebsd.c b/common/system_kfreebsd.c
index 5595865..2c05c9e 100644
--- a/common/system_kfreebsd.c
+++ b/common/system_kfreebsd.c
@@ -74,8 +74,8 @@ static uint16_t tcp_checksum6(uint16_t *data, size_t n, struct ip6_hdr *ip6)
*/
int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
{
- /* FIXME We dont do gratuitous arp on Hurd yet */
- return 0;
+ /* FIXME kFreeBSD: We dont do gratuitous arp yet */
+ return -1;
}
@@ -353,29 +353,43 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
bool ctdb_sys_check_iface_exists(const char *iface)
{
+ /* FIXME kFreeBSD: Interface always considered present */
return true;
}
int ctdb_get_peer_pid(const int fd, pid_t *peer_pid)
{
- /* FIXME not implemented */
+ /* FIXME kFreeBSD: get_peer_pid not implemented */
return 1;
}
char *ctdb_get_process_name(pid_t pid)
{
- /* FIXME: not implemented */
- return NULL;
+ char path[32];
+ char buf[PATH_MAX];
+ char *ptr;
+ int n;
+
+ snprintf(path, sizeof(path), "/proc/%d/exe", pid);
+ n = readlink(path, buf, sizeof(buf));
+ if (n < 0) {
+ return NULL;
+ }
+
+ /* Remove any extra fields */
+ buf[n] = '\0';
+ ptr = strtok(buf, " ");
+ return strdup(ptr);
}
bool ctdb_get_lock_info(pid_t req_pid, struct ctdb_lock_info *lock_info)
{
- /* FIXME: not implemented */
+ /* FIXME kFreeBSD: get_lock_info not implemented */
return false;
}
bool ctdb_get_blocker_pid(struct ctdb_lock_info *reqlock, pid_t *blocker_pid)
{
- /* FIXME: not implemented */
+ /* FIXME kFreeBSD: get_blocker_pid not implemented */
return false;
}
diff --git a/config.guess b/config.guess
old mode 100755
new mode 100644
index e3a2116..0aee604
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,14 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2009-06-10'
+timestamp='2012-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -17,26 +17,22 @@ timestamp='2009-06-10'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per at bothner.com>.
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,8 +52,9 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -180,7 +177,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -201,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,12 +299,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -333,6 +337,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
SUN_ARCH="i386"
@@ -391,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
@@ -477,8 +484,8 @@ EOF
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -491,7 +498,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@@ -548,7 +555,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -591,52 +598,52 @@ EOF
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
--
CTDB repository
More information about the samba-cvs
mailing list