Packaging improvements for RHEL and SLES (part 2)

- Allow checking for exported symbols in both Module.symvers
  and Module.symvers.  My stock SLES kernel ships an objects
  directory with Module.symvers, yet produces a Module.symvers
  in the local build directory.

diff --git a/Makefile.am b/Makefile.am
index c0a4a6b65c909cd7a7efbda408724d21592f3ed5..b7aed778e56c171e4f9b725fc0640d4e44ffddcf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,12 +12,12 @@ distclean-local::
                -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
                -o -name '.*.rej' -o -name 'aclocal.m4' -o -size 0 \
                -o -name '*%' -o -name '.*.cmd' -o -name 'core' \
-               -o -name 'Makefile' -o -name 'Module.symvers' \) \
+               -o -name 'Makefile' -o -name '$(LINUX_SYMBOLS)' \) \
                -type f -print | xargs $(RM)
 
 install-data-local:
        instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
-       for instfile in $(noinst_HEADERS) module/Module.symvers; do \
+       for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
                $(INSTALL) -D $$instfile $$instdest/$$instfile; \
        done
        (cd $(DESTDIR)/${prefix}/src && ln -f -s spl-$(SPL_META_VERSION) spl)

diff --git a/Makefile.in b/Makefile.in
index 5c3bf0227fe84026cac4c77e144b6b1aab1c3026..732880fcc1ecf5290fe17395aa2751df192f36f0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,6 +123,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LINUX = @LINUX@
 LINUX_OBJ = @LINUX_OBJ@
+LINUX_SYMBOLS = @LINUX_SYMBOLS@
 LINUX_VERSION = @LINUX_VERSION@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -656,12 +657,12 @@ distclean-local::
                -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
                -o -name '.*.rej' -o -name 'aclocal.m4' -o -size 0 \
                -o -name '*%' -o -name '.*.cmd' -o -name 'core' \
-               -o -name 'Makefile' -o -name 'Module.symvers' \) \
+               -o -name 'Makefile' -o -name '$(LINUX_SYMBOLS)' \) \
                -type f -print | xargs $(RM)
 
 install-data-local:
        instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
-       for instfile in $(noinst_HEADERS) module/Module.symvers; do \
+       for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
                $(INSTALL) -D $$instfile $$instdest/$$instfile; \
        done
        (cd $(DESTDIR)/${prefix}/src && ln -f -s spl-$(SPL_META_VERSION) spl)

diff --git a/cmd/Makefile.in b/cmd/Makefile.in
index b7fcf9c1c01dab6d3f44eaaeb077c393d78c5156..753c44fca648c270be2aff429830bdb993d419fe 100644 (file)
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -115,6 +115,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LINUX = @LINUX@
 LINUX_OBJ = @LINUX_OBJ@
+LINUX_SYMBOLS = @LINUX_SYMBOLS@
 LINUX_VERSION = @LINUX_VERSION@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index a141fce50790525fc990c9b504bce5372d6e6034..2f277a3b3cb12a7e3bdd50fbcd26f32b98ef7346 100644 (file)
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -92,9 +92,20 @@ AC_DEFUN([SPL_AC_KERNEL], [
        AC_SUBST(KERNELCFLAGS)
 ])
 
+AC_DEFUN([SPL_AC_MODULE_SYMVERS], [
+       AC_MSG_CHECKING([kernel file name for module symbols])
+       if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost; then
+               LINUX_SYMBOLS=Modules.symvers
+       else
+               LINUX_SYMBOLS=Module.symvers
+       fi
+       AC_MSG_RESULT($LINUX_SYMBOLS)
+       AC_SUBST(LINUX_SYMBOLS)
+])
+
 AC_DEFUN([SPL_AC_LICENSE], [
-        AC_MSG_CHECKING([license])
-        AC_MSG_RESULT([GPL])
+       AC_MSG_CHECKING([license])
+       AC_MSG_RESULT([GPL])
        KERNELCPPFLAGS="${KERNELCPPFLAGS} -DHAVE_GPL_ONLY_SYMBOLS"
 ])
 
