ab4146db46
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-01 11:11:55 -07:00
b321946648
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-01 11:11:50 -07:00
df388bfc0a
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-01 11:11:48 -07:00
e956869d17
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-01 11:11:43 -07:00
a5e9c5bc65
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-01 11:11:41 -07:00
1d0a30f5a5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-01 11:11:36 -07:00
685b7d85d3
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-01 11:11:34 -07:00
bd840df630
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-01 11:11:29 -07:00
94390a0793
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-01 11:11:27 -07:00
cdec7ff523
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-01 11:11:22 -07:00
d959a6177a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-01 11:11:20 -07:00
c198cbe54f
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-01 11:11:14 -07:00
9fd939766f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-01 11:11:12 -07:00
06652dd306
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-01 11:11:07 -07:00
518b58f35b
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-01 11:11:05 -07:00
4339e96c34
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-01 11:11:00 -07:00
10c43094ed
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-01 11:10:58 -07:00
29b022a4b1
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-01 11:10:53 -07:00
3c96976b99
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-01 11:10:51 -07:00
4cac8c23ea
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-01 11:10:46 -07:00
212ecc6560
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-01 11:10:44 -07:00
1c2ca36488
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-01 11:10:39 -07:00
bfa8b02c2c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-01 11:10:37 -07:00
d4721058bc
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-01 11:10:36 -07:00
f6f03b8fcb
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-01 11:10:27 -07:00
a37fb966bd
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-01 11:10:25 -07:00
8c684c8d85
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-01 11:10:24 -07:00
095f7bd7d5
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-01 11:10:15 -07:00
578f6e03f2
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-01 11:10:13 -07:00
5501d95f8e
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-01 11:10:08 -07:00
f8ff6aa720
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-01 11:10:06 -07:00
113f86f222
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-01 11:10:01 -07:00
95ab1a0980
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-01 11:09:59 -07:00
59048423bf
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-01 11:09:54 -07:00
78f7e07b9a
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-01 11:09:52 -07:00
e1349aad89
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-01 11:09:47 -07:00
7262d13e72
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-01 11:09:45 -07:00
9f7cf23531
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-01 11:09:40 -07:00
a60390f3b0
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-01 11:09:38 -07:00
b44445a8f1
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-01 11:09:33 -07:00
fa91b5d59b
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-01 11:09:31 -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
fe11f17b79
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-06-26 14:36:07 -07:00
f4db5d25d1
Merge commit 'refs/remotes/origin/linux-ztest' into HEAD
2009-06-26 14:36:05 -07:00
8e8606d138
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-06-26 14:36:00 -07:00
bf45458100
Merge commit 'refs/remotes/origin/linux-have-zpl' into HEAD
2009-06-26 14:35:59 -07:00
e03c4f629c
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-06-26 14:35:54 -07:00
b74fe421f4
Merge commit 'refs/remotes/origin/linux-unused' into HEAD
2009-06-26 14:35:52 -07:00
896f1ff0a9
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-06-26 14:35:48 -07:00
5329f4dffe
Merge commit 'refs/remotes/origin/linux-libspl' into HEAD
2009-06-26 14:35:46 -07:00
Brian Behlendorf