Commit Graph

2417 Commits

Author SHA1 Message Date
Brian Behlendorf b095bf444a Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
Conflicts:

	cmd/zfs/zfs_main.c
	lib/libzfs/libzfs_dataset.c
2009-07-02 16:50:53 -07:00
Brian Behlendorf e2b2597751 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	cmd/zdb/zdb_il.c
	cmd/zfs/zfs_main.c
	cmd/zinject/zinject.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_graph.c
	module/zcommon/include/sys/fm/fs/zfs.h
	module/zcommon/include/zfs_deleg.h
	module/zcommon/include/zfs_namecheck.h
	module/zcommon/zfs_deleg.c
	module/zcommon/zfs_namecheck.c
	module/zcommon/zprop_common.c
	module/zfs/arc.c
	module/zfs/dmu.c
	module/zfs/dmu_object.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_pool.c
	module/zfs/dsl_prop.c
	module/zfs/fletcher.c
	module/zfs/include/sys/dsl_deleg.h
	module/zfs/include/sys/dsl_prop.h
	module/zfs/include/sys/metaslab_impl.h
	module/zfs/include/sys/spa_boot.h
	module/zfs/include/sys/zap.h
	module/zfs/include/sys/zap_impl.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ctldir.h
	module/zfs/include/sys/zfs_dir.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/spa.c
	module/zfs/spa_errlog.c
	module/zfs/spa_history.c
	module/zfs/zap.c
	module/zfs/zap_leaf.c
	module/zfs/zap_micro.c
	module/zfs/zfs_ioctl.c
	module/zfs/zio.c
2009-07-02 16:49:11 -07:00
Brian Behlendorf e9f14862a5 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/dmu_objset.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/vdev_label.c
	module/zfs/zio.c
2009-07-02 16:18:03 -07:00
Brian Behlendorf 9babb37438 Rebase master to b117 2009-07-02 15:44:48 -07:00
Brian Behlendorf 4ced1b2940 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-02 14:01:53 -07:00
Brian Behlendorf 6187d3100e Update ChangeLog 2009-07-02 13:56:29 -07:00
Brian Behlendorf 147cf2a952 Update zfs-module rependencies to require spl-modules 2009-07-02 13:29:33 -07:00
Brian Behlendorf cc9b909ad8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-02 10:51:46 -07:00
Brian Behlendorf f984d28e0c Cleanly handle --with-linux=NONE and --with-spl=NONE options
when used to generate source rpms.  These should not be fatal
because we actually don't need them until we build the source
rpm.  When doing mock build this is important because these
dependent rpms will only be installed if they are specificed
in the source rpms spec file.
2009-07-02 10:44:43 -07:00
Brian Behlendorf f8a752ed10 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-01 14:41:45 -07:00
Brian Behlendorf 6e50f53cb1 Drop --with-linux and --with-spl options from user build. 2009-07-01 14:35:38 -07:00
Brian Behlendorf 49333d5f0c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-01 12:57:03 -07:00
Brian Behlendorf 01ff9d82d5 Install zfs_config, zfs_unconfig, symbols in to correct location.
Provide a zfs.release file as part of the package.
2009-07-01 12:51:06 -07:00
Brian Behlendorf 518b58f35b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-01 11:11:05 -07:00
Brian Behlendorf 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
Brian Behlendorf 2f78fd9b7f Merge commit 'refs/remotes/origin/linux-legacy' into HEAD 2009-06-26 14:35:20 -07:00
Brian Behlendorf 4fbded409d Merge commit '0f1012be0aeb6f5f27966c80321db79a9b1aaec3' into zfs-branch 2009-06-26 14:33:53 -07:00
Brian Behlendorf 137276e3c9 Should be powerpc64 not powerpc (powerpc is unsupported) 2009-06-26 14:29:42 -07:00
Brian Behlendorf 14f84d58a3 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-06-09 16:30:53 -07:00
Brian Behlendorf 0f1012be0a Add basic zlib autoconf check for user space build. 2009-06-09 16:09:17 -07:00
Brian Behlendorf 688bb363bf Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-06-09 14:45:23 -07:00
Brian Behlendorf 999035eb32 Only powerpc64 is currently supported not powerpc. 2009-06-09 14:20:44 -07:00
Brian Behlendorf 6892ef3f71 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-06-08 16:28:29 -07:00
Brian Behlendorf 9c347d872f Core target arch support for conditional compilation of SUBDIRs
which is used by libspl for it's arch specific atomic implementations.
2009-06-08 16:07:43 -07:00
Brian Behlendorf 03596fda14 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-06-08 12:21:55 -07:00
Brian Behlendorf 4253416b7d Refresh for consistency with COPYRIGHT 2009-06-08 11:59:13 -07:00
Brian Behlendorf e65efcc139 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-06-08 11:25:25 -07:00
Brian Behlendorf e8880abb13 Readd accidentally dropped COPYRIGHT, it just references the
OPENSOLARIS.LICENSE but it should still be in place.
2009-06-08 11:01:13 -07:00
Brian Behlendorf 16627ea0a0 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-05-22 16:38:00 -07:00
Brian Behlendorf e1d6e67473 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-05-22 16:36:23 -07:00
Brian Behlendorf 9c53917bd5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-05-22 16:36:23 -07:00
Brian Behlendorf 9c59a63d91 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-05-22 16:36:22 -07:00
Brian Behlendorf e56aa929e8 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-05-22 16:36:22 -07:00
Brian Behlendorf 8e9605062a Explictly use signed char for portability. On x86/x86_64
systems the default char type is signed, on ppc/ppc64 systems
the default char type is unsigned.
2009-05-22 16:30:47 -07:00
Brian Behlendorf 9b59ef7362 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-05-22 14:56:27 -07:00
Brian Behlendorf 119a28815f - Update build system to SPL_META_VERSION not VERSION.
- ZFS_LINUX_COMPILE_IFELSE drop explicit CC and force the kernel build
  system to set it this ensure -m64 is set only when appropriate.
