1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

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>
This commit is contained in:
Marcel Moolenaar 1999-08-18 12:49:53 +00:00
parent 8d5bb6353e
commit 64354154c2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=20777
11 changed files with 77 additions and 77 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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