From owner-svn-ports-all@freebsd.org Sun May 15 14:51:40 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A44BB399DF; Sun, 15 May 2016 14:51:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1C381023; Sun, 15 May 2016 14:51:39 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FEpdhv069318; Sun, 15 May 2016 14:51:39 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FEpcCV069314; Sun, 15 May 2016 14:51:38 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201605151451.u4FEpcCV069314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 15 May 2016 14:51:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415233 - in head/emulators: linux_base-c6 linux_base-f10 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2016 14:51:40 -0000 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