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

Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl

This commit is contained in:
Brian Behlendorf 2009-03-12 15:15:25 -07:00
parent 9eea83e74b f2e7d57653
commit a47a8f2932
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
COPYRIGHT
View File

@ -1,6 +0,0 @@
The bulk of the library is Copyright 2004 Sun Microsystems, Inc.
Portions are Copyright 2006 OmniTI, Inc.
The library is distributed under the terms of the CDDL.
See the file OPENSOLARIS.LICENSE for more information.

6
config/zfs-build.m4
View File

@ -66,11 +66,13 @@ AC_DEFUN([ZFS_AC_KERNEL], [
AC_MSG_RESULT([$kernsrcver]) AC_MSG_RESULT([$kernsrcver])
kmoduledir=${INSTALL_MOD_PATH}/lib/modules/$kernsrcver kmoduledir=${INSTALL_MOD_PATH}/lib/modules/$kernsrcver
LINUX=${kernelsrc} LINUX=${kernelsrc}
LINUX_OBJ=${kernelbuild} LINUX_OBJ=${kernelbuild}
LINUX_VERSION=${kernsrcver}
AC_SUBST(LINUX) AC_SUBST(LINUX)
AC_SUBST(LINUX_OBJ) AC_SUBST(LINUX_OBJ)
AC_SUBST(LINUX_VERSION)
AC_SUBST(kmoduledir) AC_SUBST(kmoduledir)
]) ])

2
lib/libzpool/include/Makefile.am
View File

@ -1 +1 @@
noinst_HEADERS = sys/*.h pkginclude_HEADERS = sys/*.h

3
zfs.spec.in
View File

@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER GIT %doc AUTHORS ChangeLog COPYING DISCLAIMER GIT
%doc OPENSOLARIS.LICENSE README TODO ZFS.RELEASE %doc OPENSOLARIS.LICENSE README TODO ZFS.RELEASE
%{_sbindir}/* %{_sbindir}/*
%{_libdir}/* %{_libdir}/*
@ -94,6 +94,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{kdir}/include/zfs/* %{kdir}/include/zfs/*
%{_includedir}/*
%post %post
if [ -f /boot/System.map-%{kver} ]; then if [ -f /boot/System.map-%{kver} ]; then