9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
a5e9c5bc65
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-01 11:11:41 -07:00
ef0a712858
Distro friendly build system / packaging improvements.
...
These changes bring the zfs-0.4.4 tree in to compliance with
the spl-0.4.4 packaging changes. The bottom line is 2 source
rpms and 4 binary rpms will now be generated when creating
packages there will be:
zfs-<version>.src.rpm
- Fully rebuildable source rpm for libzfs and utils.
zfs-modules-<version>.src.rpm
- Fully rebuildable source rpm for kernel modules.
zfs-<version>.<arch>.rpm
- Binary rpm for libzfs and utils. The utils in this package are
compatible with all zfs-module rpms of the same version.
zfs-devel-<version>.<arch>.rpm
- Binary rpm containing headers for building against libzfs libraries.
zfs-modules-<verion>-<kernel>.arch.rpm
- Binary rpm containing the kernel modules for a specific kernel build.
The package name contains the kernel version and you should have one
of these packages installed to match every kernel on your system.
zfs-modules-devel-<verion>-<kernel>.arch.rpm
- Binary rpm containing development header and module symbols needed
for building additional kernel modules which are dependent on the
zfs module stack.
Expect minor interations on these changes as I validate they work
properly on CHAOS, RHEL, Fedora, and SLES style distros.
2009-07-01 10:53:05 -07:00
df43fa9472
Merge commit 'refs/top-bases/linux-unused' into linux-unused
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
2009-03-19 21:12:49 -07:00
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -07:00
eb811f7fa9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
2ddd5986e0
Merge commit 'refs/top-bases/linux-unused' into linux-unused
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:58:12 -07:00
8c43ad3853
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 19:49:56 -07:00
8cdcf1ef44
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 19:49:55 -07:00
05cec154f5
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-03-19 19:49:53 -07:00
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -07:00
b998074378
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-12 15:47:18 -07:00
82ce8b00f3
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:44:14 -07:00
6a5acaa105
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 15:44:13 -07:00
9fe5b916e2
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-03-12 15:39:27 -07:00
9e49df6b20
Add gcc-fortify-source branch
2009-03-12 15:38:51 -07:00
39e4615e42
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-12 15:15:16 -07:00
f2e7d57653
Packaging update
...
Make LINUX_VERSION available to Makefile's, add packaging
for user space include headers.
2009-03-12 15:07:29 -07:00
9eba109484
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-10 21:30:35 -07:00
c8e569dd1c
Build system and packaging (RPM support) (Part 2)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:13:30 -07:00
bf75e042f9
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-02-18 14:37:31 -08:00
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -08:00
15f5ddebdf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
...
Conflicts:
lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
6fe19bd252
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:28:15 -08:00
f0a8aedfbc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:27:12 -08:00
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
3a9ed52a6c
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-01-09 15:11:52 -08:00
6791a1ee34
I don't think we need this in userspace
2009-01-09 15:07:32 -08:00
ae80ba7fda
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-01-09 14:46:36 -08:00
ff09d64647
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
2009-01-09 14:37:45 -08:00
b7ba234fcc
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-01-08 10:29:18 -08:00
b457fb49f9
Remove vdev_disk from userspace build, vdev_file is used
2009-01-08 10:23:59 -08:00
b22496960e
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-01-05 13:47:24 -08:00
c15fa0ceb0
Add include paths
2009-01-05 13:44:26 -08:00
50735743b7
Err undo that
2008-12-22 16:22:28 -08:00
bb128e51e6
Use thread so we can add other goodies beyond simply the pthread base
2008-12-22 16:20:36 -08:00
01dd722b45
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-22 14:45:38 -08:00
29b47d366e
Remove some headers
2008-12-22 14:42:02 -08:00
617556ddde
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-22 13:52:57 -08:00
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
035e4d373e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:16 -08:00
c9597f9a4f
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-22 13:51:15 -08:00
6bed331e59
More compat changes
2008-12-22 13:47:58 -08:00
46ee012365
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-22 12:55:01 -08:00
121effcbee
Pull everything in to the Makefile
2008-12-22 12:51:03 -08:00
0cf01a7c69
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-22 11:42:28 -08:00
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
735f99cbcb
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-22 10:37:47 -08:00
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
9ce20e962a
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-19 16:57:50 -08:00
60289ccd8f
Add zfs_byteswap
2008-12-19 16:51:14 -08:00
a89736c72e
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-19 16:36:09 -08:00
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
1f2ec6b6cd
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-19 13:38:51 -08:00
8ab575cd8e
Remove vdev_disk.c from userspace build, we simply use vdev_file.c here
2008-12-19 13:35:29 -08:00
3c787f200f
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-19 12:11:19 -08:00
e485017676
Remove spa_boot from userspace build
2008-12-19 12:04:45 -08:00
347283843e
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-19 10:19:58 -08:00
9de4108779
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:18:12 -08:00
3e2e5c4535
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-19 10:18:12 -08:00
a68af79057
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-19 10:18:11 -08:00
d4c39af7a6
Re-add KM_PUSHPAGE
2008-12-19 10:15:52 -08:00
330840ff2e
Re-add KM_PUSHPAGE
2008-12-19 10:15:27 -08:00
3845f85e42
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-19 09:54:48 -08:00
2d0ae2710c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 09:52:53 -08:00
5906903384
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-19 09:52:52 -08:00
3d8832a795
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-19 09:52:51 -08:00
3bc48c3e74
Missing func readd
2008-12-19 09:50:15 -08:00
111303eeb8
context
2008-12-19 09:47:09 -08:00
dbc567603d
Readd removed hunk
2008-12-19 09:39:17 -08:00
3d19534f7a
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-18 13:20:09 -08:00
72bf32a79f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:18:19 -08:00
844a9ced6d
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-18 13:18:17 -08:00
33e499be43
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2008-12-18 13:18:15 -08:00
8e136cf0c9
Add noinline macro for userspace
2008-12-18 13:15:58 -08:00
00aa17c6b3
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-18 10:03:20 -08:00
0a353443cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:01:41 -08:00
9c0846462b
Resolve conflict
2008-12-18 10:01:37 -08:00
4df7b421a1
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-18 10:00:46 -08:00
25a3fca866
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 10:00:45 -08:00
9e195d0cbf
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-18 10:00:44 -08:00
c8f253cda8
Now fixed in fix-pthreads branch
2008-12-18 09:58:42 -08:00
229aba2943
Properly cast thread functions for pthreads
2008-12-18 09:56:22 -08:00
893ed2fad0
Properly cast thread functions for pthreads
2008-12-18 09:56:05 -08:00
f4d63a4cd4
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-17 16:47:26 -08:00
f799177730
Add all sources for libzfs userspace funcationality
2008-12-17 16:39:45 -08:00
eebeedfaff
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-17 11:37:52 -08:00
5ea99efac7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:36:20 -08:00
676ab35598
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-17 11:36:19 -08:00
0106dabb11
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-17 11:36:18 -08:00
a681d70e28
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:36:17 -08:00
e532f6bef4
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 11:36:16 -08:00
8af904a4b0
Resolve index shadowing /usr/include/string.h:304
2008-12-17 11:34:19 -08:00
ed9a35324d
Not sure why Sun needed to remove these externs, but I need them back
2008-12-17 11:32:47 -08:00
9e2f2bb378
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-17 11:28:51 -08:00
25db7e9413
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:27:21 -08:00
935fd6c681
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:27:20 -08:00
55c8582174
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 11:27:19 -08:00
Brian Behlendorf