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 /emulators | |
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 'emulators')
-rw-r--r-- | emulators/linux_base-6/Makefile | 14 | ||||
-rw-r--r-- | emulators/linux_base-62/Makefile | 14 | ||||
-rw-r--r-- | emulators/linux_base-8/Makefile | 14 | ||||
-rw-r--r-- | emulators/linux_base-rh-9/Makefile | 14 | ||||
-rw-r--r-- | emulators/linux_base-suse-9.1/Makefile | 14 | ||||
-rw-r--r-- | emulators/linux_base-suse-9.2/Makefile | 14 | ||||
-rw-r--r-- | emulators/linux_base-suse-9.3/Makefile | 14 | ||||
-rw-r--r-- | emulators/linux_base/Makefile | 14 |
8 files changed, 56 insertions, 56 deletions
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile index 9ad65d92c066..06538e971939 100644 --- a/emulators/linux_base-6/Makefile +++ b/emulators/linux_base-6/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 7, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.27 1999/08/06 15:13:17 billf Exp $ +# $Id: Makefile,v 1.28 1999/08/08 11:40:53 marcel Exp $ # DISTNAME= linux_base @@ -105,13 +105,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/emulators/linux_base-62/Makefile b/emulators/linux_base-62/Makefile index 9ad65d92c066..06538e971939 100644 --- a/emulators/linux_base-62/Makefile +++ b/emulators/linux_base-62/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 7, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.27 1999/08/06 15:13:17 billf Exp $ +# $Id: Makefile,v 1.28 1999/08/08 11:40:53 marcel Exp $ # DISTNAME= linux_base @@ -105,13 +105,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/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile index 9ad65d92c066..06538e971939 100644 --- a/emulators/linux_base-8/Makefile +++ b/emulators/linux_base-8/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 7, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.27 1999/08/06 15:13:17 billf Exp $ +# $Id: Makefile,v 1.28 1999/08/08 11:40:53 marcel Exp $ # DISTNAME= linux_base @@ -105,13 +105,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/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile index 9ad65d92c066..06538e971939 100644 --- a/emulators/linux_base-rh-9/Makefile +++ b/emulators/linux_base-rh-9/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 7, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.27 1999/08/06 15:13:17 billf Exp $ +# $Id: Makefile,v 1.28 1999/08/08 11:40:53 marcel Exp $ # DISTNAME= linux_base @@ -105,13 +105,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/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile index 9ad65d92c066..06538e971939 100644 --- a/emulators/linux_base-suse-9.1/Makefile +++ b/emulators/linux_base-suse-9.1/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 7, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.27 1999/08/06 15:13:17 billf Exp $ +# $Id: Makefile,v 1.28 1999/08/08 11:40:53 marcel Exp $ # DISTNAME= linux_base @@ -105,13 +105,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/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile index 9ad65d92c066..06538e971939 100644 --- a/emulators/linux_base-suse-9.2/Makefile +++ b/emulators/linux_base-suse-9.2/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 7, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.27 1999/08/06 15:13:17 billf Exp $ +# $Id: Makefile,v 1.28 1999/08/08 11:40:53 marcel Exp $ # DISTNAME= linux_base @@ -105,13 +105,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/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile index 9ad65d92c066..06538e971939 100644 --- a/emulators/linux_base-suse-9.3/Makefile +++ b/emulators/linux_base-suse-9.3/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 7, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.27 1999/08/06 15:13:17 billf Exp $ +# $Id: Makefile,v 1.28 1999/08/08 11:40:53 marcel Exp $ # DISTNAME= linux_base @@ -105,13 +105,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/emulators/linux_base/Makefile b/emulators/linux_base/Makefile index 9ad65d92c066..06538e971939 100644 --- a/emulators/linux_base/Makefile +++ b/emulators/linux_base/Makefile @@ -3,7 +3,7 @@ # Date created: Jul 7, 1999 # Whom: marcel@FreeBSD.org # -# $Id: Makefile,v 1.27 1999/08/06 15:13:17 billf Exp $ +# $Id: Makefile,v 1.28 1999/08/08 11:40:53 marcel Exp $ # DISTNAME= linux_base @@ -105,13 +105,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 |