Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks

This commit is contained in:
Brian Behlendorf 2008-11-24 11:59:44 -08:00
parent 57b5ad97fb 536640fe29
commit 26a215852e
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/kernel
View File

@ -2,10 +2,10 @@
UNAME=`uname -r | cut -d- -f1` UNAME=`uname -r | cut -d- -f1`
CONFIG=user CONFIG=kernel
NAME=zfs NAME=zfs
BRANCH=`awk '/[Bb]ranch:/ {print $$2}' META` BRANCH=`awk '/[Bb]ranch:/ {print $$2}' META`
VERSION=`awk '/[Vv]ersion:/ {print $$2}' META` VERSION=`awk '/[Vv]ersion:/ {print $$2}' META`
RELEASE=`awk '/[Rr]elease:/ {print $$2}' META` RELEASE=`awk '/[Rr]elease:/ {print $$2}' META`
BUILDDIR=$NAME+$CONFIG BUILDDIR=$NAME #+$CONFIG

2
config/lustre
View File

@ -8,4 +8,4 @@ NAME=zfs
BRANCH=`awk '/[Bb]ranch:/ {print $$2}' META` BRANCH=`awk '/[Bb]ranch:/ {print $$2}' META`
VERSION=`awk '/[Vv]ersion:/ {print $$2}' META` VERSION=`awk '/[Vv]ersion:/ {print $$2}' META`
RELEASE=`awk '/[Rr]elease:/ {print $$2}' META` RELEASE=`awk '/[Rr]elease:/ {print $$2}' META`
BUILDDIR=$NAME+$CONFIG BUILDDIR=$NAME #+$CONFIG

2
config/user
View File

@ -6,4 +6,4 @@ NAME=zfs
BRANCH=`awk '/[Bb]ranch:/ {print $$2}' META` BRANCH=`awk '/[Bb]ranch:/ {print $$2}' META`
VERSION=`awk '/[Vv]ersion:/ {print $$2}' META` VERSION=`awk '/[Vv]ersion:/ {print $$2}' META`
RELEASE=`awk '/[Rr]elease:/ {print $$2}' META` RELEASE=`awk '/[Rr]elease:/ {print $$2}' META`
BUILDDIR=$NAME+$CONFIG BUILDDIR=$NAME #+$CONFIG

6
config/zfs-build.m4
View File

@ -243,9 +243,9 @@ AC_DEFUN([ZFS_AC_SCRIPT_CONFIG], [
echo "ZFSSRC=${TOPDIR}/src" >>${SCRIPT_CONFIG} echo "ZFSSRC=${TOPDIR}/src" >>${SCRIPT_CONFIG}
echo "ZFSBUILD=${ZFSDIR}" >>${SCRIPT_CONFIG} echo "ZFSBUILD=${ZFSDIR}" >>${SCRIPT_CONFIG}
echo >>${SCRIPT_CONFIG} echo >>${SCRIPT_CONFIG}
echo "TOPDIR=${TOPDIR} >>${SCRIPT_CONFIG} echo "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG}
echo "LIBDIR=${LIBDIR} >>${SCRIPT_CONFIG} echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG}
echo "CMDDIR=${CMDDIR} >>${SCRIPT_CONFIG} echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG}
]) ])
dnl # dnl #

1
configure.ac
View File

@ -139,7 +139,6 @@ AC_SUBST(KERNELCPPFLAGS)
AC_SUBST(HOSTCFLAGS) AC_SUBST(HOSTCFLAGS)
AC_CONFIG_FILES([ Makefile AC_CONFIG_FILES([ Makefile
autoconf/Makefile
config/Makefile config/Makefile
doc/Makefile doc/Makefile
scripts/Makefile scripts/Makefile