diff --git a/META b/META index a65dc29e0694..4b8a111e38f4 100644 --- a/META +++ b/META @@ -1,8 +1,8 @@ Meta: 1 Name: zfs Branch: 1.0 -Version: 0.6.1 +Version: 0.6.2 Release: 1 Release-Tags: relext License: CDDL Author: Sun Microsystems/Oracle, Lawrence Livermore National Laboratory diff --git a/rpm/generic/zfs-dkms.spec.in b/rpm/generic/zfs-dkms.spec.in index c758baaad498..a4b0b36ca733 100644 --- a/rpm/generic/zfs-dkms.spec.in +++ b/rpm/generic/zfs-dkms.spec.in @@ -1,72 +1,74 @@ %define module @PACKAGE@ %define mkconf scripts/dkms.mkconf Name: %{module}-dkms Version: @VERSION@ Release: @RELEASE@%{?dist} Summary: Kernel module(s) (dkms) Group: System Environment/Kernel License: @ZFS_META_LICENSE@ URL: http://zfsonlinux.org/ Source0: %{module}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if 0%{?dkms_version:1} Requires: dkms = %{dkms_version} %else Requires: dkms >= 2.2.0.2 %endif Requires: spl-dkms = %{version} Requires: gcc, make, perl Requires: kernel-devel Provides: %{module}-kmod = %{version} %description This package contains the dkms ZFS kernel modules. %prep %setup -q -n %{module}-%{version} %build %{mkconf} -n %{module} -v %{version} -f dkms.conf %install if [ "$RPM_BUILD_ROOT" != "/" ]; then rm -rf $RPM_BUILD_ROOT fi mkdir -p $RPM_BUILD_ROOT/usr/src/ cp -rf ${RPM_BUILD_DIR}/%{module}-%{version} $RPM_BUILD_ROOT/usr/src/ %clean if [ "$RPM_BUILD_ROOT" != "/" ]; then rm -rf $RPM_BUILD_ROOT fi %files %defattr(-,root,root) /usr/src/%{module}-%{version} %post for POSTINST in /usr/lib/dkms/common.postinst; do if [ -f $POSTINST ]; then $POSTINST %{module} %{version} exit $? fi echo "WARNING: $POSTINST does not exist." done echo -e "ERROR: DKMS version is too old and %{module} was not" echo -e "built with legacy DKMS support." echo -e "You must either rebuild %{module} with legacy postinst" echo -e "support or upgrade DKMS to a more current version." exit 1 %preun dkms remove -m %{module} -v %{version} --all --rpm_safe_upgrade exit 0 %changelog +* Wed Aug 21 2013 Brian Behlendorf - 0.6.2-1 +- Released 0.6.2-1 * Fri Mar 22 2013 Brian Behlendorf - 0.6.1-1 - First official stable release. diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in index 2ea4bcb0badd..4eb25e02b9f1 100644 --- a/rpm/generic/zfs-kmod.spec.in +++ b/rpm/generic/zfs-kmod.spec.in @@ -1,170 +1,172 @@ %define module @PACKAGE@ #define repo rpmfusion #define repo chaos # (un)define the next line to either build for the newest or all current kernels %define buildforkernels newest #define buildforkernels current #define buildforkernels akmod %bcond_with debug %bcond_with debug_dmu_tx Name: %{module}-kmod Version: @VERSION@ Release: @RELEASE@%{?dist} Summary: Kernel module(s) Group: System Environment/Kernel License: @ZFS_META_LICENSE@ URL: http://zfsonlinux.org/ Source0: %{module}-%{version}.tar.gz Source10: kmodtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n) # The developments headers will conflict with the dkms packages. Conflicts: %{module}-dkms %if %{defined repo} # Building for a repository use the proper build-sysbuild package # to determine which kernel-devel packages should be installed. BuildRequires: %{_bindir}/kmodtool %{!?kernels:BuildRequires: buildsys-build-%{repo}-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu}} %else # Building local packages attempt to to use the installed kernel. %{?rhel:BuildRequires: kernel-devel} %{?fedora:BuildRequires: kernel-devel} %{?suse_version:BuildRequires: kernel-source} %if !%{defined kernels} && !%{defined build_src_rpm} %if 0%{?rhel}%{?fedora}%{?suse_version} %define kernels %(ls -1 /usr/src/kernels) %else %define kernels %(ls -1 /lib/modules) %endif %endif %endif %if 0%{?rhel}%{?fedora}%{?suse_version} BuildRequires: kmod-spl-devel = %{version} %global KmodsRequires kmod-spl %global KmodsDevelRequires kmod-spl-devel %global KmodsMetaRequires spl-kmod %endif %if 0%{?fedora} >= 17 %define prefix /usr %endif # Kmodtool does its magic here. A patched version of kmodtool is shipped # with the source rpm until kmod development packages are supported upstream. # https://bugzilla.rpmfusion.org/show_bug.cgi?id=2714 %{expand:%(bash %{SOURCE10} --target %{_target_cpu} %{?repo:--repo %{?repo}} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} --devel %{?prefix:--prefix "%{?prefix}"} %{?kernels:--for-kernels "%{?kernels}"} %{?kernelbuildroot:--buildroot "%{?kernelbuildroot}"} 2>/dev/null) } %description This package contains the ZFS kernel modules. %prep # Error out if there was something wrong with kmodtool. %{?kmodtool_check} # Print kmodtool output for debugging purposes: bash %{SOURCE10} --target %{_target_cpu} %{?repo:--repo %{?repo}} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} --devel %{?prefix:--prefix "%{?prefix}"} %{?kernels:--for-kernels "%{?kernels}"} %{?kernelbuildroot:--buildroot "%{?kernelbuildroot}"} 2>/dev/null %if %{with debug} %define debug --enable-debug %else %define debug --disable-debug %endif %if %{with debug_dmu_tx} %define debug_dmu_tx --enable-debug-dmu-tx %else %define debug_dmu_tx --disable-debug-dmu-tx %endif # # Allow the overriding of spl locations # %if %{defined require_splver} %define splver %{require_splver} %else %define splver %{version} %endif %if %{defined require_spldir} %define spldir %{require_spldir} %else %define spldir %{_usrsrc}/spl-%{splver} %endif %if %{defined require_splobj} %define splobj %{require_splobj} %else %define splobj %{spldir}/${kernel_version%%___*} %endif # Leverage VPATH from configure to avoid making multiple copies. %define _configure ../%{module}-%{version}/configure %setup -q -c -T -a 0 for kernel_version in %{?kernel_versions}; do %{__mkdir} _kmod_build_${kernel_version%%___*} done %build for kernel_version in %{?kernel_versions}; do cd _kmod_build_${kernel_version%%___*} %configure \ --with-config=kernel \ %if 0%{?rhel}%{?fedora} --with-linux="${kernel_version##*___}" \ --with-linux-obj="${kernel_version##*___}" \ %else --with-linux="$( \ if [ -e "/lib/modules/${kernel_version%%___*}/source" ]; then \ echo "/lib/modules/${kernel_version%%___*}/source"; \ else \ echo "/lib/modules/${kernel_version%%___*}/build"; \ fi)" \ --with-linux-obj="/lib/modules/${kernel_version%%___*}/build" \ %endif --with-spl="%{spldir}" \ --with-spl-obj="%{splobj}" \ %{debug} \ %{debug_dmu_tx} make %{?_smp_mflags} cd .. done %install rm -rf ${RPM_BUILD_ROOT} # Relies on the kernel 'modules_install' make target. for kernel_version in %{?kernel_versions}; do cd _kmod_build_${kernel_version%%___*} make install \ DESTDIR=${RPM_BUILD_ROOT} \ %{?prefix:INSTALL_MOD_PATH=%{?prefix}} \ INSTALL_MOD_DIR=%{kmodinstdir_postfix} cd .. done chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/* %{?akmod_install} %clean rm -rf $RPM_BUILD_ROOT %changelog +* Wed Aug 21 2013 Brian Behlendorf - 0.6.2-1 +- Released 0.6.2-1 * Fri Mar 22 2013 Brian Behlendorf - 0.6.1-1 - First official stable release. diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in index c832404a691e..0797124793f5 100644 --- a/rpm/generic/zfs.spec.in +++ b/rpm/generic/zfs.spec.in @@ -1,157 +1,159 @@ %global _sbindir /sbin %global _libdir /%{_lib} %if 0%{?fedora} >= 17 %global _udevdir %{_prefix}/lib/udev %global _dracutdir %{_prefix}/lib/dracut %else %global _udevdir /lib/udev %global _dracutdir /lib/dracut %endif %bcond_with debug %bcond_with blkid %bcond_with selinux Name: @PACKAGE@ Version: @VERSION@ Release: @RELEASE@%{?dist} Summary: Commands to control the kernel modules and libraries Group: System Environment/Kernel License: @ZFS_META_LICENSE@ URL: http://zfsonlinux.org/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 i686 x86_64 # May build but untested on ppc/ppc64 ExcludeArch: ppc ppc64 Requires: spl = %{version} Requires: %{name}-kmod >= %{version} Provides: %{name}-kmod-common = %{version} %if 0%{?rhel}%{?fedora}%{?suse_version} BuildRequires: zlib-devel BuildRequires: libuuid-devel %if %{with blkid} BuildRequires: libblkid-devel %endif %if %{with selinux} BuildRequires: libselinux-devel %endif %endif %description This package contains the ZFS command line utilities and libraries. %package devel Summary: Development headers Group: System Environment/Kernel Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains the header files needed for building additional applications against the ZFS libraries. %package test Summary: Test infrastructure Group: System Environment/Kernel Requires: %{name}%{?_isa} = %{version}-%{release} Requires: parted Requires: lsscsi Requires: mdadm Requires: bc %description test This package contains test infrastructure and support scripts for validating the file system. %package dracut Summary: Dracut module Group: System Environment/Kernel Requires: %{name}%{?_isa} = %{version}-%{release} Requires: dracut %description dracut This package contains a dracut module used to construct an initramfs image which is ZFS aware. %prep %if %{with debug} %define debug --enable-debug %else %define debug --disable-debug %endif %if %{with blkid} %define blkid --with-blkid %else %define blkid --without-blkid %endif %if %{with selinux} %define selinux --with-selinux %else %define selinux --without-selinux %endif %setup -q %build %configure \ --with-config=user \ --with-udevdir=%{_udevdir} \ --with-dracutdir=%{_dracutdir} \ --disable-static \ %{debug} \ %{blkid} \ %{selinux} make %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT make install DESTDIR=%{?buildroot} find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \; %post /sbin/ldconfig [ -x /sbin/chkconfig ] && /sbin/chkconfig --add zfs exit 0 %preun if [ $1 -eq 0 ] ; then [ -x /sbin/chkconfig ] && /sbin/chkconfig --del zfs fi exit 0 %postun -p /sbin/ldconfig %files %doc AUTHORS COPYRIGHT DISCLAIMER %doc OPENSOLARIS.LICENSE README.markdown %{_sbindir}/* %{_bindir}/* %{_libdir}/*.so.1* %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* %{_udevdir}/vdev_id %{_udevdir}/zvol_id %{_udevdir}/rules.d/* %config(noreplace) %{_sysconfdir}/%{name} %{_sysconfdir}/init.d/* %files devel %{_libdir}/*.so %{_includedir}/* %files test %{_datadir}/%{name} %files dracut %doc dracut/README.dracut.markdown %{_dracutdir}/modules.d/* %changelog +* Wed Aug 21 2013 Brian Behlendorf - 0.6.2-1 +- Released 0.6.2-1 * Fri Mar 22 2013 Brian Behlendorf - 0.6.1-1 - First official stable release.