diff options
author | Brian Behlendorf <[email protected]> | 2018-02-14 17:01:15 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2018-05-29 14:51:39 -0700 |
commit | a91258913fb597db7f409f3534512cf2249bceb6 (patch) | |
tree | 7c489b0ed42187c10046f52fe8f2e4883f884db1 /rpm | |
parent | 1149b62d20b7ed9d8ae25d5da7a06213d79b7602 (diff) |
Prepare SPL repo to merge with ZFS repo
This commit removes everything from the repository except the core
SPL implementation for Linux. Those files which remain have been
moved to non-conflicting locations to facilitate the merge.
The README.md and associated files have been updated accordingly.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'rpm')
-rw-r--r-- | rpm/Makefile.am | 1 | ||||
-rw-r--r-- | rpm/generic/.gitignore | 3 | ||||
-rw-r--r-- | rpm/generic/Makefile.am | 1 | ||||
-rw-r--r-- | rpm/generic/spl-dkms.spec.in | 94 | ||||
-rw-r--r-- | rpm/generic/spl-kmod.spec.in | 172 | ||||
-rw-r--r-- | rpm/generic/spl.spec.in | 49 | ||||
-rw-r--r-- | rpm/redhat/.gitignore | 3 | ||||
-rw-r--r-- | rpm/redhat/Makefile.am | 1 | ||||
l--------- | rpm/redhat/spl-dkms.spec.in | 1 | ||||
-rw-r--r-- | rpm/redhat/spl-kmod.spec.in | 110 | ||||
l--------- | rpm/redhat/spl.spec.in | 1 |
11 files changed, 0 insertions, 436 deletions
diff --git a/rpm/Makefile.am b/rpm/Makefile.am deleted file mode 100644 index f2cf72cef..000000000 --- a/rpm/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = generic redhat diff --git a/rpm/generic/.gitignore b/rpm/generic/.gitignore deleted file mode 100644 index 67129ff14..000000000 --- a/rpm/generic/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/spl-dkms.spec -/spl-kmod.spec -/spl.spec diff --git a/rpm/generic/Makefile.am b/rpm/generic/Makefile.am deleted file mode 100644 index da6c4abe2..000000000 --- a/rpm/generic/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = spl.spec.in spl-kmod.spec.in spl-dkms.spec.in diff --git a/rpm/generic/spl-dkms.spec.in b/rpm/generic/spl-dkms.spec.in deleted file mode 100644 index a8691d229..000000000 --- a/rpm/generic/spl-dkms.spec.in +++ /dev/null @@ -1,94 +0,0 @@ -%{?!packager: %define packager Brian Behlendorf <[email protected]>} - -%if ! 0%{?rhel}%{?fedora}%{?mageia}%{?suse_version} -%define not_rpm 1 -%endif - -%define module @PACKAGE@ -%define mkconf scripts/dkms.mkconf - -# Python permits the !/usr/bin/python shebang for scripts that are cross -# compatible between python2 and python3, but Fedora 28 does not. Fedora -# wants us to choose python3 for cross-compatible scripts. Since we want -# to support python2 and python3 users, exclude our scripts from Fedora 28's -# RPM build check, so that we don't get a bunch of build warnings. -# -# Details: https://github.com/zfsonlinux/zfs/issues/7360 -# -%global __brp_mangle_shebangs_exclude_from splslab.py - -Name: %{module}-dkms - -Version: @VERSION@ -Release: @RELEASE@%{?dist} -Summary: Kernel module(s) (dkms) - -Group: System Environment/Kernel -License: GPLv2+ -URL: http://zfsonlinux.org/ -Source0: %{module}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch - -Requires: dkms >= 2.2.0.2 -Requires: gcc, make, perl -%if 0%{?rhel}%{?fedora}%{?mageia}%{?suse_version} -Requires: kernel-devel -%endif -Provides: %{module}-kmod = %{version} - -%description -This package contains the dkms kernel modules required to emulate -several interfaces provided by the Solaris kernel. - -%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 -CONFIG_H="/var/lib/dkms/%{module}/%{version}/*/*/%{module}_config.h" -SPEC_META_ALIAS="@PACKAGE@-@VERSION@-@RELEASE@" -DKMS_META_ALIAS=`cat $CONFIG_H 2>/dev/null | - awk -F'"' '/META_ALIAS/ { print $2; exit 0 }'` -if [ "$SPEC_META_ALIAS" = "$DKMS_META_ALIAS" ]; then - echo -e - echo -e "Uninstall of %{module} module ($SPEC_META_ALIAS) beginning:" - dkms remove -m %{module} -v %{version} --all %{!?not_rpm:--rpm_safe_upgrade} -fi -exit 0 - -%changelog -* %(date "+%a %b %d %Y") %packager %{version}-%{release} -- Automatic build by DKMS diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in deleted file mode 100644 index c33c25069..000000000 --- a/rpm/generic/spl-kmod.spec.in +++ /dev/null @@ -1,172 +0,0 @@ -%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_log -%bcond_with debug_kmem -%bcond_with debug_kmem_tracking -%bcond_with atomic_spinlocks - - -Name: %{module}-kmod - -Version: @VERSION@ -Release: @RELEASE@%{?dist} -Summary: Kernel module(s) - -Group: System Environment/Kernel -License: GPLv2+ -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 - -# LDFLAGS are not sanitized by arch/*/Makefile for these architectures. -%ifarch ppc ppc64 ppc64le aarch64 -%global __global_ldflags %{nil} -%endif - -%if 0%{?fedora} >= 17 -%define prefix /usr -%endif - -# Kmodtool does its magic here. A patched version of kmodtool is shipped -# because the latest versions may not be available for your distribution. -# 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 kernel modules required to emulate -several interfaces provided by the Solaris kernel. - -%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_log} - %define debug_log --enable-debug-log -%else - %define debug_log --disable-debug-log -%endif - -%if %{with debug_kmem} - %define debug_kmem --enable-debug-kmem -%else - %define debug_kmem --disable-debug-kmem -%endif - -%if %{with debug_kmem_tracking} - %define debug_kmem_tracking --enable-debug-kmem-tracking -%else - %define debug_kmem_tracking --disable-debug-kmem-tracking -%endif - -%if %{with atomic_spinlocks} - %define atomic_spinlocks --enable-atomic-spinlocks -%else - %define atomic_spinlocks --disable-atomic-spinlocks -%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 - %{debug} \ - %{debug_log} \ - %{debug_kmem} \ - %{debug_kmem_tracking} \ - %{atomic_spinlocks} - 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 - -# find-debuginfo.sh only considers executables -chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/* -%{?akmod_install} - - -%clean -rm -rf $RPM_BUILD_ROOT - -%changelog -* Wed Jul 26 2017 Brian Behlendorf <[email protected]> - 0.7.0-1 -- Released 0.7.0-1, detailed release notes are available at: -- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.0 diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in deleted file mode 100644 index 7ba71fd58..000000000 --- a/rpm/generic/spl.spec.in +++ /dev/null @@ -1,49 +0,0 @@ -# Python permits the !/usr/bin/python shebang for scripts that are cross -# compatible between python2 and python3, but Fedora 28 does not. Fedora -# wants us to choose python3 for cross-compatible scripts. Since we want -# to support python2 and python3 users, exclude our scripts from Fedora 28's -# RPM build check, so that we don't get a bunch of build warnings. -# -# Details: https://github.com/zfsonlinux/zfs/issues/7360 -# -%global __brp_mangle_shebangs_exclude_from splslab.py - -Name: @PACKAGE@ -Version: @VERSION@ -Release: @RELEASE@%{?dist} -Summary: Commands to control the kernel modules - -Group: System Environment/Kernel -License: GPLv2+ -URL: http://zfsonlinux.org/ -Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: %{name}-kmod = %{version} -Provides: %{name}-kmod-common = %{version} - -%description -This package contains the commands to verify the SPL -kernel modules are functioning properly. - -%prep -%setup -q - -%build -%configure --with-config=user -make %{?_smp_mflags} - -%install -%{__rm} -rf $RPM_BUILD_ROOT -make install DESTDIR=%{?buildroot} - -%files -%doc AUTHORS COPYING DISCLAIMER -%{_bindir}/* -%{_sbindir}/* -%{_mandir}/man1/* -%{_mandir}/man5/* - -%changelog -* Wed Jul 26 2017 Brian Behlendorf <[email protected]> - 0.7.0-1 -- Released 0.7.0-1, detailed release notes are available at: -- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.0 diff --git a/rpm/redhat/.gitignore b/rpm/redhat/.gitignore deleted file mode 100644 index 67129ff14..000000000 --- a/rpm/redhat/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/spl-dkms.spec -/spl-kmod.spec -/spl.spec diff --git a/rpm/redhat/Makefile.am b/rpm/redhat/Makefile.am deleted file mode 100644 index da6c4abe2..000000000 --- a/rpm/redhat/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = spl.spec.in spl-kmod.spec.in spl-dkms.spec.in diff --git a/rpm/redhat/spl-dkms.spec.in b/rpm/redhat/spl-dkms.spec.in deleted file mode 120000 index 900f524aa..000000000 --- a/rpm/redhat/spl-dkms.spec.in +++ /dev/null @@ -1 +0,0 @@ -../generic/spl-dkms.spec.in
\ No newline at end of file diff --git a/rpm/redhat/spl-kmod.spec.in b/rpm/redhat/spl-kmod.spec.in deleted file mode 100644 index 4e2a9f955..000000000 --- a/rpm/redhat/spl-kmod.spec.in +++ /dev/null @@ -1,110 +0,0 @@ -%bcond_with debug -%bcond_with debug_log -%bcond_with debug_kmem -%bcond_with debug_kmem_tracking -%bcond_with atomic_spinlocks - -Name: @PACKAGE@-kmod -Version: @VERSION@ -Release: @RELEASE@%{?dist} - -Summary: Kernel module(s) -Group: System Environment/Kernel -License: GPLv2+ -URL: http://zfsonlinux.org/ -BuildRequires: %kernel_module_package_buildreqs -Source0: @PACKAGE@-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# Additional dependency information for the kmod sub-package must be specified -# by generating a preamble text file which kmodtool can append to the spec file. -%(/bin/echo -e "\ -Requires: @PACKAGE@ = %{version}\n\ -Conflicts: @PACKAGE@-dkms\n\n" > %{_sourcedir}/kmod-preamble) - -# LDFLAGS are not sanitized by arch/*/Makefile for these architectures. -%ifarch ppc ppc64 ppc64le aarch64 -%global __global_ldflags %{nil} -%endif - -%description -This package contains the kernel modules required to emulate -several interfaces provided by the Solaris kernel. - -%define kmod_name spl - -%kernel_module_package -n %{kmod_name} -p %{_sourcedir}/kmod-preamble - -%define ksrc %{_usrsrc}/kernels/%{kverrel} -%define kobj %{ksrc} - -%package -n kmod-%{kmod_name}-devel -Summary: SPL kernel module(s) devel common -Group: System Environment/Kernel - -%description -n kmod-%{kmod_name}-devel -This package provides the header files and objects to build kernel modules -which depend on the SPL kernel module. - -%prep -if ! [ -d "%{ksrc}" ]; then - echo "Kernel build directory isn't set properly, cannot continue" - exit 1 -fi - -%if %{with debug} -%define debug --enable-debug -%else -%define debug --disable-debug -%endif - -%if %{with debug_log} -%define debug_log --enable-debug-log -%else -%define debug_log --disable-debug-log -%endif - -%if %{with debug_kmem} -%define debug_kmem --enable-debug-kmem -%else -%define debug_kmem --disable-debug-kmem -%endif - -%if %{with debug_kmem_tracking} -%define debug_kmem_tracking --enable-debug-kmem-tracking -%else -%define debug_kmem_tracking --disable-debug-kmem-tracking -%endif - -%if %{with atomic_spinlocks} -%define atomic_spinlocks --enable-atomic-spinlocks -%else -%define atomic_spinlocks --disable-atomic-spinlocks -%endif - -%setup -n %{kmod_name}-%{version} -%build -%configure \ - --with-config=kernel \ - --with-linux=%{ksrc} \ - --with-linux-obj=%{kobj} \ - %{debug} \ - %{debug_log} \ - %{debug_kmem} \ - %{debug_kmem_tracking} \ - %{atomic_spinlocks} -make %{?_smp_mflags} - -%install -make install \ - DESTDIR=${RPM_BUILD_ROOT} \ - INSTALL_MOD_DIR=extra/%{kmod_name} -%{__rm} -f %{buildroot}/lib/modules/%{kverrel}/modules.* -# find-debuginfo.sh only considers executables -%{__chmod} u+x %{buildroot}/lib/modules/%{kverrel}/extra/*/*/* - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -n kmod-%{kmod_name}-devel -%{_usrsrc}/%{kmod_name}-%{version} diff --git a/rpm/redhat/spl.spec.in b/rpm/redhat/spl.spec.in deleted file mode 120000 index d3276f013..000000000 --- a/rpm/redhat/spl.spec.in +++ /dev/null @@ -1 +0,0 @@ -../generic/spl.spec.in
\ No newline at end of file |