Brian Behlendorf
6ce79a427a
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-08 10:51:45 -08:00
Brian Behlendorf
4dbd1e59e5
Configure checks for kernel build options incompatible with the license
...
Changes for linux-kernel-disk topic branch, see commit fd75782
.
2010-03-08 10:47:55 -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
5ff2c8f6cd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-02 10:04:24 -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
e4a4e686cd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-01-08 11:39:56 -08:00
Brian Behlendorf
303d9f010d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-01-08 11:39:31 -08:00
Brian Behlendorf
710e779a08
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-01-08 11:39:30 -08:00
Brian Behlendorf
efd53d2969
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-01-08 11:39:30 -08:00
Brian Behlendorf
75bc637b6d
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:30 -08:00
Brian Behlendorf
b991553702
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-01-08 11:39:30 -08:00
Brian Behlendorf
a240c39095
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-01-08 11:39:29 -08:00
Brian Behlendorf
ee3aa7773b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-01-08 11:39:28 -08:00
Brian Behlendorf
eaf2e3231c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-01-08 11:39:28 -08:00
Brian Behlendorf
27ae099e65
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-01-08 11:39:27 -08:00
Brian Behlendorf
d285c096c9
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-01-08 11:39:27 -08:00
Brian Behlendorf
cad00c2fc1
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:27 -08:00
Brian Behlendorf
da35bd5b60
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-01-08 11:39:26 -08:00
Brian Behlendorf
050c1617d8
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-01-08 11:39:26 -08:00
Brian Behlendorf
3d5d35b616
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-01-08 11:39:26 -08:00
Brian Behlendorf
34c0ae76d9
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-01-08 11:39:25 -08:00
Brian Behlendorf
fe9ad9171a
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-01-08 11:39:25 -08:00
Brian Behlendorf
4d11d8d3ef
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-01-08 11:39:24 -08:00
Brian Behlendorf
4fc3a7710c
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-01-08 11:39:24 -08:00
Brian Behlendorf
259647c1f1
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-01-08 11:39:23 -08:00
Brian Behlendorf
6ef95d5968
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-01-08 11:39:23 -08:00
Brian Behlendorf
233a1d9191
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-01-08 11:39:23 -08:00
Brian Behlendorf
385839654a
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-01-08 11:39:22 -08:00
Brian Behlendorf
5bd6eac343
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-01-08 11:39:22 -08:00
Brian Behlendorf
c6b28bd987
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-01-08 11:39:22 -08:00
Brian Behlendorf
1248d0da1a
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-01-08 11:39:21 -08:00
Brian Behlendorf
f70a3b3889
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-01-08 11:39:21 -08:00
Brian Behlendorf
39235e0172
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-01-08 11:39:20 -08:00
Brian Behlendorf
9b32e1cc61
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-01-08 11:39:20 -08:00
Brian Behlendorf
9aa7432a39
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-01-08 11:39:20 -08:00
Brian Behlendorf
94872fcdab
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-01-08 11:39:19 -08:00
Brian Behlendorf
c5a22252ab
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-01-08 11:39:19 -08:00
Brian Behlendorf
9002f847df
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-01-08 11:39:19 -08:00
Brian Behlendorf
365c47de76
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-01-08 11:39:18 -08:00
Brian Behlendorf
f2607bbb8f
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-01-08 11:39:18 -08:00
Brian Behlendorf
e02d36ad39
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-01-08 11:39:17 -08:00
Brian Behlendorf
93befe62be
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-01-08 11:39:17 -08:00
Brian Behlendorf
c3835d1483
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-01-08 11:39:17 -08:00
Brian Behlendorf
68fc990a4b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-01-08 11:39:16 -08:00
Brian Behlendorf
8513efcadd
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-01-08 11:39:16 -08:00
Brian Behlendorf
c1d363770f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-01-08 11:39:16 -08:00
Brian Behlendorf
6cb71e1dec
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:14 -08:00
Brian Behlendorf
cbc1c11cf5
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-01-08 11:39:13 -08:00
Brian Behlendorf
b45c6064bb
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-01-08 11:39:13 -08:00
Brian Behlendorf
44f298491f
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-01-08 11:39:13 -08:00