66769afd2f
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-10 11:28:12 -07:00
93da8b5ef7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-10 11:28:09 -07:00
35e3953aeb
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-10 11:28:01 -07:00
91225d2f7d
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-10 11:27:58 -07:00
395e661ee7
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-10 11:27:49 -07:00
e873410b9a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-10 11:27:43 -07:00
b042e5a9a0
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-10 11:27:34 -07:00
523957c53f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-10 11:27:31 -07:00
919a79a7d6
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-10 11:27:22 -07:00
e59bfd45fe
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-10 11:27:19 -07:00
63ddfcbb26
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
2009-03-10 11:27:07 -07:00
88527141d6
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-10 11:27:05 -07:00
67907f54f5
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-10 11:26:55 -07:00
e7eb4c8c7e
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-10 11:26:52 -07:00
5485d7e47f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-10 11:26:51 -07:00
933571b352
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-10 11:26:33 -07:00
36bfb764a4
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-10 11:26:30 -07:00
0f6b999d95
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-10 11:26:29 -07:00
30431b7b8d
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-10 11:26:13 -07:00
418a437230
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-10 11:26:10 -07:00
a9abdae5b6
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-10 11:26:01 -07:00
f7fafd6c0f
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-10 11:25:58 -07:00
95dd7e70cb
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-10 11:25:48 -07:00
d371636491
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-10 11:25:44 -07:00
890c27c8ff
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-10 11:25:35 -07:00
d8900392ac
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-10 11:25:33 -07:00
6897fcf756
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-10 11:25:24 -07:00
c822955b92
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-10 11:25:20 -07:00
08e37c48c7
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-10 11:25:11 -07:00
60370eb826
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-10 11:25:09 -07:00
1d6b5183d3
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
configure.ac
2009-03-10 11:22:53 -07:00
78613b45fd
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-10 11:21:03 -07:00
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
c3d57d1ec7
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-20 22:32:30 -08:00
a31814f47b
Further profile infrastructure
2009-02-20 22:27:18 -08:00
7eeec4808a
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-20 14:33:26 -08:00
4d28f29b6c
Update profile scripts with additional upcalls for fine grained profiling
2009-02-20 14:28:00 -08:00
29946892d9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 14:57:29 -08:00
ddfa570f42
Initial update to support zpios.sh profiling option.
2009-02-19 14:51:40 -08:00
43fb0282da
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 14:41:00 -08:00
d51fcd107f
Remove useless run_args->regions check which was always true
2009-02-19 14:35:41 -08:00
023a02025f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 13:58:27 -08:00
5ae73585fb
Cleanup zpios option handling
2009-02-19 13:53:17 -08:00
d3f070026f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 13:02:01 -08:00
23710f1308
Minor zpios cleanup plus addition of --nowait feature
2009-02-19 12:56:50 -08:00
d01a5802ef
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-02-18 16:40:51 -08:00
f2c0b3f2a6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-02-18 16:40:47 -08:00
fcc5bc121d
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-02-18 16:40:37 -08:00
c0fce9bde6
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-02-18 16:40:34 -08:00
8add3a726a
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-02-18 16:40:25 -08:00
Brian Behlendorf