Commit Graph

2268 Commits

Author SHA1 Message Date
Brian Behlendorf 05a46e2f68 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-10 21:40:46 -07:00
Brian Behlendorf 952e70b1a0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-10 21:40:19 -07:00
Brian Behlendorf 4911b7be4d zpios subdir should be on linux-zpios branch 2009-03-10 21:33:24 -07:00
Brian Behlendorf f65339a529 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-10 21:27:34 -07:00
Brian Behlendorf e610bf6e09 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-10 21:26:59 -07:00
Brian Behlendorf 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
Brian Behlendorf 88527141d6 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-10 11:27:05 -07:00
Brian Behlendorf 0f6b999d95 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-10 11:26:29 -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 a983057c58 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 16:38:28 -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 b57a283336 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 16:36:19 -08:00
Brian Behlendorf d53b9a34ea Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 16:36:17 -08:00
Brian Behlendorf 5c3b1a45fb Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-02-18 16:36:16 -08:00
Brian Behlendorf e6c50e7136 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-02-18 16:36:16 -08:00
Brian Behlendorf a0ef7f5826 C90 fixes int declared in for() is a C99 construct 2009-02-18 16:30:01 -08:00
Brian Behlendorf 7f52d6ee41 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 16:22:36 -08:00
Brian Behlendorf b4b7da1314 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 16:22:02 -08:00
Brian Behlendorf 6c4c486b9e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 16:20:33 -08:00
Brian Behlendorf c1d525d6e9 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 16:20:32 -08:00
Brian Behlendorf dea76734d3 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-02-18 16:20:31 -08:00
Brian Behlendorf fd9fdb78c6 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 16:20:30 -08:00
Brian Behlendorf f07954ef8a Pass 0's instead of NULL's which are the same but of the correct type 2009-02-18 16:14:20 -08:00
Brian Behlendorf 03f8c8f94b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 15:22:04 -08:00
Brian Behlendorf b878be0ee1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 15:21:35 -08:00
Brian Behlendorf 830ac5b109 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 15:20:11 -08:00
Brian Behlendorf 6f8f3b5532 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 15:20:10 -08:00
Brian Behlendorf 35b75bbb49 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-02-18 15:20:09 -08:00
Brian Behlendorf 9d4d22a26e Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 15:20:08 -08:00
Brian Behlendorf 8c228734a3 Fix cast 2009-02-18 15:15:56 -08:00
Brian Behlendorf 57d3734135 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 14:54:11 -08:00
Brian Behlendorf 6416e088cd Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 14:53:47 -08:00
Brian Behlendorf cb9f181060 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 14:52:24 -08:00
Brian Behlendorf 9fbff500ce Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 14:52:23 -08:00
Brian Behlendorf ec336d2216 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-02-18 14:52:22 -08:00
Brian Behlendorf 930c6e053c Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-02-18 14:52:21 -08:00
Brian Behlendorf eb3d5e7051 Local try should be in this patch 2009-02-18 14:47:06 -08:00
Brian Behlendorf a278e153c4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 14:35:20 -08:00
Brian Behlendorf 9f4865e4ca Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 14:34:45 -08:00
Brian Behlendorf 7872d84be6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 14:30:54 -08:00
Brian Behlendorf 623c1e1834 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-02-18 14:30:52 -08:00
Brian Behlendorf 20522feba0 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-02-18 14:30:50 -08:00
Brian Behlendorf 73942e84b1 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-02-18 14:30:49 -08:00
Brian Behlendorf 87307ab12a Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-02-18 14:30:48 -08:00
Brian Behlendorf f8e5c227fe Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-02-18 14:30:45 -08:00
Brian Behlendorf 1e606f156b Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-02-18 14:30:43 -08:00
Brian Behlendorf 4e50779f44 Merge branch 'fix-list' into refs/top-bases/fix-branch
Conflicts:

	module/zfs/arc.c
2009-02-18 14:30:38 -08:00
Brian Behlendorf dbc3a5ec55 Merge commit 'refs/top-bases/fix-list' into fix-list
Conflicts:

	module/zfs/arc.c
2009-02-18 14:29:48 -08:00
Brian Behlendorf 4cc0df153d Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2009-02-18 14:29:24 -08:00
Brian Behlendorf 3ef12f42a2 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-02-18 14:29:23 -08:00