Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Cleanly handle --with-linux=NONE and --with-spl=NONE options 

when used to generate source rpms.  These should not be fatal
because we actually don't need them until we build the source
rpm.  When doing mock build this is important because these
dependent rpms will only be installed if they are specificed
in the source rpms spec file.
This commit is contained in:
Brian Behlendorf 2009-07-02 10:44:43 -07:00
parent 6e50f53cb1
commit f984d28e0c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config/kernel.m4
View File

@ -28,11 +28,16 @@ dnl #
dnl # Detect name used more Module.symvers file dnl # Detect name used more Module.symvers file
dnl # dnl #
AC_DEFUN([ZFS_AC_MODULE_SYMVERS], [ AC_DEFUN([ZFS_AC_MODULE_SYMVERS], [
modpost=$LINUX/scripts/Makefile.modpost
AC_MSG_CHECKING([kernel file name for module symbols]) AC_MSG_CHECKING([kernel file name for module symbols])
if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost; then if test -f "$modpost"; then
LINUX_SYMBOLS=Modules.symvers if grep -q Modules.symvers $modpost; then
LINUX_SYMBOLS=Modules.symvers
else
LINUX_SYMBOLS=Module.symvers
fi
else else
LINUX_SYMBOLS=Module.symvers LINUX_SYMBOLS=NONE
fi fi
AC_MSG_RESULT($LINUX_SYMBOLS) AC_MSG_RESULT($LINUX_SYMBOLS)
AC_SUBST(LINUX_SYMBOLS) AC_SUBST(LINUX_SYMBOLS)
@ -127,16 +132,12 @@ dnl # Detect name used for the additional SPL Module.symvers file
dnl # dnl #
AC_DEFUN([ZFS_AC_SPL_MODULE_SYMVERS], [ AC_DEFUN([ZFS_AC_SPL_MODULE_SYMVERS], [
AC_MSG_CHECKING([spl file name for module symbols]) AC_MSG_CHECKING([spl file name for module symbols])
if test -r $SPL_OBJ/Module.symvers; then if test -r $SPL_OBJ/Module.symvers; then
SPL_SYMBOLS=Module.symvers SPL_SYMBOLS=Module.symvers
elif test -r $SPL_OBJ/Modules.symvers; then elif test -r $SPL_OBJ/Modules.symvers; then
SPL_SYMBOLS=Modules.symvers SPL_SYMBOLS=Modules.symvers
else else
AC_MSG_RESULT([Not found]) SPL_SYMBOLS=NONE
AC_MSG_ERROR([
*** Cannot find extra Module{s}.symvers in the spl source.
*** Please prepare the spl source before running this script])
fi fi
AC_MSG_RESULT([$SPL_SYMBOLS]) AC_MSG_RESULT([$SPL_SYMBOLS])