[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sat Oct 30 10:33:01 MDT 2010
The branch, master has been updated
via 4dee76f replace: Fix formatting.
via 7fc0aab ldb: Drop autoconf-based build system.
via fe6d404 tevent: Drop autoconf-based build system for standalone build.
via d1eba07 replace: Avoid autoproto as it breaks standalone builds.
via 58e99ae replace: Only build replace-test in standalone build.
from 1620697 s4:local_password LDB module - fix typos
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4dee76f1cd1364718ba385121c00b8b8eb1c917e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 30 17:43:48 2010 +0200
replace: Fix formatting.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sat Oct 30 16:32:15 UTC 2010 on sn-devel-104
commit 7fc0aaba4b7383973bbc2e80addea11658d48fbf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 30 16:17:58 2010 +0200
ldb: Drop autoconf-based build system.
commit fe6d404ea506e492c0a29715ed1e88ebe044e875
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 30 16:16:33 2010 +0200
tevent: Drop autoconf-based build system for standalone build.
commit d1eba07e54d20ec9222f1ee448cc4223b9341c70
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 30 16:01:00 2010 +0200
replace: Avoid autoproto as it breaks standalone builds.
Automatic prototype generation uses ../../source4/script/mkproto.pl.
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit 58e99ae9169df39b383f711c91e0c0f76b954b33
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 30 15:59:14 2010 +0200
replace: Only build replace-test in standalone build.
This allows turning libreplace-test back into a subsystem.
-----------------------------------------------------------------------
Summary of changes:
lib/replace/replace-test.h | 10 +
lib/replace/wscript | 35 +-
lib/tevent/Makefile.in | 79 --
lib/tevent/autogen-autotools.sh | 14 -
lib/tevent/build_macros.m4 | 15 -
lib/tevent/config.guess | 1561 -------------------------------
lib/tevent/config.sub | 1686 ----------------------------------
lib/tevent/configure.ac | 25 -
lib/tevent/install-sh | 238 -----
lib/tevent/libtalloc.m4 | 7 -
lib/tevent/pkg.m4 | 156 ----
lib/tevent/rules.mk | 18 -
lib/tevent/samba.m4 | 11 -
lib/tevent/tevent.exports | 62 --
lib/tevent/tevent.mk | 46 -
source4/lib/ldb/Makefile.in | 187 ----
source4/lib/ldb/aclocal.m4 | 1 -
source4/lib/ldb/autogen-autotools.sh | 18 -
source4/lib/ldb/build_macros.m4 | 15 -
source4/lib/ldb/config.guess | 1561 -------------------------------
source4/lib/ldb/config.mk | 152 ---
source4/lib/ldb/config.sub | 1686 ----------------------------------
source4/lib/ldb/configure.ac | 102 --
source4/lib/ldb/install-sh | 238 -----
source4/lib/ldb/ldap.m4 | 90 --
source4/lib/ldb/ldb.mk | 81 --
source4/lib/ldb/libldb.m4 | 7 -
source4/lib/ldb/python.mk | 6 -
source4/lib/ldb/rules.mk | 26 -
source4/lib/ldb/sqlite3.m4 | 62 --
source4/lib/ldb/standalone.sh | 28 -
31 files changed, 28 insertions(+), 8195 deletions(-)
create mode 100644 lib/replace/replace-test.h
delete mode 100644 lib/tevent/Makefile.in
delete mode 100755 lib/tevent/autogen-autotools.sh
delete mode 100644 lib/tevent/build_macros.m4
delete mode 100755 lib/tevent/config.guess
delete mode 100755 lib/tevent/config.sub
delete mode 100644 lib/tevent/configure.ac
delete mode 100755 lib/tevent/install-sh
delete mode 100644 lib/tevent/libtalloc.m4
delete mode 100644 lib/tevent/pkg.m4
delete mode 100644 lib/tevent/rules.mk
delete mode 100644 lib/tevent/samba.m4
delete mode 100644 lib/tevent/tevent.exports
delete mode 100644 lib/tevent/tevent.mk
delete mode 100644 source4/lib/ldb/Makefile.in
delete mode 100644 source4/lib/ldb/aclocal.m4
delete mode 100755 source4/lib/ldb/autogen-autotools.sh
delete mode 100644 source4/lib/ldb/build_macros.m4
delete mode 100755 source4/lib/ldb/config.guess
delete mode 100644 source4/lib/ldb/config.mk
delete mode 100755 source4/lib/ldb/config.sub
delete mode 100644 source4/lib/ldb/configure.ac
delete mode 100755 source4/lib/ldb/install-sh
delete mode 100644 source4/lib/ldb/ldap.m4
delete mode 100644 source4/lib/ldb/ldb.mk
delete mode 100644 source4/lib/ldb/libldb.m4
delete mode 100644 source4/lib/ldb/python.mk
delete mode 100644 source4/lib/ldb/rules.mk
delete mode 100644 source4/lib/ldb/sqlite3.m4
delete mode 100755 source4/lib/ldb/standalone.sh
Changeset truncated at 500 lines:
diff --git a/lib/replace/replace-test.h b/lib/replace/replace-test.h
new file mode 100644
index 0000000..95fb7ab
--- /dev/null
+++ b/lib/replace/replace-test.h
@@ -0,0 +1,10 @@
+#ifndef __LIB_REPLACE_REPLACE_TEST_H__
+#define __LIB_REPLACE_REPLACE_TEST_H__
+
+bool torture_local_replace(struct torture_context *ctx);
+int libreplace_test_strptime(void);
+int test_readdir_os2_delete(void);
+int getifaddrs_test(void);
+
+#endif /* __LIB_REPLACE_REPLACE_TEST_H__ */
+
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 9340ded..da788a1 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -27,6 +27,8 @@ def set_options(opt):
def configure(conf):
conf.RECURSE('buildtools/wafsamba')
+ conf.env.standalone_replace = conf.IN_LAUNCH_DIR()
+
conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
# on Tru64 certain features are only available with _OSF_SOURCE set to 1
@@ -131,7 +133,7 @@ def configure(conf):
int s = socket(AF_INET6, SOCK_STREAM, 0);
int ret = getaddrinfo(NULL, NULL, NULL, &ai);
if (ret != 0) {
- const char *es = gai_strerror(ret);
+ const char *es = gai_strerror(ret);
}
freeaddrinfo(ai);
{
@@ -224,7 +226,7 @@ def configure(conf):
conf.DEFINE('HAVE_EPOLL', 1)
if not conf.CHECK_CODE('''#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
- #include "test/strptime.c"''',
+ #include "test/strptime.c"''',
define='HAVE_STRPTIME',
addmain=False,
msg='Checking for working strptime'):
@@ -268,7 +270,7 @@ def configure(conf):
conf.SAMBA_BUILD_ENV()
conf.CHECK_CODE('''
- typedef struct {unsigned x;} FOOBAR;
+ typedef struct {unsigned x;} FOOBAR;
#define X_FOOBAR(x) ((FOOBAR) { x })
#define FOO_ONE X_FOOBAR(1)
FOOBAR f = FOO_ONE;
@@ -399,25 +401,24 @@ def build(bld):
bld.SAMBA_LIBRARY('replace',
source=REPLACE_SOURCE,
group='base_libraries',
- # FIXME: Ideally symbols should be hidden here so they
- # don't appear in the global namespace when Samba
- # libraries are loaded, but this doesn't appear to work
- # at the moment:
- # hide_symbols=bld.BUILTIN_LIBRARY('replace'),
+ # FIXME: Ideally symbols should be hidden here so they
+ # don't appear in the global namespace when Samba
+ # libraries are loaded, but this doesn't appear to work
+ # at the moment:
+ # hide_symbols=bld.BUILTIN_LIBRARY('replace'),
private_library=True,
deps='crypt dl nsl socket rt')
- bld.SAMBA_LIBRARY('replace-test',
+ bld.SAMBA_SUBSYSTEM('replace-test',
source='''test/testsuite.c test/strptime.c
test/os2_delete.c test/getifaddrs.c''',
- autoproto='replace-test.h',
- deps='replace',
- private_library=True)
-
- bld.SAMBA_BINARY('replace_testsuite',
- source='test/main.c',
- deps='replace replace-test',
- install=False)
+ deps='replace')
+
+ if bld.env.standalone_replace:
+ bld.SAMBA_BINARY('replace_testsuite',
+ source='test/main.c',
+ deps='replace replace-test',
+ install=False)
# build replacements for stdint.h and stdbool.h if needed
bld.SAMBA_GENERATOR('replace_stdint_h',
diff --git a/lib/tevent/Makefile.in b/lib/tevent/Makefile.in
deleted file mode 100644
index f3deb9d..0000000
--- a/lib/tevent/Makefile.in
+++ /dev/null
@@ -1,79 +0,0 @@
-#!gmake
-#
-# Makefile for tdb directory
-#
-
-CC = @CC@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-includedir = @includedir@
-libdir = @libdir@
-VPATH = @srcdir@:@libreplacedir@
-srcdir = @srcdir@
-builddir = @builddir@
-sharedbuilddir = @sharedbuilddir@
-INSTALLCMD = @INSTALL@
-CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude -I.
-LDFLAGS = @LDFLAGS@
-EXEEXT = @EXEEXT@
-SHLD = @SHLD@
-SHLD_FLAGS = @SHLD_FLAGS@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PICFLAG = @PICFLAG@
-SHLIBEXT = @SHLIBEXT@
-LIB_PATH_VAR = @LIB_PATH_VAR@
-teventdir = @teventdir@
-
-TALLOC_CFLAGS = @TALLOC_CFLAGS@
-TALLOC_LDFLAGS = @TALLOC_CFLAGS@
-TALLOC_LIBS = @TALLOC_LIBS@
-
-TEVENT_CFLAGS = @TEVENT_CFLAGS@
-TEVENT_LDFLAGS = @TEVENT_CFLAGS@
-TEVENT_LIBS = @TEVENT_LIBS@
-
-CFLAGS = $(CPPFLAGS) $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) @CFLAGS@
-LDFLAGS = $(TALLOC_LDFLAGS) $(TEVENT_LDFLAGS) @LDFLAGS@
-LIBS = $(TALLOC_LIBS) $(TEVENT_LIBS) @LIBS@
-
-TEVENT_OBJ = @TEVENT_OBJ@ @LIBREPLACEOBJ@
-
-SONAMEFLAG = @SONAMEFLAG@
-VERSIONSCRIPT = @VERSIONSCRIPT@
-EXPORTSFILE = @EXPORTSFILE@
-
-default: all
-
-include $(teventdir)/tevent.mk
-include $(teventdir)/rules.mk
-
-all:: showflags dirs $(PROGS) $(TEVENT_SOLIB) libtevent.a
-
-install:: all
-$(TEVENT_SOLIB): $(TEVENT_OBJ)
- $(SHLD) $(SHLD_FLAGS) $(LDFLAGS) $(LIBS) -o $@ $(TEVENT_OBJ) $(VERSIONSCRIPT) $(EXPORTSFILE) $(SONAMEFLAG)$(TEVENT_SONAME)
-
-shared-build: all
- ${INSTALLCMD} -d $(sharedbuilddir)/lib
- ${INSTALLCMD} -m 644 libtevent.a $(sharedbuilddir)/lib
- ${INSTALLCMD} -m 755 $(TEVENT_SOLIB) $(sharedbuilddir)/lib
- ln -sf $(TEVENT_SOLIB) $(sharedbuilddir)/lib/$(TEVENT_SONAME)
- ln -sf $(TEVENT_SOLIB) $(sharedbuilddir)/lib/libtevent.so
- ${INSTALLCMD} -d $(sharedbuilddir)/include
- ${INSTALLCMD} -m 644 $(srcdir)/tevent.h $(sharedbuilddir)/include
-
-check: test
-
-installcheck:: test install
-
-clean::
- rm -f *.o *.a */*.o
- rm -fr abi
-
-distclean:: clean
- rm -f config.log config.status config.h config.cache
- rm -f Makefile
-
-realdistclean:: distclean
- rm -f configure config.h.in
diff --git a/lib/tevent/autogen-autotools.sh b/lib/tevent/autogen-autotools.sh
deleted file mode 100755
index 7a1e7ab..0000000
--- a/lib/tevent/autogen-autotools.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-rm -rf autom4te.cache
-rm -f configure config.h.in
-
-IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace -I ../../../lib/replace"
-autoconf $IPATHS || exit 1
-autoheader $IPATHS || exit 1
-
-rm -rf autom4te.cache
-
-echo "Now run ./configure and then make."
-exit 0
-
diff --git a/lib/tevent/build_macros.m4 b/lib/tevent/build_macros.m4
deleted file mode 100644
index bb7fad8..0000000
--- a/lib/tevent/build_macros.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-AC_DEFUN(BUILD_WITH_SHARED_BUILD_DIR,
- [ AC_ARG_WITH([shared-build-dir],
- [AC_HELP_STRING([--with-shared-build-dir=DIR],
- [temporary build directory where libraries are installed [$srcdir/sharedbuild]])])
-
- sharedbuilddir="$srcdir/sharedbuild"
- if test x"$with_shared_build_dir" != x; then
- sharedbuilddir=$with_shared_build_dir
- CFLAGS="$CFLAGS -I$with_shared_build_dir/include"
- CPPFLAGS="$CPPFLAGS -I$with_shared_build_dir/include"
- LDFLAGS="$LDFLAGS -L$with_shared_build_dir/lib"
- fi
- AC_SUBST(sharedbuilddir)
- ])
-
diff --git a/lib/tevent/config.guess b/lib/tevent/config.guess
deleted file mode 100755
index da83314..0000000
--- a/lib/tevent/config.guess
+++ /dev/null
@@ -1,1561 +0,0 @@
-#! /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
-# Free Software Foundation, Inc.
-
-timestamp='2009-04-27'
-
-# 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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# 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.
-#
-# 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.
-#
-# 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.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches at gnu.org>."
-
-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.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help" >&2
- exit 1 ;;
- * )
- break ;;
- esac
-done
-
-if test $# != 0; then
- echo "$me: too many arguments$help" >&2
- exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi at noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-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*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
- # compatibility and a consistent mechanism for selecting the
- # object file format.
- #
- # Note: NetBSD doesn't particularly care about the vendor
- # portion of the name. We always set it to "unknown".
- sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
- armeb) machine=armeb-unknown ;;
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
- else
- os=netbsdelf
- fi
- ;;
- *)
- os=netbsd
- ;;
- esac
- # The OS release
- # Debian GNU/NetBSD machines have a different userland, and
- # thus, need a distinct triplet. However, they do not need
- # kernel version information, so it can be replaced with a
- # suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
- Debian*)
- release='-gnu'
- ;;
- *)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- ;;
- esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
- exit ;;
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
- *:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- exit ;;
- macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
- # types through head -n 1, so we only detect the type of CPU 0.
- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
- case "$ALPHA_CPU_TYPE" in
- "EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
- "EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
- "LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
- "EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
- "EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
- "EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
- "EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
- "EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
- "EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
- "EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
- "EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
- # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # 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 ;;
- Alpha\ *:Windows_NT*:*)
--
Samba Shared Repository
More information about the samba-cvs
mailing list