diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 1999-08-18 12:49:53 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 1999-08-18 12:49:53 +0000 |
| commit | 64354154c290e7cd108da9cd7eaccdcc955e6643 (patch) | |
| tree | 815ffb247a3cb857a47f07eb9a2012ae0a776676 /devel | |
| parent | Do not require dependencies to be deleted to be explicitly listed. (diff) | |
Fix the way the port figures out if linux support is present in the kernel.
It now also works when the linuxulator is compiled into the kernel (using
options COMPAT_LINUX). Due to my misunderstanding, PR/12918 has been closed
for the wrong reasons. My apologies to the originator.
PR: 12918
Originator: Dean Lombardo <dlombardo@excite.com>
Notes
Notes:
svn path=/head/; revision=20777
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/linux_devtools-6/Makefile | 14 | ||||
| -rw-r--r-- | devel/linux_devtools-7/Makefile | 14 | ||||
| -rw-r--r-- | devel/linux_devtools/Makefile | 14 |
3 files changed, 21 insertions, 21 deletions
diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile index 9e444d1bd6bb..bcd701be3a41 100644 --- a/devel/linux_devtools-6/Makefile +++ b/devel/linux_devtools-6/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 9, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.10 1999/07/21 11:16:09 marcel Exp $ +# $Id: Makefile,v 1.11 1999/08/11 18:46:08 marcel Exp $ # DISTNAME= linux_devtools @@ -76,13 +76,13 @@ NEEDLOADLINK= true .endif do-install: - @if [ -z "`kldstat | ${GREP} linux.ko | ${AWK} '{print $1}'`" ]; then \ - ${ECHO} 'The Linux emulator kernel module is not loaded.\ - Loading Linux emulator kernel module...' | fmt; \ + @if [ -z "`kldstat -v | ${GREP} -E 'linux(aout|elf)'`" ]; then \ + ${ECHO} 'Linux mode is not enabled.\ + Loading linux kernel module...' | fmt; \ linux || { \ - ${ECHO} 'The Linux emulator kernel module could not be\ - loaded. Please manually load the module and retry.\ - See "man linux" for details.' | fmt; \ + ${ECHO} 'The linux kernel module could not be loaded.\ + Please manually load the module and retry.\ + See "man linux" for details.' | fmt; \ ${FALSE}; \ };\ fi diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile index 9e444d1bd6bb..bcd701be3a41 100644 --- a/devel/linux_devtools-7/Makefile +++ b/devel/linux_devtools-7/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 9, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.10 1999/07/21 11:16:09 marcel Exp $ +# $Id: Makefile,v 1.11 1999/08/11 18:46:08 marcel Exp $ # DISTNAME= linux_devtools @@ -76,13 +76,13 @@ NEEDLOADLINK= true .endif do-install: - @if [ -z "`kldstat | ${GREP} linux.ko | ${AWK} '{print $1}'`" ]; then \ - ${ECHO} 'The Linux emulator kernel module is not loaded.\ - Loading Linux emulator kernel module...' | fmt; \ + @if [ -z "`kldstat -v | ${GREP} -E 'linux(aout|elf)'`" ]; then \ + ${ECHO} 'Linux mode is not enabled.\ + Loading linux kernel module...' | fmt; \ linux || { \ - ${ECHO} 'The Linux emulator kernel module could not be\ - loaded. Please manually load the module and retry.\ - See "man linux" for details.' | fmt; \ + ${ECHO} 'The linux kernel module could not be loaded.\ + Please manually load the module and retry.\ + See "man linux" for details.' | fmt; \ ${FALSE}; \ };\ fi diff --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile index 9e444d1bd6bb..bcd701be3a41 100644 --- a/devel/linux_devtools/Makefile +++ b/devel/linux_devtools/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 9, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.10 1999/07/21 11:16:09 marcel Exp $ +# $Id: Makefile,v 1.11 1999/08/11 18:46:08 marcel Exp $ # DISTNAME= linux_devtools @@ -76,13 +76,13 @@ NEEDLOADLINK= true .endif do-install: - @if [ -z "`kldstat | ${GREP} linux.ko | ${AWK} '{print $1}'`" ]; then \ - ${ECHO} 'The Linux emulator kernel module is not loaded.\ - Loading Linux emulator kernel module...' | fmt; \ + @if [ -z "`kldstat -v | ${GREP} -E 'linux(aout|elf)'`" ]; then \ + ${ECHO} 'Linux mode is not enabled.\ + Loading linux kernel module...' | fmt; \ linux || { \ - ${ECHO} 'The Linux emulator kernel module could not be\ - loaded. Please manually load the module and retry.\ - See "man linux" for details.' | fmt; \ + ${ECHO} 'The linux kernel module could not be loaded.\ + Please manually load the module and retry.\ + See "man linux" for details.' | fmt; \ ${FALSE}; \ };\ fi |