summaryrefslogtreecommitdiffstats
path: root/rpm
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2017-08-15 17:26:38 -0700
committerGitHub <[email protected]>2017-08-15 17:26:38 -0700
commitc8f9061fc714696a53cf4d14a4567f0a83dbf862 (patch)
tree42e8a39488899046384f9bb5e350032f438a3ae4 /rpm
parent70322be8dc160f003fa95e034462ad625b325568 (diff)
Retire legacy test infrastructure
* Removed zpios kmod, utility, headers and man page. * Removed unused scripts zpios-profile/*, zpios-test/*, zpool-config/*, smb.sh, zpios-sanity.sh, zpios-survey.sh, zpios.sh, and zpool-create.sh. * Removed zfs-script-config.sh.in. When building 'make' generates a common.sh with in-tree path information from the common.sh.in template. This file and sourced by the test scripts and used for in-tree testing, it is not included in the packages. When building packages 'make install' uses the same template to create a new common.sh which is appropriate for the packaging. * Removed unused functions/variables from scripts/common.sh.in. Only minimal path information and configuration environment variables remain. * Removed unused scripts from scripts/ directory. * Remaining shell scripts in the scripts directory updated to cleanly pass shellcheck and added to checked scripts. * Renamed tests/test-runner/cmd/ to tests/test-runner/bin/ to match install location name. * Removed last traces of the --enable-debug-dmu-tx configure options which was retired some time ago. Reviewed-by: Giuseppe Di Natale <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #6509
Diffstat (limited to 'rpm')
-rw-r--r--rpm/generic/zfs-kmod.spec.in10
-rw-r--r--rpm/redhat/zfs-kmod.spec.in10
2 files changed, 2 insertions, 18 deletions
diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in
index 4518dc954..22882627b 100644
--- a/rpm/generic/zfs-kmod.spec.in
+++ b/rpm/generic/zfs-kmod.spec.in
@@ -37,7 +37,6 @@
#define buildforkernels akmod
%bcond_with debug
-%bcond_with debug_dmu_tx
Name: %{module}-kmod
@@ -117,12 +116,6 @@ bash %{SOURCE10} --target %{_target_cpu} %{?repo:--repo %{?repo}} --kmodname %{
%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
#
@@ -163,8 +156,7 @@ for kernel_version in %{?kernel_versions}; do
--with-linux-obj=%{kobj} \
--with-spl="%{spldir}" \
--with-spl-obj="%{splobj}" \
- %{debug} \
- %{debug_dmu_tx}
+ %{debug}
make %{?_smp_mflags}
cd ..
done
diff --git a/rpm/redhat/zfs-kmod.spec.in b/rpm/redhat/zfs-kmod.spec.in
index 26d5b6054..aedd88eb4 100644
--- a/rpm/redhat/zfs-kmod.spec.in
+++ b/rpm/redhat/zfs-kmod.spec.in
@@ -1,5 +1,4 @@
%bcond_with debug
-%bcond_with debug_dmu_tx
Name: @PACKAGE@-kmod
Version: @VERSION@
@@ -59,12 +58,6 @@ fi
%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
-
%setup -n %{kmod_name}-%{version}
%build
%configure \
@@ -73,8 +66,7 @@ fi
--with-linux-obj=%{kobj} \
--with-spl="%{splsrc}" \
--with-spl-obj="%{splobj}" \
- %{debug} \
- %{debug_dmu_tx}
+ %{debug}
make %{?_smp_mflags}
%install