svn commit: r415233 - in head/emulators: linux_base-c6 linux_base-f10

[Baptiste Daroussin]

Author: bapt
Date: Sun May 15 14:51:38 2016
New Revision: 415233
URL: https://svnweb.freebsd.org/changeset/ports/415233

Log:
  Do not try to load the linux* modules from the pre install scripts
  
  It will always fail when jailed, it is also inaccurate given we now have
  linux and linux64 modules. There is alrady a test before that via checking
  compat.linux.* which is good enough to determien if linux emulation is supported

Modified:
  head/emulators/linux_base-c6/Makefile
  head/emulators/linux_base-c6/pkg-install
  head/emulators/linux_base-f10/Makefile
  head/emulators/linux_base-f10/pkg-install

Modified: head/emulators/linux_base-c6/Makefile
==============================================================================
--- head/emulators/linux_base-c6/Makefile	Sun May 15 14:43:52 2016	(r415232)
+++ head/emulators/linux_base-c6/Makefile	Sun May 15 14:51:38 2016	(r415233)
@@ -3,7 +3,7 @@
 
 PORTNAME=	c6
 PORTVERSION=	6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators linux
 MASTER_SITES=	CENTOS_LINUX CENTOS_LINUX_UPDATES
 MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/\

Modified: head/emulators/linux_base-c6/pkg-install
==============================================================================
--- head/emulators/linux_base-c6/pkg-install	Sun May 15 14:43:52 2016	(r415232)
+++ head/emulators/linux_base-c6/pkg-install	Sun May 15 14:51:38 2016	(r415233)
@@ -11,15 +11,6 @@ PRE-INSTALL)
 		echo 'compat.linux.osrelease: 2.6.16 is not supported, exiting'
 		exit 1
 	fi
-	if [ -z "`kldstat -v | grep -E 'linux(aout|elf)'`" ]; then
-		echo 'Linux mode is not enabled.'
-		echo 'Loading linux kernel module now...'
-		if ! kldload linux; then
-			echo 'The linux kernel module could not be loaded.'
-			echo 'Please enable linux mode manually and retry.'
-			exit 1
-		fi
-	fi
 	;;
 POST-INSTALL)
 	if [ -z "`grep ^linproc /etc/fstab`" ]; then

Modified: head/emulators/linux_base-f10/Makefile
==============================================================================
--- head/emulators/linux_base-f10/Makefile	Sun May 15 14:43:52 2016	(r415232)
+++ head/emulators/linux_base-f10/Makefile	Sun May 15 14:51:38 2016	(r415233)
@@ -3,7 +3,7 @@
 
 PORTNAME=		f10
 PORTVERSION=		10
-PORTREVISION=		9
+PORTREVISION=		10
 CATEGORIES=		emulators linux
 MASTER_SITES=		LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION} \
 			FEDORA_LINUX/../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Packages/

Modified: head/emulators/linux_base-f10/pkg-install
==============================================================================
--- head/emulators/linux_base-f10/pkg-install	Sun May 15 14:43:52 2016	(r415232)
+++ head/emulators/linux_base-f10/pkg-install	Sun May 15 14:51:38 2016	(r415233)
@@ -7,15 +7,6 @@ PRE-INSTALL)
 		echo 'linuxulator is not (kld)loaded, exiting'
 		exit 1
 	fi
-	if [ -z "`kldstat -v | grep -E 'linux(aout|elf)'`" ]; then
-		echo 'Linux mode is not enabled.'
-		echo 'Loading linux kernel module now...'
-		if ! kldload linux; then
-			echo 'The linux kernel module could not be loaded.'
-			echo 'Please enable linux mode manually and retry.'
-			exit 1
-		fi
-	fi
 	;;
 POST-INSTALL)
 	if [ -z "`grep ^linproc /etc/fstab`" ]; then