[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Thu Dec 23 18:02:02 MST 2010
The branch, master has been updated
via 1a20d59 mkrelease: Simplify further.
via 599a7df update whatsnew for alpha14.
via c19a90a WHATSNEW: Fix typo, indentation.
via 8b34a2d wafsamba: Fix handling of nick name in VERSION.
via bfb9ae2 talloc: remove autotools support.
via 9e8a049 tdb: Remove autotools support.
via 0f8f216 MAINTAINERS: List rusty and tridge as maintainers for talloc.
via aeb050b MAINTAINERS: add rusty as the tdb maintainer.
via 64d5c05 MAINTAINERS: List tridge and me as maintainers of wafsamba and the wscripts.
from 821b2a9 testprogs: testspoolss.exe: pretty print FILETIME in driver info 6 and 8.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1a20d597f2c792fc7d6ba846a82d904ccc7705b3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 24 00:35:06 2010 +0100
mkrelease: Simplify further.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Fri Dec 24 02:01:10 CET 2010 on sn-devel-104
commit 599a7dfd1d06e746909b153b361f40d0b811cbcc
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 24 00:28:58 2010 +0100
update whatsnew for alpha14.
commit c19a90aafe56437c9d37a00825601ca2c86af06c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 24 00:26:51 2010 +0100
WHATSNEW: Fix typo, indentation.
commit 8b34a2dff6a3789741cd53b63909cd81a7316f59
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 24 00:14:04 2010 +0100
wafsamba: Fix handling of nick name in VERSION.
commit bfb9ae24146b1def10744f95609f185329d5466b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 23 23:56:36 2010 +0100
talloc: remove autotools support.
commit 9e8a04984327ffae611165244a159ff9c6ca30f4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Dec 23 23:54:51 2010 +0100
tdb: Remove autotools support.
commit 0f8f21657dfa4d26d438cb02fb7b5e838a0aa092
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 18 16:01:04 2010 +0100
MAINTAINERS: List rusty and tridge as maintainers for talloc.
commit aeb050b5c0d9296c789ff18b8b24864a3c47c0df
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 18 15:58:09 2010 +0100
MAINTAINERS: add rusty as the tdb maintainer.
commit 64d5c0556018c223df9c2812b1e5639d9d95bc91
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 18 15:43:03 2010 +0100
MAINTAINERS: List tridge and me as maintainers of wafsamba and the wscripts.
-----------------------------------------------------------------------
Summary of changes:
MAINTAINERS.txt | 24 +
WHATSNEW.txt | 4 +-
WHATSNEW4.txt | 7 +-
buildtools/wafsamba/samba_version.py | 3 +-
lib/talloc/Makefile.in | 62 --
lib/talloc/aclocal.m4 | 1 -
lib/talloc/autogen-autotools.sh | 14 -
lib/talloc/build_macros.m4 | 14 -
lib/talloc/config.guess | 1561 -------------------------------
lib/talloc/config.sub | 1686 ----------------------------------
lib/talloc/configure.ac | 49 -
lib/talloc/install-sh | 238 -----
lib/talloc/rules.mk | 18 -
lib/talloc/talloc.exports | 68 --
lib/talloc/talloc.mk | 52 -
lib/{talloc => tdb}/Makefile | 0
lib/tdb/Makefile.in | 80 --
lib/tdb/aclocal.m4 | 1 -
lib/tdb/autogen-autotools.sh | 14 -
lib/tdb/autogen-waf.sh | 1 -
lib/tdb/autogen.sh | 12 +-
lib/tdb/build_macros.m4 | 14 -
lib/tdb/config.guess | 1561 -------------------------------
lib/tdb/config.sub | 1686 ----------------------------------
lib/{replace => tdb}/configure | 0
lib/tdb/configure.ac | 51 -
lib/tdb/install-sh | 238 -----
lib/tdb/python.mk | 6 -
lib/tdb/rules.mk | 16 -
lib/tdb/tdb.exports | 65 --
lib/tdb/tdb.mk | 109 ---
script/autobuild.py | 6 +-
source4/script/mkrelease.sh | 8 +-
33 files changed, 46 insertions(+), 7623 deletions(-)
delete mode 100644 lib/talloc/Makefile.in
delete mode 100644 lib/talloc/aclocal.m4
delete mode 100755 lib/talloc/autogen-autotools.sh
delete mode 100644 lib/talloc/build_macros.m4
delete mode 100755 lib/talloc/config.guess
delete mode 100755 lib/talloc/config.sub
delete mode 100644 lib/talloc/configure.ac
delete mode 100755 lib/talloc/install-sh
delete mode 100644 lib/talloc/rules.mk
delete mode 100644 lib/talloc/talloc.exports
delete mode 100644 lib/talloc/talloc.mk
copy lib/{talloc => tdb}/Makefile (100%)
delete mode 100644 lib/tdb/Makefile.in
delete mode 100644 lib/tdb/aclocal.m4
delete mode 100755 lib/tdb/autogen-autotools.sh
delete mode 120000 lib/tdb/autogen-waf.sh
mode change 120000 => 100755 lib/tdb/autogen.sh
delete mode 100644 lib/tdb/build_macros.m4
delete mode 100755 lib/tdb/config.guess
delete mode 100755 lib/tdb/config.sub
copy lib/{replace => tdb}/configure (100%)
delete mode 100644 lib/tdb/configure.ac
delete mode 100755 lib/tdb/install-sh
delete mode 100644 lib/tdb/python.mk
delete mode 100644 lib/tdb/rules.mk
delete mode 100644 lib/tdb/tdb.exports
delete mode 100644 lib/tdb/tdb.mk
Changeset truncated at 500 lines:
diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 88787b1..466ae54 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -37,6 +37,30 @@ policy:
Larger changes need also discussion on the samba-technical list
and review by all maintainers.
+files: buildtools/**, source4/**/wscript
+maintainers:
+ Andrew Tridgell <tridge at samba.org>
+ Jelmer Vernooij <jelmer at samba.org>
+policy:
+ small commits to master allowed if all existing tests
+ pass. Larger commits require discussion on the samba-technical
+ list and review by the maintainer
+
+files: lib/tdb
+maintainers:
+ Rusty Russell <rusty at samba.org>
+policy:
+ Mail/CC changes to the maintainer, commit the changes
+ unless the maintainer objects.
+
+files: lib/talloc
+maintainers:
+ Andrew Tridgell <tridge at samba.org>
+ Rusty Russell <rusty at samba.org>
+policy:
+ small commits to master allowed if all existing tests
+ pass. Larger commits require discussion on samba-technical
+ list and review by the maintainer
files: lib/tevent/py*, lib/talloc/py*, source4/lib/ldb/py*, lib/tdb/py*
maintainers:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 5668564..63f35e4 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=================================
Release Notes for Samba 3.6.0pre1
- July 28, 2010
+ July 28, 2010
=================================
@@ -16,7 +16,7 @@ Major enhancements in Samba 3.6.0 include:
SMB2 support
------------
-SMB2 support in 3.6.0 is fully functional (with one ommission),
+SMB2 support in 3.6.0 is fully functional (with one omission),
and can be enabled by setting:
max protocol = SMB2
diff --git a/WHATSNEW4.txt b/WHATSNEW4.txt
index 1741221..6758715 100644
--- a/WHATSNEW4.txt
+++ b/WHATSNEW4.txt
@@ -78,6 +78,8 @@ Although still in development, samba4 is already used in a couple of production
and such kind of use case is intensifying. This script is intendended for administrators
to allow them to make a periodic backup of the provision in case of problem.
+* the 'net' command has been renamed to 'samba-tool'
+
CHANGES
=======
@@ -114,8 +116,9 @@ KNOWN ISSUES
RUNNING Samba4
==============
-A short guide to setting up Samba 4 can be found in the howto.txt file
-in root of the tarball.
+A short guide to setting up Samba 4 can be found on the wiki:
+
+ http://wiki.samba.org/index.php/Samba4/HOWTO
DEVELOPMENT and FEEDBACK
========================
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 5804afb..8d1bd32 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -167,8 +167,7 @@ also accepted as dictionary entries here
self.STRING = SAMBA_VERSION_STRING
if self.RELEASE_NICKNAME is not None:
- self.STRING_WITH_NICKNAME += (" (" + self.RELEASE_NICKNAME + ")")
- self.RELEASE_NICKNAME = self.RELEASE_NICKNAME
+ self.STRING_WITH_NICKNAME = "%s (%s)" % (self.STRING, self.RELEASE_NICKNAME)
else:
self.STRING_WITH_NICKNAME = self.STRING
diff --git a/lib/talloc/Makefile.in b/lib/talloc/Makefile.in
deleted file mode 100644
index 94f031a..0000000
--- a/lib/talloc/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!gmake
-#
-prefix = @prefix@
-datarootdir = @datarootdir@
-exec_prefix = @exec_prefix@
-includedir = @includedir@
-libdir = @libdir@
-mandir = @mandir@
-VPATH = @srcdir@:@libreplacedir@
-srcdir = @srcdir@
-builddir = @builddir@
-sharedbuilddir = @sharedbuilddir@
-XSLTPROC = @XSLTPROC@
-INSTALLCMD = @INSTALL@
-CC = @CC@
-CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@
-EXTRA_TARGETS = @DOC_TARGET@
-PICFLAG = @PICFLAG@
-TALLOC_VERSION = @TALLOC_VERSION@
-TALLOC_VERSION_MAJOR = @TALLOC_VERSION_MAJOR@
-TALLOC_VERSION_MINOR = @TALLOC_VERSION_MINOR@
-TALLOC_VERSION_RELEASE = @TALLOC_VERSION_RELEASE@
-SHLIBEXT = @SHLIBEXT@
-SHLD = @SHLD@
-SHLD_FLAGS = @SHLD_FLAGS@
-tallocdir = @tallocdir@
-
-LIBOBJ = $(TALLOC_OBJ) @LIBREPLACEOBJ@
-
-SONAMEFLAG = @SONAMEFLAG@
-VERSIONSCRIPT = @VERSIONSCRIPT@
-EXPORTSFILE = @EXPORTSFILE@
-
-all:: showflags $(EXTRA_TARGETS)
-
-include $(tallocdir)/rules.mk
-include $(tallocdir)/talloc.mk
-
- at TALLOC_COMPAT1_MK@
-
-$(TALLOC_SOLIB): $(LIBOBJ)
- $(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) $(VERSIONSCRIPT) $(EXPORTSFILE) $(SONAMEFLAG)$(TALLOC_SONAME)
-
-shared-build: all
- ${INSTALLCMD} -d $(sharedbuilddir)/lib
- ${INSTALLCMD} -m 644 libtalloc.a $(sharedbuilddir)/lib
- ${INSTALLCMD} -m 755 $(TALLOC_SOLIB) $(sharedbuilddir)/lib
- ln -sf $(TALLOC_SOLIB) $(sharedbuilddir)/lib/$(TALLOC_SONAME)
- ln -sf $(TALLOC_SOLIB) $(sharedbuilddir)/lib/libtalloc.so
- ${INSTALLCMD} -d $(sharedbuilddir)/include
- ${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(sharedbuilddir)/include
-
-check: test
-
-installcheck:: test install
-
-distclean:: clean
- rm -f Makefile
- rm -f config.log config.status config.h config.cache
-
-realdistclean:: distclean
- rm -f configure config.h.in
diff --git a/lib/talloc/aclocal.m4 b/lib/talloc/aclocal.m4
deleted file mode 100644
index 5605e47..0000000
--- a/lib/talloc/aclocal.m4
+++ /dev/null
@@ -1 +0,0 @@
-m4_include(libreplace.m4)
diff --git a/lib/talloc/autogen-autotools.sh b/lib/talloc/autogen-autotools.sh
deleted file mode 100755
index bf84eee..0000000
--- a/lib/talloc/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"
-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/talloc/build_macros.m4 b/lib/talloc/build_macros.m4
deleted file mode 100644
index c036668..0000000
--- a/lib/talloc/build_macros.m4
+++ /dev/null
@@ -1,14 +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"
- LDFLAGS="$LDFLAGS -L$with_shared_build_dir/lib"
- fi
- AC_SUBST(sharedbuilddir)
- ])
-
diff --git a/lib/talloc/config.guess b/lib/talloc/config.guess
deleted file mode 100755
index da83314..0000000
--- a/lib/talloc/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*:*)
- # 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
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit ;;
--
Samba Shared Repository
More information about the samba-cvs
mailing list