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
82929e6eff
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-06-26 14:35:41 -07:00
b7ce372906
Merge commit 'refs/remotes/origin/linux-zpios' into HEAD
2009-06-26 14:35:39 -07:00
ddfd46d26e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-06-26 14:35:35 -07:00
a98e813b49
Merge commit 'refs/remotes/origin/linux-user-disk' into HEAD
2009-06-26 14:35:33 -07:00
c766ac39b4
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-06-26 14:35:29 -07:00
fa414f7b77
Merge commit 'refs/remotes/origin/linux-symbol-collisions' into HEAD
2009-06-26 14:35:27 -07:00
1daf9e6364
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-06-26 14:35:22 -07:00
2f78fd9b7f
Merge commit 'refs/remotes/origin/linux-legacy' into HEAD
2009-06-26 14:35:20 -07:00
9ea5e454fc
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-06-26 14:35:16 -07:00
7ad8b1fc82
Merge commit 'refs/remotes/origin/linux-kernel-mem' into HEAD
2009-06-26 14:35:14 -07:00
7451a0702e
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-06-26 14:35:10 -07:00
a5041b8a4d
Merge commit 'refs/remotes/origin/linux-kernel-disk' into HEAD
2009-06-26 14:35:08 -07:00
14d0582ab3
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-06-26 14:35:03 -07:00
73a044f416
Merge commit 'refs/remotes/origin/linux-have-zvol' into HEAD
2009-06-26 14:35:02 -07:00
5e095eef60
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-06-26 14:34:57 -07:00
514f9f626c
Merge commit 'refs/remotes/origin/linux-have-uio-rw' into HEAD
2009-06-26 14:34:55 -07:00
af590ac979
Merge commit 'refs/remotes/origin/linux-debug-zerocopy' into HEAD
2009-06-26 14:34:54 -07:00
5f118cd8c3
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-06-26 14:34:47 -07:00
a55e2314db
Merge commit 'refs/remotes/origin/linux-have-sysevent' into HEAD
2009-06-26 14:34:45 -07:00
ddbb1fcb7c
Merge commit 'refs/remotes/origin/linux-kernel-module' into HEAD
2009-06-26 14:34:44 -07:00
9be93eff64
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-06-26 14:34:36 -07:00
393aa038a5
Merge commit 'refs/remotes/origin/linux-have-spl-debug' into HEAD
2009-06-26 14:34:34 -07:00
825dd644ac
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-06-26 14:34:30 -07:00
a799d209d3
Merge commit 'refs/remotes/origin/linux-have-mntent' into HEAD
2009-06-26 14:34:28 -07:00
e367623fe1
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-06-26 14:34:24 -07:00
a3521786e6
Merge commit 'refs/remotes/origin/linux-have-libefi' into HEAD
2009-06-26 14:34:22 -07:00
Brian Behlendorf