Commit Graph

199 Commits

Author SHA1 Message Date
Brian Behlendorf 343bcf823f Refresh autogen products with automake 1.11.1 2010-05-21 16:04:53 -07:00
Brian Behlendorf 89375ef80b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-05-20 10:29:55 -07:00
Brian Behlendorf c6ea865e3a Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-20 10:24:05 -07:00
Brian Behlendorf b974e4bf4d Fix error message to reference the new libuuid package.
It used to be the case that libuuid was part of e2fsprogs.  However,
since other projects unrelated to e2fsprogs make use of that library
it was getting aukward to have that dependency.  The package was
split from e2fsprogs and moved to its own devel package in the
util-linux-ng project.  Anyway, I'm just updating the error message
to reflect the new upstream reality.
2010-05-20 10:00:03 -07:00
Brian Behlendorf d5c0441641 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-05-18 15:13:53 -07:00
Brian Behlendorf ccbfbcd223 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-18 15:11:35 -07:00
Brian Behlendorf 4e7fd8ff9d Move build system and core script changes to correct zfs-branch. 2010-05-18 15:05:44 -07:00
Brian Behlendorf ecb8603d26 Revert changes which don't belong on linux-configure-branch. 2010-05-18 15:04:19 -07:00
Brian Behlendorf 13ad721a84 Move user-arch.m4 change from linux-libspl to zfs-branch. 2010-05-18 12:26:48 -07:00
Brian Behlendorf 753d533ed4 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-04-22 10:02:29 -07:00
Brian Behlendorf 53f5636918 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-22 10:00:13 -07:00
Brian Behlendorf d69cfcab40 Add top level SPL include path which is needed for *-devel builds 2010-04-22 09:55:07 -07:00
Brian Behlendorf 34edbcd956 Refresh autogen products 2010-03-26 15:57:19 -07:00
Brian Behlendorf 5b09380297 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
Conflicts:
	config/Rules.am
2010-03-26 15:52:42 -07:00
Brian Behlendorf 52e5e6e6d0 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-26 15:47:25 -07:00
Brian Behlendorf 23ab272555 Add support for 'make -s' silent builds
The cleanest way to do this is to set AM_LIBTOOLFLAGS = --silent.  However,
AM_LIBTOOLFLAGS is not honored by automake-1.9.6-2.1 which is what I have
been using.  To cleanly handle this I am updating to automake-1.11-3 which
is why it looks like there is a lot of churn in the Makefiles.
2010-03-26 15:41:41 -07:00
Brian Behlendorf 42dbe7d063 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
Conflicts:
	config/kernel.m4
2010-03-22 16:58:51 -07:00
Brian Behlendorf 6b9f42c3be Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-22 16:55:48 -07:00
Brian Behlendorf e96be1888a Allow zfs_config.h to be included by dependant packages (updated)
We need dependent packages to be able to include zfs_config.h to
build properly.  This was partially solved previously be using
AH_BOTTOM to #undef common #defines (PACKAGE, VERSION, etc) which
autoconf always adds and cannot be easily removed.  This solution
works as long as the zfs_config.h is included before your projects
config.h.  That turns out to be easier said than done.  In particular,
this is a problem when your package includes its config.h using the
-include gcc option which ensures the first thing included is your
config.h.

To handle all cases cleanly I have removed the AH_BOTTOM hack and
replaced it with an AC_CONFIG_HEADERS command.  This command runs
immediately after zfs_config.h is written and with a little awk-foo
it strips the offending #defines from the file.  This eliminates
the problem entirely and makes header safe for inclusion.
2010-03-22 16:42:18 -07:00
Brian Behlendorf 5421d05a48 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-11 14:10:36 -08:00
Brian Behlendorf b0436b0a97 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-11 14:08:33 -08:00
Brian Behlendorf e7b3766a69 Remove udev dependency when running in-tree
After much contemplation I can't see a clean way to use udev entirely
in-tree for testing.  This patch removed a horrible horrible hack which
would copy the needed udev bits in to place on your system to make it
work.  That however is simply not acceptable, nothing you in in-tree
should ever ever ever install something on your system.

Since I could not come up with a clean way to use udev in-tree.  The
fix is to simply parse the zdev config file and create the needed
symlinks in a sub-diretory or your working tree.  This is not as clean
as using udev but it does work perfectly well for in-tree testing.
2010-03-11 13:56:20 -08:00
Brian Behlendorf 4f46459052 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-11 10:02:18 -08:00
Brian Behlendorf e65e071268 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-11 10:00:20 -08:00
Brian Behlendorf 369293803b Allow recursive configure/make
Previously the ZFS configure was dependent on a correct Module{s}.symvers
file which is generated as one of the last steps of the full SPL build.
This meant you could not do a recursive configure because this will
configure all sub-packages before building any of them.

