Fix kmodtool for packaging mainline Linux

[mirror_zfs.git] / scripts / kmodtool

diff --git a/scripts/kmodtool b/scripts/kmodtool
index 6eea8fe50f315f2aeea3fdc8f516feb7b594f76b..0d6af2c7f1d1abff0284779fce704af077567ff7 100755 (executable)
--- a/scripts/kmodtool
+++ b/scripts/kmodtool
@@ -333,36 +333,36 @@ print_customrpmtemplate ()
 {
        for kernel in ${1}
        do
-               if [[ -e "${buildroot}/usr/src/kernels/${kernel}" ]] ; then
-                       # this looks like a Fedora/RH kernel -- print a normal template (which includes the proper BR) and be happy :)
-                       kernel_versions="${kernel_versions}${kernel}___${buildroot}%{_usrsrc}/kernels/${kernel} "
+               if [[ -e "${prefix}/lib/modules/${kernel}/build/Makefile" ]]; then
+                       # likely a user-build-kernel with available buildfiles
+                       # fixme: we should check if uname from Makefile is the same as ${kernel}
 
-                       # parse kernel versions string and print template
-                       local kernel_verrelarch=${kernel%%${kernels_known_variants}}
-                       print_rpmtemplate_per_kmodpkg --redhat ${kernel} ${kernel##${kernel_verrelarch}}
+                       kernel_versions="${kernel_versions}${kernel}___${prefix}/lib/modules/${kernel}/build/ "
+                       print_rpmtemplate_per_kmodpkg --custom "${kernel}"
 
                        # create development package
                        if [[ -n "${devel}" ]]; then
                                # create devel package including common headers
-                               print_rpmtemplate_kmoddevelpkg --redhat ${kernel} ${kernel##${kernel_verrelarch}}
+                               print_rpmtemplate_kmoddevelpkg --custom "${kernel}"
 
                                # create devel package
-                               print_rpmtemplate_per_kmoddevelpkg --redhat ${kernel} ${kernel##${kernel_verrelarch}}
+                               print_rpmtemplate_per_kmoddevelpkg --custom "${kernel}"
                        fi
-               elif [[ -e "${prefix}/lib/modules/${kernel}/build/Makefile" ]]; then
-                       # likely a user-build-kernel with available buildfiles
-                       # fixme: we should check if uname from Makefile is the same as ${kernel}
+               elif [[ -e "${buildroot}/usr/src/kernels/${kernel}" ]]; then
+                       # this looks like a Fedora/RH kernel -- print a normal template (which includes the proper BR) and be happy :)
+                       kernel_versions="${kernel_versions}${kernel}___${buildroot}%{_usrsrc}/kernels/${kernel} "
 
-                       kernel_versions="${kernel_versions}${kernel}___${prefix}/lib/modules/${kernel}/build/ "
-                       print_rpmtemplate_per_kmodpkg --custom "${kernel}"
+                       # parse kernel versions string and print template
+                       local kernel_verrelarch=${kernel%%${kernels_known_variants}}
+                       print_rpmtemplate_per_kmodpkg --redhat ${kernel} ${kernel##${kernel_verrelarch}}
 
                        # create development package
                        if [[ -n "${devel}" ]]; then
                                # create devel package including common headers
-                               print_rpmtemplate_kmoddevelpkg --custom "${kernel}"
+                               print_rpmtemplate_kmoddevelpkg --redhat ${kernel} ${kernel##${kernel_verrelarch}}
 
                                # create devel package
-                               print_rpmtemplate_per_kmoddevelpkg --custom "${kernel}"
+                               print_rpmtemplate_per_kmoddevelpkg --redhat ${kernel} ${kernel##${kernel_verrelarch}}
                        fi
                else
                        error_out 2 "Don't know how to handle ${kernel} -- ${prefix}/lib/modules/${kernel}/build/Makefile not found"