Brian Behlendorf
08e37c48c7
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-10 11:25:11 -07:00
Brian Behlendorf
60370eb826
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-10 11:25:09 -07:00
Brian Behlendorf
1d6b5183d3
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
configure.ac
2009-03-10 11:22:53 -07:00
Brian Behlendorf
78613b45fd
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-10 11:21:03 -07:00
Brian Behlendorf
b1b76c6634
Build system and packaging (RPM support) (Part 1)
...
An update to the build system to properly support all commonly
used Makefile targets these include:
make all # Build everything
make install # Install everything
make clean # Clean up build products
make distclean # Clean up everything
make dist # Create package tarball
make srpm # Create package source RPM
make rpm # Create package binary RPMs
make tags # Create ctags and etags for everything
Extra care was taken to ensure that the source RPMs are fully
rebuildable against Fedora/RHEL/Chaos kernels. To build binary
RPMs from the source RPM for your system simply run:
rpmbuild --rebuild zfs-x.y.z-1.src.rpm
This will produce two binary RPMs with correct 'requires'
dependencies for your kernel. One will contain all zfs modules
and support utilities, the other is a devel package for compiling
additional kernel modules which are dependant on the zfs.
zfs-x.y.z-1_<kernel version>.x86_64.rpm
zfs-devel-x.y.2-1_<kernel version>.x86_64.rpm
2009-03-10 11:10:50 -07:00
Brian Behlendorf
c3d57d1ec7
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-20 22:32:30 -08:00
Brian Behlendorf
a31814f47b
Further profile infrastructure
2009-02-20 22:27:18 -08:00
Brian Behlendorf
7eeec4808a
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-20 14:33:26 -08:00
Brian Behlendorf
4d28f29b6c
Update profile scripts with additional upcalls for fine grained profiling
2009-02-20 14:28:00 -08:00
Brian Behlendorf
29946892d9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 14:57:29 -08:00
Brian Behlendorf
ddfa570f42
Initial update to support zpios.sh profiling option.
2009-02-19 14:51:40 -08:00
Brian Behlendorf
43fb0282da
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 14:41:00 -08:00
Brian Behlendorf
d51fcd107f
Remove useless run_args->regions check which was always true
2009-02-19 14:35:41 -08:00
Brian Behlendorf
023a02025f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 13:58:27 -08:00
Brian Behlendorf
5ae73585fb
Cleanup zpios option handling
2009-02-19 13:53:17 -08:00
Brian Behlendorf
d3f070026f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 13:02:01 -08:00
Brian Behlendorf
23710f1308
Minor zpios cleanup plus addition of --nowait feature
2009-02-19 12:56:50 -08:00
Brian Behlendorf
d01a5802ef
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-02-18 16:40:51 -08:00
Brian Behlendorf
f2c0b3f2a6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-02-18 16:40:47 -08:00
Brian Behlendorf
fcc5bc121d
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-02-18 16:40:37 -08:00
Brian Behlendorf
c0fce9bde6
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-02-18 16:40:34 -08:00
Brian Behlendorf
8add3a726a
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-02-18 16:40:25 -08:00
Brian Behlendorf
3a79a1f922
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-02-18 16:40:22 -08:00
Brian Behlendorf
7a8825ef7f
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-02-18 16:40:13 -08:00
Brian Behlendorf
b1eaefd390
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-02-18 16:40:10 -08:00
Brian Behlendorf
9a985e1631
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-18 16:40:01 -08:00
Brian Behlendorf
a2b17c5744
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-18 16:39:57 -08:00
Brian Behlendorf
d6ca5f4b22
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-02-18 16:39:49 -08:00
Brian Behlendorf
283b744e89
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-02-18 16:39:45 -08:00
Brian Behlendorf
5026284b48
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-02-18 16:39:36 -08:00
Brian Behlendorf
68816d820e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-02-18 16:39:31 -08:00
Brian Behlendorf
c301f6309a
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-02-18 16:39:21 -08:00
Brian Behlendorf
d09c4a4c80
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-02-18 16:39:18 -08:00
Brian Behlendorf
6bf6f62d98
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-02-18 16:39:09 -08:00
Brian Behlendorf
aab28d7a6e
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-02-18 16:39:06 -08:00
Brian Behlendorf
7fb9b38b35
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-02-18 16:38:57 -08:00
Brian Behlendorf
a21e67a4af
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-02-18 16:38:54 -08:00
Brian Behlendorf
e5950641e2
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-02-18 16:38:42 -08:00
Brian Behlendorf
359141b50e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-02-18 16:38:40 -08:00
Brian Behlendorf
cdbb12e5c5
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
2009-02-18 16:38:31 -08:00
Brian Behlendorf
a983057c58
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-18 16:38:28 -08:00
Brian Behlendorf
eac636b639
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-02-18 16:38:19 -08:00
Brian Behlendorf
2cbe1d0785
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-18 16:38:16 -08:00
Brian Behlendorf
fab643a25b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-18 16:38:15 -08:00
Brian Behlendorf
5957fa4c9c
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-02-18 16:37:59 -08:00
Brian Behlendorf
ac79872526
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-02-18 16:37:56 -08:00
Brian Behlendorf
87245deaab
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 16:37:54 -08:00
Brian Behlendorf
7cc355671b
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-02-18 16:37:38 -08:00
Brian Behlendorf
a922810637
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-02-18 16:37:35 -08:00
Brian Behlendorf
d7f98447e7
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-02-18 16:37:26 -08:00