@@ -286,12 +297,14 @@ dnl # check symbol exported or not
 dnl #
 AC_DEFUN([SPL_CHECK_SYMBOL_EXPORT],
        [AC_MSG_CHECKING([whether symbol $1 is exported])
-       grep -q -E '[[[:space:]]]$1[[[:space:]]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[[:space:]]]$1[[[:space:]]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in $2; do
-                       grep -q -E "EXPORT_SYMBOL.*($1)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*($1)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1

diff --git a/configure b/configure
index d2e177cedd95e2ed5d9bb03882f815e88187405d..f3f6b1303aa7ad0327d48a8204442bee2cbdf93d 100755 (executable)
--- a/configure
+++ b/configure
@@ -462,7 +462,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SPL_META_NAME SPL_META_VERSION SPL_META_RELEASE SPL_META_ALIAS SPL_META_DATA SPL_META_AUTHOR SPL_META_LT_CURRENT SPL_META_LT_REVISION SPL_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LINUX LINUX_OBJ LINUX_VERSION KERNELMAKE_PARAMS KERNELCPPFLAGS KERNELCFLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SPL_META_NAME SPL_META_VERSION SPL_META_RELEASE SPL_META_ALIAS SPL_META_DATA SPL_META_AUTHOR SPL_META_LT_CURRENT SPL_META_LT_REVISION SPL_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LINUX LINUX_OBJ LINUX_VERSION KERNELMAKE_PARAMS KERNELCPPFLAGS KERNELCFLAGS LINUX_SYMBOLS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -19039,9 +19039,21 @@ echo "${ECHO_T}$kernsrcver" >&6
 
 
 
-        echo "$as_me:$LINENO: checking license" >&5
+       echo "$as_me:$LINENO: checking kernel file name for module symbols" >&5
+echo $ECHO_N "checking kernel file name for module symbols... $ECHO_C" >&6
+       if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost; then
+               LINUX_SYMBOLS=Modules.symvers
+       else
+               LINUX_SYMBOLS=Module.symvers
+       fi
+       echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5
+echo "${ECHO_T}$LINUX_SYMBOLS" >&6
+
+
+
+       echo "$as_me:$LINENO: checking license" >&5
 echo $ECHO_N "checking license... $ECHO_C" >&6
-        echo "$as_me:$LINENO: result: GPL" >&5
+       echo "$as_me:$LINENO: result: GPL" >&5
 echo "${ECHO_T}GPL" >&6
        KERNELCPPFLAGS="${KERNELCPPFLAGS} -DHAVE_GPL_ONLY_SYMBOLS"
 
@@ -19588,12 +19600,14 @@ fi
 
        echo "$as_me:$LINENO: checking whether symbol task_curr is exported" >&5
 echo $ECHO_N "checking whether symbol task_curr is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]task_curr[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]task_curr[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in kernel/sched.c; do
-                       grep -q -E "EXPORT_SYMBOL.*(task_curr)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(task_curr)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -19757,12 +19771,14 @@ fi
 
        echo "$as_me:$LINENO: checking whether symbol device_create is exported" >&5
 echo $ECHO_N "checking whether symbol device_create is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]device_create[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]device_create[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in drivers/base/core.c; do
-                       grep -q -E "EXPORT_SYMBOL.*(device_create)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(device_create)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -19864,12 +19880,14 @@ fi
 
        echo "$as_me:$LINENO: checking whether symbol class_device_create is exported" >&5
 echo $ECHO_N "checking whether symbol class_device_create is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]class_device_create[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]class_device_create[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in drivers/base/class.c; do
-                       grep -q -E "EXPORT_SYMBOL.*(class_device_create)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(class_device_create)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -19903,12 +19921,14 @@ _ACEOF
 
        echo "$as_me:$LINENO: checking whether symbol set_normalized_timespec is exported" >&5
 echo $ECHO_N "checking whether symbol set_normalized_timespec is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]set_normalized_timespec[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]set_normalized_timespec[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in kernel/time.c; do
-                       grep -q -E "EXPORT_SYMBOL.*(set_normalized_timespec)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(set_normalized_timespec)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20409,12 +20429,14 @@ fi
 
        echo "$as_me:$LINENO: checking whether symbol monotonic_clock is exported" >&5
 echo $ECHO_N "checking whether symbol monotonic_clock is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]monotonic_clock[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]monotonic_clock[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(monotonic_clock)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(monotonic_clock)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20582,12 +20604,14 @@ fi
 
        echo "$as_me:$LINENO: checking whether symbol div64_64 is exported" >&5
 echo $ECHO_N "checking whether symbol div64_64 is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]div64_64[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]div64_64[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(div64_64)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(div64_64)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20621,12 +20645,14 @@ _ACEOF
 
        echo "$as_me:$LINENO: checking whether symbol div64_u64 is exported" >&5
 echo $ECHO_N "checking whether symbol div64_u64 is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]div64_u64[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]div64_u64[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(div64_u64)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(div64_u64)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20725,12 +20751,14 @@ fi
 
        echo "$as_me:$LINENO: checking whether symbol kallsyms_lookup_name is exported" >&5
 echo $ECHO_N "checking whether symbol kallsyms_lookup_name is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]kallsyms_lookup_name[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]kallsyms_lookup_name[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(kallsyms_lookup_name)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(kallsyms_lookup_name)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20764,12 +20792,14 @@ _ACEOF
 
        echo "$as_me:$LINENO: checking whether symbol get_vmalloc_info is exported" >&5
 echo $ECHO_N "checking whether symbol get_vmalloc_info is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]get_vmalloc_info[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]get_vmalloc_info[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(get_vmalloc_info)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(get_vmalloc_info)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20821,12 +20851,14 @@ echo "${ECHO_T}no" >&6
 
        echo "$as_me:$LINENO: checking whether symbol first_online_pgdat is exported" >&5
 echo $ECHO_N "checking whether symbol first_online_pgdat is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]first_online_pgdat[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]first_online_pgdat[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(first_online_pgdat)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(first_online_pgdat)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20860,12 +20892,14 @@ _ACEOF
 
        echo "$as_me:$LINENO: checking whether symbol next_online_pgdat is exported" >&5
 echo $ECHO_N "checking whether symbol next_online_pgdat is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]next_online_pgdat[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]next_online_pgdat[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(next_online_pgdat)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(next_online_pgdat)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20899,12 +20933,14 @@ _ACEOF
 
        echo "$as_me:$LINENO: checking whether symbol next_zone is exported" >&5
 echo $ECHO_N "checking whether symbol next_zone is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]next_zone[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]next_zone[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(next_zone)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(next_zone)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20938,12 +20974,14 @@ _ACEOF
 
        echo "$as_me:$LINENO: checking whether symbol pgdat_list is exported" >&5
 echo $ECHO_N "checking whether symbol pgdat_list is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]pgdat_list[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]pgdat_list[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(pgdat_list)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(pgdat_list)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -20977,12 +21015,14 @@ _ACEOF
 
        echo "$as_me:$LINENO: checking whether symbol get_zone_counts is exported" >&5
 echo $ECHO_N "checking whether symbol get_zone_counts is exported... $ECHO_C" >&6
-       grep -q -E '[[:space:]]get_zone_counts[[:space:]]' $LINUX_OBJ/Module.symvers 2>/dev/null
+       grep -q -E '[[:space:]]get_zone_counts[[:space:]]' \
+               $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
        if test $rc -ne 0; then
                export=0
                for file in ; do
-                       grep -q -E "EXPORT_SYMBOL.*(get_zone_counts)" "$LINUX_OBJ/$file" 2>/dev/null
+                       grep -q -E "EXPORT_SYMBOL.*(get_zone_counts)" \
+                               "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
                        if test $rc -eq 0; then
                                export=1
@@ -22026,6 +22066,7 @@ s,@LINUX_VERSION@,$LINUX_VERSION,;t t
 s,@KERNELMAKE_PARAMS@,$KERNELMAKE_PARAMS,;t t
 s,@KERNELCPPFLAGS@,$KERNELCPPFLAGS,;t t
 s,@KERNELCFLAGS@,$KERNELCFLAGS,;t t
+s,@LINUX_SYMBOLS@,$LINUX_SYMBOLS,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF

diff --git a/configure.ac b/configure.ac
index ecad8cbd05436cc9f999cd9fc9113d14ea73eb2f..19109ae265201147aebcfa3524e75235dccb34c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 
 SPL_AC_KERNEL
+SPL_AC_MODULE_SYMVERS
 SPL_AC_LICENSE
 SPL_AC_DEBUG
 SPL_AC_DEBUG_KMEM

diff --git a/include/Makefile.in b/include/Makefile.in
index 7b1437a4d2b0b47ec9e5abfdb0a8f278cd60278e..53650a52e71a8833789e1857a0876f282bf0b796 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -96,6 +96,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LINUX = @LINUX@
 LINUX_OBJ = @LINUX_OBJ@
+LINUX_SYMBOLS = @LINUX_SYMBOLS@
 LINUX_VERSION = @LINUX_VERSION@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 523c30bcb17cbd843dba1667669397f9e5dc5a41..b8b573ef743c3128fa6259b60fc515809d738aa2 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -109,6 +109,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LINUX = @LINUX@
 LINUX_OBJ = @LINUX_OBJ@
+LINUX_SYMBOLS = @LINUX_SYMBOLS@
 LINUX_VERSION = @LINUX_VERSION@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 3fb7ce62b5fb64ded981c9244c212da2e87345fe..bbf7ea47e988d4f7510190847cdb9883aa2104fa 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -91,6 +91,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LINUX = @LINUX@
 LINUX_OBJ = @LINUX_OBJ@
+LINUX_SYMBOLS = @LINUX_SYMBOLS@
 LINUX_VERSION = @LINUX_VERSION@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@

diff --git a/spl.spec.in b/spl.spec.in
index 4cd71de05d29d77209c55caa7fa66bc671318943..e67408dd777550702a7cb8fcd69818772dc04804 100644 (file)
--- a/spl.spec.in
+++ b/spl.spec.in
@@ -93,7 +93,7 @@ Requires:        %{kstr} = %{kver}
 BuildRequires:   %{buildrequires}
 
 %description devel
-The %{name}-devel package contains the header files and Module.symvers
+The %{name}-devel package contains the header files and Module{s}.symvers
 symbols needed for building additional modules which use %{name}.
 
 %prep