2009-05-22 14:49:41 -07:00
Brian Behlendorf 5dc4cffe10 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-05-22 09:38:42 -07:00
Brian Behlendorf d855b57b7c SLES Fixes (Part 1):
- ZFS_AC_KERNEL updated to exclude -obj entries in /usr/src/ when
  attempting to automatically detect your kernel source.
- ZFS_AC_KERNEL check for *-obj directory when attempting to
  detect the objects for your kernel source.
- ZFS_AC_SPL updated to additionally check for Modules.symvers build
  product.  This seems to be specific to SLES system, for Vanilla,
  Fedora, RHEL, and Chaos kernels the symbol file is just called
  Module.symvers.
- ZFS_CHECK_SYMBOL_EXPORT also should also check the exported SPL
  symbols in addition to the exported core kernel systems.
2009-05-22 09:26:36 -07:00
Brian Behlendorf 4b46edf2a8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-20 14:39:13 -07:00
Brian Behlendorf d83c361158 Prep for zfs-0.4.3 tag (Fix spelling) 2009-03-20 14:28:17 -07:00
Brian Behlendorf c9a81ade25 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-20 14:23:26 -07:00
Brian Behlendorf a7da34e996 Prep for zfs-0.4.3 tag 2009-03-20 14:11:49 -07:00
Brian Behlendorf c146703cee Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-20 09:32:19 -07:00
Brian Behlendorf f53e5a851d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-20 09:29:22 -07:00
Brian Behlendorf 0c88bc3ccd Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-03-20 09:29:21 -07:00
Brian Behlendorf fe77fb7907 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-03-20 09:29:17 -07:00
Brian Behlendorf 9476bd93ca Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-03-20 09:29:17 -07:00
Brian Behlendorf 13814fe220 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-03-20 09:29:16 -07:00
Brian Behlendorf 99da5f93e8 Fix uninitialized variable error in ztest_dmu_commit_callbacks() 2009-03-20 09:20:49 -07:00
Brian Behlendorf acf89e041b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-19 21:31:17 -07:00