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

Cleanly handle --with-linux=NONE option 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 builds 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:47:28 -07:00
parent 86933a6e51
commit bb339d0670
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/spl-build.m4
View File

@ -67,11 +67,16 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
]) ])
AC_DEFUN([SPL_AC_MODULE_SYMVERS], [ AC_DEFUN([SPL_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)

22
configure vendored
View File

@ -19051,12 +19051,17 @@ echo "${ECHO_T}$kernsrcver" >&6
modpost=$LINUX/scripts/Makefile.modpost
echo "$as_me:$LINENO: checking kernel file name for module symbols" >&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 echo $ECHO_N "checking kernel file name for module symbols... $ECHO_C" >&6
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
echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5 echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5
echo "${ECHO_T}$LINUX_SYMBOLS" >&6 echo "${ECHO_T}$LINUX_SYMBOLS" >&6
@ -21437,12 +21442,17 @@ echo "${ECHO_T}$kernsrcver" >&6
modpost=$LINUX/scripts/Makefile.modpost
echo "$as_me:$LINENO: checking kernel file name for module symbols" >&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 echo $ECHO_N "checking kernel file name for module symbols... $ECHO_C" >&6
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
echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5 echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5
echo "${ECHO_T}$LINUX_SYMBOLS" >&6 echo "${ECHO_T}$LINUX_SYMBOLS" >&6