To resolve this issue the ZFS code has been updated to make a very
educated guess as to this file name at configure time.  This means
SPL_SYMBOLS may still be used in various places in the build system
such as modules/Makefile.in.  But we do give up the ability to
seemlessly detect symbols exported by the SPL at ZFS configure time.
At the moment this is not as issue, hopefully it will stay that way.
2010-03-11 09:45:23 -08:00
Brian Behlendorf c3fdc3b521 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-08 16:09:21 -08:00
Brian Behlendorf 64da100fee Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-08 16:07:40 -08:00
Brian J. Murrell 3f30f74414 Check for spl in ../spl if not found in install path
If the spl source could not be found in /usr/src/spl-*, also try to
find it in ../spl.  This makes finding it in a development sandbox
more natural.
2010-03-08 16:04:25 -08:00
Brian Behlendorf f2a7c80f3e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-08 14:58:22 -08:00
Brian Behlendorf a8fdfba7f7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-08 14:56:32 -08:00
Brian J. Murrell 0ec3b7e122 When no kernel source has been pointed to, first attempt to use
/lib/modules/$(uname -r)/source.  This will likely fail when building
under a mock (http://fedoraproject.org/wiki/Projects/Mock) chroot
environment since `uname -r` will report the running kernel which
likely is not the kernel in your chroot.  To cleanly handle this
we fallback to using the first kernel in your chroot.

The kernel-devel package which contains all the kernel headers and
a few build products such as Module.symver{s} is all the is required.
Full source is not needed.
2010-03-08 14:53:13 -08:00
Brian Behlendorf 02d15b4e4f Refresh autogen products 2010-03-08 10:57:16 -08:00
Brian Behlendorf 48d4d44961 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-08 10:52:58 -08:00
Brian Behlendorf f34e664f6e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:04 -08:00
Brian Behlendorf fd7578215e Configure checks for kernel build options incompatible with the license
Twice now I've been bitten by building agaist a kernel which is
configured such that it is incompatible with the CDDL license.  These
build failures don't occur until the linking phase at which point they
simply callout the offending symbol.  No location information can be
provided at this point so it often can be confusing what the problem is
particularly when building against a new kernel for the first time.

To help address this I've added a configure check which can be extended
over time to detect known kernel config options which if set will break
the ZFS build.  Currently I have just added CONFIG_DEBUG_LOCK_ALLOC which
makes mutex's GPL-only and is on by default in the RHEL6 alpha builds.
I know for a fact there are other similiar options which can be added
as they are encountered.
2010-03-08 10:27:42 -08:00
Brian Behlendorf cdc2e52139 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
Conflicts:

	scripts/udev-rules/99-zpool.rules.dragon
2010-03-02 10:08:59 -08:00
Brian Behlendorf e6d92ae57d Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	cmd/Makefile.am
2010-03-02 10:01:51 -08:00
Brian Behlendorf 7df02c0f57 Split the udev rule from a specific configuration
While I completely agree the udev is the lesser of many possibles
evils when solving the device issue... it is still evil.  After
attempting to craft a single rule which will work for various
versions of udev in various distros.  I've come to the conclusion
the only maintainable way to solve this issue is to split the rule
from any particular configuration.

This commit provides a generic 60-zpool.rules file which use a
small helper util 'zpool_id' to parse a configuration file by
default located in /etc/zfs/zdev.conf.  The helper script maps
a by-path udev name to a more friendly name of <channel><rank>
for large configurations.

As part of this change all of the support scripts why rely on
this udev naming convention have been updated as needed.  Example
zdev.conf files have also been added for 3 different systems by
you will always need to add one for your exact hardware.

Finally, included in these changes are the proper tweaks to the
build system to ensure everything still get's packaged properly
in the rpms and can run in or out of tree.
2010-03-01 16:51:21 -08:00
Brian Behlendorf 9b473082fa Refresh autogen products 2009-12-23 14:53:51 -08:00
Brian Behlendorf d711dc6b34 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-12-23 14:52:18 -08:00
Brian Behlendorf e7dc082f29 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-12-23 14:49:56 -08:00
Brian Behlendorf c824f39f95 Add a check for the fmode_t type.
This typedef first appears in 2.6.28 kernels as part of some
block device operation reworking.
2009-12-23 14:42:32 -08:00
Brian Behlendorf a6216d59d0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-11-24 14:19:36 -08:00
Brian Behlendorf a7fff21060 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-11-24 14:17:30 -08:00
Brian Behlendorf c8bd25ac98 Add 'srpm' --with-config option for creation of spec files. 2009-11-24 14:13:25 -08:00
Brian Behlendorf 840aa5356d Refresh autogen products 2009-11-20 12:14:59 -08:00
Brian Behlendorf 8bacf4f03d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-11-20 10:32:06 -08:00
Brian Behlendorf 6d8a17ed45 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-11-20 10:29:52 -08:00
Brian Behlendorf 6fabeffd3b Additional ZVOL compatibility autoconf checks and zconfig ZVOL sanity test. 2009-11-20 10:04:56 -08:00
Brian Behlendorf 81c56431ae Refresh autogen products 2009-11-16 10:42:39 -08:00