Linux 5.0 compat: ASM_BUG macro

[mirror_zfs.git] / scripts / kmodtool

diff --git a/scripts/kmodtool b/scripts/kmodtool
index 852ade021d3c8a509deb929e6ca8872875e128f9..27a14cdac23a8e1a381953c5a505485148df1b09 100755 (executable)
--- a/scripts/kmodtool
+++ b/scripts/kmodtool
@@ -64,7 +64,7 @@ print_akmodtemplate ()
        cat <<EOF
 
 %global akmod_install mkdir -p \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/; \\\
-rpmbuild --define "_sourcedir %{_sourcedir}" \\\
+LANG=C rpmbuild --define "_sourcedir %{_sourcedir}" \\\
 --define "_srcrpmdir \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/" \\\
 -bs --nodeps %{_specdir}/%{name}.spec ; \\\
 ln -s \$(ls \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/) \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/${kmodname}-kmod.latest
@@ -237,10 +237,16 @@ the ${kmodname}-devel-<kernel> objects for the newest kernel.
 %defattr(644,root,root,755)
 %{_usrsrc}/${kmodname}-%{version}
 EOF
+       if [[ ${obsolete_name} ]]; then
+               echo "%{_usrsrc}/${obsolete_name}-%{version}"
+       fi
 
        for kernel in ${1}; do
                local kernel_uname_r=${kernel}
                echo "%exclude %{_usrsrc}/${kmodname}-%{version}/${kernel_uname_r}"
+               if [[ ${obsolete_name} ]]; then
+                       echo "%exclude %{_usrsrc}/${obsolete_name}-%{version}/${kernel_uname_r}"
+               fi
        done
 
        echo
@@ -295,9 +301,10 @@ kernel ${kernel_uname_r} for the %{_target_cpu} family of processors.
 %files        -n kmod-${kmodname}-devel-${kernel_uname_r}
 %defattr(644,root,root,755)
 %{_usrsrc}/${kmodname}-%{version}/${kernel_uname_r}
-
-
 EOF
+       if [[ ${obsolete_name} ]]; then
+               echo "%{_usrsrc}/${obsolete_name}-%{version}/${kernel_uname_r}"
+       fi
 }
 
 print_rpmtemplate_kmodmetapkg ()